summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2002-12-04 19:19:51 +0000
committerMartin Schlemmer <azarah@gentoo.org>2002-12-04 19:19:51 +0000
commit3b22b3d1d0f8cef76d06f583a73ce3e4108ff843 (patch)
tree0bd7ce20957a2fe8d1a98b93a3db235ef31e8c94 /net-www
parentupdate DEPEND (diff)
downloadgentoo-2-3b22b3d1d0f8cef76d06f583a73ce3e4108ff843.tar.gz
gentoo-2-3b22b3d1d0f8cef76d06f583a73ce3e4108ff843.tar.bz2
gentoo-2-3b22b3d1d0f8cef76d06f583a73ce3e4108ff843.zip
fix enabling xft
Diffstat (limited to 'net-www')
-rw-r--r--net-www/mozilla/ChangeLog6
-rw-r--r--net-www/mozilla/mozilla-1.2.ebuild8
2 files changed, 10 insertions, 4 deletions
diff --git a/net-www/mozilla/ChangeLog b/net-www/mozilla/ChangeLog
index 1546be673740..024484016019 100644
--- a/net-www/mozilla/ChangeLog
+++ b/net-www/mozilla/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-www/mozilla
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.57 2002/12/02 09:10:31 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.58 2002/12/04 19:19:51 azarah Exp $
+
+ 04 Dec 2002; Martin Schlemmer <azarah@gentoo.org> mozilla-1.2.ebuild :
+
+ Also add Xft2.0 to pango-1.1 check, possibly fixing bug #11576.
02 Dec 2002; Martin Schlemmer <azarah@gentoo.org> mozilla-1.2.ebuild :
diff --git a/net-www/mozilla/mozilla-1.2.ebuild b/net-www/mozilla/mozilla-1.2.ebuild
index 6884c211e6a3..0ecb603e56fc 100644
--- a/net-www/mozilla/mozilla-1.2.ebuild
+++ b/net-www/mozilla/mozilla-1.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2002 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.2.ebuild,v 1.5 2002/12/02 09:06:09 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.2.ebuild,v 1.6 2002/12/04 19:19:51 azarah Exp $
IUSE="java crypt ipv6 gtk2 ssl ldap gnome"
# Internal USE flags that I do not really want to advertise ...
@@ -252,8 +252,10 @@ src_compile() {
pango_version="`pkg-config --modversion pango | cut -d. -f1,2`"
pango_version="`echo ${pango_version} | sed -e 's:\.::g'`"
- # Only enable Xft if we have pango-1.1 or Xft2.0 installed ...
- if [ "${pango_version}" -gt "10" ] || (pkg-config xft 2> /dev/null)
+ # Only enable Xft if we have pango-1.1 *and* Xft2.0; or
+ # just Xft2.0 installed ...
+ if ([ "${pango_version}" -gt "10" ] && (pkg-config xft 2> /dev/null)) \
+ || (pkg-config xft 2> /dev/null)
then
einfo "Building with Xft2.0 support!"
myconf="${myconf} --enable-xft"