diff options
author | Michael Weber <xmw@gentoo.org> | 2013-02-28 08:15:38 +0000 |
---|---|---|
committer | Michael Weber <xmw@gentoo.org> | 2013-02-28 08:15:38 +0000 |
commit | b517c8239e752514d8b121f25ae3b25564a56fff (patch) | |
tree | 32d3a9d8d916d128a25d4e8af82bcbd6168b144b /www-client/netsurf | |
parent | ebuild update (diff) | |
download | gentoo-2-b517c8239e752514d8b121f25ae3b25564a56fff.tar.gz gentoo-2-b517c8239e752514d8b121f25ae3b25564a56fff.tar.bz2 gentoo-2-b517c8239e752514d8b121f25ae3b25564a56fff.zip |
Restore cross-compile functionality (thanks James Le Cuirot, bug 431884)
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
Diffstat (limited to 'www-client/netsurf')
-rw-r--r-- | www-client/netsurf/ChangeLog | 7 | ||||
-rw-r--r-- | www-client/netsurf/netsurf-2.9.ebuild | 10 |
2 files changed, 12 insertions, 5 deletions
diff --git a/www-client/netsurf/ChangeLog b/www-client/netsurf/ChangeLog index d00f3d6eb780..6339ff380ee5 100644 --- a/www-client/netsurf/ChangeLog +++ b/www-client/netsurf/ChangeLog @@ -1,6 +1,9 @@ # 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.4 2012/08/20 10:52:31 xmw Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/www-client/netsurf/ChangeLog,v 1.5 2013/02/28 08:15:38 xmw Exp $ + + 28 Feb 2013; Michael Weber <xmw@gentoo.org> netsurf-2.9.ebuild: + Restore cross-compile functionality (thanks James Le Cuirot, bug 431884) 20 Aug 2012; Michael Weber <xmw@gentoo.org> +files/netsurf-2.9-conditionally-include-image-headers.patch, diff --git a/www-client/netsurf/netsurf-2.9.ebuild b/www-client/netsurf/netsurf-2.9.ebuild index 03ffb5d33a09..5f5d726814a7 100644 --- a/www-client/netsurf/netsurf-2.9.ebuild +++ b/www-client/netsurf/netsurf-2.9.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 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.4 2012/08/20 10:52:31 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/netsurf/netsurf-2.9.ebuild,v 1.5 2013/02/28 08:15:38 xmw Exp $ -EAPI=4 +EAPI=5 inherit eutils multilib toolchain-funcs @@ -17,6 +17,7 @@ KEYWORDS="~amd64 ~arm" IUSE="bmp fbcon freetype gif gstreamer gtk javascript jpeg mng pdf-writer png rosprite svg svgtiny webp" RDEPEND="dev-libs/libcss + dev-libs/libxml2 net-libs/hubbub net-misc/curl bmp? ( media-libs/libnsbmp ) @@ -55,6 +56,8 @@ src_prepare() { -i Makefile.defaults || die sed -e '/^#define NSFB_TOOLBAR_DEFAULT_LAYOUT/s:blfsrut:blfsrutc:' \ -i framebuffer/gui.c || die + sed -e 's/xml2-config/${PKG_CONFIG} libxml-2.0/g' \ + -i */Makefile.target || die epatch "${FILESDIR}"/${P}-buildsystem.patch epatch "${FILESDIR}"/${P}-includes.patch @@ -84,6 +87,7 @@ src_configure() { netsurf_set Q netsurf_set CC $(tc-getCC) netsurf_set LD $(tc-getCC) + netsurf_set PKG_CONFIG $(tc-getPKG_CONFIG) if use svg ; then if use svgtiny ; then |