rpm/htmldoc
SHA256
1
0
Fork 0
forked from pool/htmldoc
Code Pull Requests Activity

Accepting request 172665 from Publishing

Browse Source 
Link to libX11 - fixes build in Factory... (forwarded request 172601 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/172665
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/htmldoc?expand=0&rev=17
This commit is contained in:
Stephan Kulow 2013-04-22 12:06:43 +00:00 committed by Git OBS Bridge
commit 5374d70c74
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htmldoc-link-x11.patch Normal file
View File

@ -0,0 +1,12 @@
Index: htmldoc-1.8.27/configure.in
===================================================================
--- htmldoc-1.8.27.orig/configure.in
+++ htmldoc-1.8.27/configure.in
@@ -294,6 +294,7 @@ if test "x$with_gui" != xno; then
POST="$FLTKCONFIG --post"
AC_CHECK_LIB(Xpm,XpmCreatePixmapFromData)
+ AC_CHECK_LIB(X11,XCreateBitmapFromData)
else
AC_MSG_WARN(FLTK not available so no GUI will be built.)
fi

5
htmldoc.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Apr 19 22:57:21 UTC 2013 - dimstar@opensuse.org
- Add htmldoc-link-x11.patch: link the GUI app against libX11.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 4 14:51:24 UTC 2012 - pgajdos@suse.com Tue Sep 4 14:51:24 UTC 2012 - pgajdos@suse.com

4
htmldoc.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package htmldoc # spec file for package htmldoc
# #
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -37,6 +37,7 @@ Patch1: htmldoc_CVE-2009-3050_535943.diff
Patch2: htmldoc-fortify.diff Patch2: htmldoc-fortify.diff
# link to libpng15.patch sent to mike@easysw.com # link to libpng15.patch sent to mike@easysw.com
Patch3: htmldoc-libpng15.diff Patch3: htmldoc-libpng15.diff
Patch4: htmldoc-link-x11.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define DOCDIR %{_datadir}/doc/packages/%{name} %define DOCDIR %{_datadir}/doc/packages/%{name}
@ -51,6 +52,7 @@ printed.
%patch1 -p1 %patch1 -p1
%patch2 %patch2
%patch3 %patch3
%patch4 -p1
%build %build
export CFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing" export CFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing"