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 | d650ccc30a8b2c373fd381c20d57b930799a4270 (patch) | |
| tree | e419dfd128b6123e1a8b5c72286f40dbc5e261cb /dev-lang/tk/tk-8.5.11-r1.ebuild | |
| parent | Fix typo in desc by mrueg on irc. (diff) | |
| download | historical-d650ccc30a8b2c373fd381c20d57b930799a4270.tar.gz historical-d650ccc30a8b2c373fd381c20d57b930799a4270.tar.bz2 historical-d650ccc30a8b2c373fd381c20d57b930799a4270.zip | |
Make sure we link against fontconfig since we use it.
Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64
Diffstat (limited to 'dev-lang/tk/tk-8.5.11-r1.ebuild')
| -rw-r--r-- | dev-lang/tk/tk-8.5.11-r1.ebuild | 14 |
1 files changed, 11 insertions, 3 deletions
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 |