diff options
| author |   Matti Bickel <mabi@gentoo.org> | 2012-12-23 13:18:20 +0000 |
|---|---|---|
| committer | Matti Bickel <mabi@gentoo.org> | 2012-12-23 13:18:20 +0000 |
| commit | a02e1ce16cd0a1057562edcf535d7ec4bcbb962c (patch) | |
| tree | 51668e49570a56a93ec39ecdeb49124c588af0bb /x11-libs/fox | |
| parent | attempt to try to ensure linux/uvcvideo.h is always present (diff) | |
| download | gentoo-2-a02e1ce16cd0a1057562edcf535d7ec4bcbb962c.tar.gz gentoo-2-a02e1ce16cd0a1057562edcf535d7ec4bcbb962c.tar.bz2 gentoo-2-a02e1ce16cd0a1057562edcf535d7ec4bcbb962c.zip | |
add explicit link to libfontconfig (covered by DEPEND libXft), already fixed upstream in 1.7, fixes bug #368887
(Portage version: 2.2.0_alpha148/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'x11-libs/fox')
| -rw-r--r-- | x11-libs/fox/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-libs/fox/fox-1.6.40.ebuild | 3 | ||||
| -rw-r--r-- | x11-libs/fox/fox-1.6.45.ebuild | 7 |
3 files changed, 14 insertions, 3 deletions
diff --git a/x11-libs/fox/ChangeLog b/x11-libs/fox/ChangeLog index 658256ec44d5..904be1dc0c8d 100644 --- a/x11-libs/fox/ChangeLog +++ b/x11-libs/fox/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-libs/fox # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/ChangeLog,v 1.160 2012/12/22 21:27:58 mabi Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/ChangeLog,v 1.161 2012/12/23 13:18:20 mabi Exp $ + + 23 Dec 2012; Matti Bickel <mabi@gentoo.org> fox-1.6.40.ebuild, + fox-1.6.45.ebuild: + add explicit link to libfontconfig (covered by DEPEND libXft), already fixed + upstream in 1.7, fixes bug #368887 *fox-1.7.37 (22 Dec 2012) diff --git a/x11-libs/fox/fox-1.6.40.ebuild b/x11-libs/fox/fox-1.6.40.ebuild index 2db6c14b1929..661ece3409ca 100644 --- a/x11-libs/fox/fox-1.6.40.ebuild +++ b/x11-libs/fox/fox-1.6.40.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/x11-libs/fox/fox-1.6.40.ebuild,v 1.10 2012/12/22 21:27:58 mabi Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.6.40.ebuild,v 1.11 2012/12/23 13:18:20 mabi Exp $ EAPI="2" @@ -35,6 +35,7 @@ FOXCONF="$(use_enable bzip2 bz2lib) \ $(use_enable zlib)" src_prepare() { + sed -i -e 's/-lXft/-lXft -lfontconfig/' "${S}/configure.ac" epatch "${FILESDIR}"/${P}-libpng15.patch fox_src_prepare } diff --git a/x11-libs/fox/fox-1.6.45.ebuild b/x11-libs/fox/fox-1.6.45.ebuild index 8f455a8a4da8..ff29f1fba89c 100644 --- a/x11-libs/fox/fox-1.6.45.ebuild +++ b/x11-libs/fox/fox-1.6.45.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/x11-libs/fox/fox-1.6.45.ebuild,v 1.2 2012/12/22 21:27:58 mabi Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.6.45.ebuild,v 1.3 2012/12/23 13:18:20 mabi Exp $ EAPI="4" @@ -26,6 +26,11 @@ DEPEND="${RDEPEND} x11-proto/xextproto x11-libs/libXt" +src_prepare() { + sed -i -e 's/-lXft/-lXft -lfontconfig/' "${S}/configure.ac" + fox_src_prepare +} + src_configure() { FOXCONF="$(use_enable bzip2 bz2lib) \ $(use_enable jpeg) \ |