diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-08-03 19:29:23 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-08-03 19:29:23 +0000 |
| commit | ecb71bc7a1de7dcaaa7f7c4f4d2f60ed58e0d183 (patch) | |
| tree | cc7d887e2c59d6af04b02391c37d7be922de5d5f /dev-lang/tk | |
| parent | Keyword amd64-linux x86-linux (diff) | |
| download | gentoo-2-ecb71bc7a1de7dcaaa7f7c4f4d2f60ed58e0d183.tar.gz gentoo-2-ecb71bc7a1de7dcaaa7f7c4f4d2f60ed58e0d183.tar.bz2 gentoo-2-ecb71bc7a1de7dcaaa7f7c4f4d2f60ed58e0d183.zip | |
Make sure we link against fontconfig since we use it.
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang/tk')
| -rw-r--r-- | dev-lang/tk/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-lang/tk/tk-8.5.11-r1.ebuild | 14 |
2 files changed, 15 insertions, 4 deletions
diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog index 94f09a6c2bc5..32254eb3a0f5 100644 --- a/dev-lang/tk/ChangeLog +++ b/dev-lang/tk/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-lang/tk # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.171 2012/06/07 16:47:30 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.172 2012/08/03 19:29:23 vapier Exp $ + + 03 Aug 2012; Mike Frysinger <vapier@gentoo.org> tk-8.5.11-r1.ebuild: + Make sure we link against fontconfig since we use it. *tk-8.5.11-r1 (07 Jun 2012) diff --git a/dev-lang/tk/tk-8.5.11-r1.ebuild b/dev-lang/tk/tk-8.5.11-r1.ebuild index eda09d30913e..a9800107bc6a 100644 --- a/dev-lang/tk/tk-8.5.11-r1.ebuild +++ b/dev-lang/tk/tk-8.5.11-r1.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/dev-lang/tk/tk-8.5.11-r1.ebuild,v 1.1 2012/06/07 16:47:30 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.11-r1.ebuild,v 1.2 2012/08/03 19:29:23 vapier Exp $ EAPI=4 @@ -19,10 +19,12 @@ IUSE="debug threads truetype aqua xscreensaver" RDEPEND=" !aqua? ( + media-libs/fontconfig x11-libs/libX11 x11-libs/libXt truetype? ( x11-libs/libXft ) - xscreensaver? ( x11-libs/libXScrnSaver ) ) + xscreensaver? ( x11-libs/libXScrnSaver ) + ) ~dev-lang/tcl-${PV}" DEPEND="${RDEPEND} !aqua? ( x11-proto/xproto )" @@ -43,7 +45,13 @@ src_prepare() { # copy the tcl patch epatch "${FILESDIR}"/tcl-8.5.9-gentoo-fbsd.patch - sed -i 's/FT_New_Face/XftFontOpen/g' unix/configure.in || die + # Make sure we use the right pkg-config, and link against fontconfig + # (since the code base uses Fc* functions). + sed -i \ + -e 's/FT_New_Face/XftFontOpen/g' \ + -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \ + -e 's:xft freetype2:xft freetype2 fontconfig:' \ + unix/configure.in || die cd "${S}"/unix eautoreconf |