summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJory Pratt <anarchy@gentoo.org>2005-12-23 03:46:49 +0000
committerJory Pratt <anarchy@gentoo.org>2005-12-23 03:46:49 +0000
commit16d3bdc26aff3622b620261b79e835b187d00087 (patch)
tree08fa3d639c40db54dbec109ba54893b8ea152db4
parentStable on x86. Bug #116314 (diff)
downloadgentoo-2-16d3bdc26aff3622b620261b79e835b187d00087.tar.gz
gentoo-2-16d3bdc26aff3622b620261b79e835b187d00087.tar.bz2
gentoo-2-16d3bdc26aff3622b620261b79e835b187d00087.zip
minor changes to handle svg and canvas default in ff/tb-1.5
-rw-r--r--eclass/mozconfig-2.eclass13
-rw-r--r--eclass/mozcoreconf.eclass7
2 files changed, 9 insertions, 11 deletions
diff --git a/eclass/mozconfig-2.eclass b/eclass/mozconfig-2.eclass
index 094393f2bc4b..d9d4a95e6046 100644
--- a/eclass/mozconfig-2.eclass
+++ b/eclass/mozconfig-2.eclass
@@ -1,12 +1,12 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-2.eclass,v 1.9 2005/12/14 07:36:42 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-2.eclass,v 1.10 2005/12/23 03:46:49 anarchy Exp $
#
# mozconfig.eclass: the new mozilla.eclass
inherit multilib flag-o-matic mozcoreconf
-IUSE="debug gnome ipv6 xinerama xprint mozsvg"
+IUSE="debug gnome ipv6 xinerama xprint"
RDEPEND="|| ( ( x11-libs/libXrender
x11-libs/libXt
@@ -27,8 +27,8 @@ RDEPEND="|| ( ( x11-libs/libXrender
>=dev-libs/libIDL-0.8.0
gnome? ( >=gnome-base/gnome-vfs-2.3.5
>=gnome-base/libgnomeui-2.2.0 )
- mozsvg? ( !<x11-base/xorg-x11-6.7.0-r2
- >=x11-libs/cairo-1.0.0)"
+ !<x11-base/xorg-x11-6.7.0-r2
+ >=x11-libs/cairo-1.0.0"
DEPEND="${RDEPEND}
xinerama? ( || ( x11-proto/xineramaproto virtual/x11 ) )
@@ -70,9 +70,4 @@ mozconfig_config() {
mozconfig_annotate -gnome --disable-gnomevfs
mozconfig_annotate -gnome --disable-gnomeui
fi
-
- if use mozsvg; then
- mozconfig_annotate mozsvg --enable-svg
- mozconfig_annotate mozsvg --enable-svg-renderer=cairo
- fi
}
diff --git a/eclass/mozcoreconf.eclass b/eclass/mozcoreconf.eclass
index 6562816ea004..4fd628a73421 100644
--- a/eclass/mozcoreconf.eclass
+++ b/eclass/mozcoreconf.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/mozcoreconf.eclass,v 1.2 2005/12/14 07:45:50 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mozcoreconf.eclass,v 1.3 2005/12/23 03:46:49 anarchy Exp $
#
# mozcoreconf.eclass : core options for mozilla
# inherit mozconfig-2 if you need USE flags
@@ -164,7 +164,10 @@ mozconfig_init() {
--disable-profilesharing \
--disable-profilelocking \
--enable-default-toolkit=gtk2 \
- --enable-pango
+ --enable-pango \
+ --enable-svg \
+ --enable-svg-renderer=cairo \
+ --enable-system-cairo
# Here is a strange one...
if is-flag '-mcpu=ultrasparc*' || is-flag '-mtune=ultrasparc*'; then