summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2005-09-25 23:27:32 +0000
committerMartin Schlemmer <azarah@gentoo.org>2005-09-25 23:27:32 +0000
commit239f501030aae9bf2969184355680c6527daf4c2 (patch)
tree560134287aafd198ef8688337162bbf3d8accbec /eclass/mozconfig.eclass
parentChanging X into gtk in IUSE (diff)
downloadgentoo-2-239f501030aae9bf2969184355680c6527daf4c2.tar.gz
gentoo-2-239f501030aae9bf2969184355680c6527daf4c2.tar.bz2
gentoo-2-239f501030aae9bf2969184355680c6527daf4c2.zip
Update for newer mozilla/firefox using gtk2/xft rather than freetype2
Diffstat (limited to 'eclass/mozconfig.eclass')
-rw-r--r--eclass/mozconfig.eclass19
1 files changed, 16 insertions, 3 deletions
diff --git a/eclass/mozconfig.eclass b/eclass/mozconfig.eclass
index 2738fc677ac2..68ca9cef3196 100644
--- a/eclass/mozconfig.eclass
+++ b/eclass/mozconfig.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig.eclass,v 1.20 2005/08/02 12:51:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig.eclass,v 1.21 2005/09/25 23:27:32 azarah Exp $
#
# mozconfig.eclass: the new mozilla.eclass
@@ -182,8 +182,21 @@ mozconfig_init() {
mozconfig_use_enable ipv6
mozconfig_use_enable xinerama
mozconfig_use_enable xprint
- mozconfig_use_enable truetype freetype2
- mozconfig_use_enable truetype freetypetest
+
+ if [[ ${MOZ_FREETYPE2} == "no" ]] ; then
+ # Newer mozilla/firefox builds should use xft and not freetype.
+ # Should be default for mozilla-1.7.12 and mozilla-firefox-1.0.7.
+ # Not sure if we should enable xft in this case, but might clash
+ # with USE=moznoxft ...
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=234035#c139
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=215219i
+ #mozconfig_use_enable truetype freetype2
+ #mozconfig_use_enable truetype freetypetest
+ mozconfig_annotate gentoo --disable-freetype2
+ else
+ mozconfig_use_enable truetype freetype2
+ mozconfig_use_enable truetype freetypetest
+ fi
if use debug; then
mozconfig_annotate +debug \