diff options
| author |   Michael Weber <xmw@gentoo.org> | 2012-08-20 10:52:31 +0000 |
|---|---|---|
| committer | Michael Weber <xmw@gentoo.org> | 2012-08-20 10:52:31 +0000 |
| commit | 358305084407936efa905730d970c4be7ea7fa03 (patch) | |
| tree | 4656085b61d1f1d9af717b71860570f8c88856ec /www-client/netsurf | |
| parent | Fix live ebuild (thanks Moritz Bellach, bug 430552) (diff) | |
| download | gentoo-2-358305084407936efa905730d970c4be7ea7fa03.tar.gz gentoo-2-358305084407936efa905730d970c4be7ea7fa03.tar.bz2 gentoo-2-358305084407936efa905730d970c4be7ea7fa03.zip | |
Fix compilation w/o libnsbmp (bug 428660, thanks James Le Cuirot for the patch)
(Portage version: 2.1.11.10/cvs/Linux x86_64)
Diffstat (limited to 'www-client/netsurf')
| -rw-r--r-- | www-client/netsurf/ChangeLog | 8 | ||||
| -rw-r--r-- | www-client/netsurf/files/netsurf-2.9-conditionally-include-image-headers.patch | 63 | ||||
| -rw-r--r-- | www-client/netsurf/netsurf-2.9.ebuild | 3 |
3 files changed, 72 insertions, 2 deletions
diff --git a/www-client/netsurf/ChangeLog b/www-client/netsurf/ChangeLog index cb205a2e8bfe..d00f3d6eb780 100644 --- a/www-client/netsurf/ChangeLog +++ b/www-client/netsurf/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-client/netsurf # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/netsurf/ChangeLog,v 1.3 2012/08/01 06:16:03 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/netsurf/ChangeLog,v 1.4 2012/08/20 10:52:31 xmw Exp $ + + 20 Aug 2012; Michael Weber <xmw@gentoo.org> + +files/netsurf-2.9-conditionally-include-image-headers.patch, + netsurf-2.9.ebuild: + Fix compilation w/o libnsbmp (bug 428660, thanks James Le Cuirot for the + patch) 01 Aug 2012; Michael Sterrett <mr_bones_@gentoo.org> metadata.xml: fix metadata typo diff --git a/www-client/netsurf/files/netsurf-2.9-conditionally-include-image-headers.patch b/www-client/netsurf/files/netsurf-2.9-conditionally-include-image-headers.patch new file mode 100644 index 000000000000..6520c7608a60 --- /dev/null +++ b/www-client/netsurf/files/netsurf-2.9-conditionally-include-image-headers.patch @@ -0,0 +1,63 @@ +From 7abd1c708d894a67617e60c2f85d6db355a713bb Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <chewi@aura-online.co.uk> +Date: Sat, 18 Aug 2012 16:10:23 +0100 +Subject: [PATCH] Conditionally include image headers to allow building + without some dependencies. + +--- + image/image.c | 32 +++++++++++++++++++++++++++++--- + 1 files changed, 29 insertions(+), 3 deletions(-) + +diff --git a/image/image.c b/image/image.c +index becf221..70b981b 100644 +--- a/image/image.c ++++ b/image/image.c +@@ -27,16 +27,42 @@ + #include "desktop/plotters.h" + #include "image/bitmap.h" + ++#ifdef WITH_BMP + #include "image/bmp.h" +-#include "image/gif.h" + #include "image/ico.h" ++#endif ++ ++#ifdef WITH_GIF ++#include "image/gif.h" ++#endif ++ ++#ifdef WITH_JPEG + #include "image/jpeg.h" ++#endif ++ ++#ifdef WITH_MNG + #include "image/mng.h" +-#include "image/nssprite.h" ++#endif ++ ++#ifdef WITH_PNG + #include "image/png.h" +-#include "image/rsvg.h" ++#endif ++ ++#ifdef WITH_NSSPRITE ++#include "image/nssprite.h" ++#endif ++ ++#ifdef WITH_NS_SVG + #include "image/svg.h" ++#endif ++ ++#ifdef WITH_RSVG ++#include "image/rsvg.h" ++#endif ++ ++#ifdef WITH_WEBP + #include "image/webp.h" ++#endif + + #include "image/image.h" + +-- +1.7.8.6 + diff --git a/www-client/netsurf/netsurf-2.9.ebuild b/www-client/netsurf/netsurf-2.9.ebuild index f220ff4999c8..03ffb5d33a09 100644 --- a/www-client/netsurf/netsurf-2.9.ebuild +++ b/www-client/netsurf/netsurf-2.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/netsurf/netsurf-2.9.ebuild,v 1.3 2012/07/18 17:05:36 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/netsurf/netsurf-2.9.ebuild,v 1.4 2012/08/20 10:52:31 xmw Exp $ EAPI=4 @@ -58,6 +58,7 @@ src_prepare() { epatch "${FILESDIR}"/${P}-buildsystem.patch epatch "${FILESDIR}"/${P}-includes.patch + epatch "${FILESDIR}"/${P}-conditionally-include-image-headers.patch } src_configure() { |