[gentoo-commits] proj/mozilla:master commit in: net-libs/xulrunner/files/, www-client/firefox/, net-libs/xulrunner/

[gentoo-commits] proj/mozilla:master commit in: net-libs/xulrunner/files/, www-client/firefox/, net-libs/xulrunner/

[Jory Pratt]

commit:     a0824520f766101a1b40da80df8e1dbd19c4699d
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 17 18:09:52 2011 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 18:09:52 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=a0824520

roll new snapshot for xulrunner with libpng-1.5 support, remove gconf
use_enable in firefox-4

---
 net-libs/xulrunner/Manifest                        |    5 +--
 .../files/mozilla-2.0-gconf-config-update.patch    |   25 --------------------
 net-libs/xulrunner/xulrunner-2.0-r1.ebuild         |    4 +--
 www-client/firefox/Manifest                        |    2 +-
 ...firefox-4.0-r2.ebuild => firefox-4.0-r3.ebuild} |    3 --
 5 files changed, 4 insertions(+), 35 deletions(-)

diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index faf14f4..66e639e 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -1,5 +1,4 @@
-AUX mozilla-2.0-gconf-config-update.patch 827 RMD160 9de17d272f6e5899f79d713b965537f66d17db79 SHA1 5f575306bec598b1ff31dccccf42fd87de25c36c SHA256 d9c53a9a728cd4e350fb4a55ab6a0783b38e4c695946b63574e7179a84c346c8
 AUX xulrunner-default-prefs.js 709 RMD160 a4d062f75c17552545267ec3fe2f6b54073dafbd SHA1 580128e9edf8021fdbbca2c91abf63cb83bab2c7 SHA256 e6850b0a22f7d3889b49ec4a79a3c4d3d077edd98c8f0ffdc26e30bc70bb4b09
 DIST firefox-4.0.source.tar.bz2 66024327 RMD160 2d1a3cf0f37ddbf4a5be9b83949f8f8236e2081d SHA1 403da9dd65662e5c4dd34299214e04cb6f80575e SHA256 78b1e0a66be3604af49b81193e557c27ffaee16b8c26fead052455dd42c9150f
-DIST xulrunner-2.0-patches-1.4.tar.bz2 65212 RMD160 817e2df6d8ebe9832a38eac5fefc0da6e4e36518 SHA1 406562859d1b27df1c128671cf66916eba7e5aa6 SHA256 e30b8ce0d2e220e864a2ff69bae46181c004971b71eec8a7d87cdcb4f57d98fc
-EBUILD xulrunner-2.0-r1.ebuild 5606 RMD160 7047314b38c7c574f5871737e16d60a29a8da01b SHA1 82b15b713c81362e3259316f64dfcded6cf511ed SHA256 dc26dc8e9af3e749fddb24cad07161ccbfcdde74e465c269bd5ddfa4233f0ac2
+DIST xulrunner-2.0-patches-1.6.tar.bz2 66183 RMD160 3f2796a4908c759faeec8dfaa1f32fa11da2b621 SHA1 a052d3d60a6d71d3de9dbbc01dea98a29555650d SHA256 f5dba005951582d06ee5d53f80554fe4febb44ca1f892685eacf38350a8b031f
+EBUILD xulrunner-2.0-r1.ebuild 5545 RMD160 03775a1c3395faee77ced7b6c88e55d4ce24380b SHA1 82b4571c40bbda6b364cb87afd151584f1e4b811 SHA256 4b91cce8f308e5724844239d389587940ebe7f62a8703a84e682347d3124a792

diff --git a/net-libs/xulrunner/files/mozilla-2.0-gconf-config-update.patch b/net-libs/xulrunner/files/mozilla-2.0-gconf-config-update.patch
deleted file mode 100644
index 464e1e1..0000000
--- a/net-libs/xulrunner/files/mozilla-2.0-gconf-config-update.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/configure.in b/configure.in
---- a/configure.in
-+++ b/configure.in
-@@ -5701,16 +5701,21 @@ then
- 
-     AC_SUBST(MOZ_ENABLE_GIO)
-     AC_SUBST(MOZ_GIO_CFLAGS)
-     AC_SUBST(MOZ_GIO_LIBS)
-    
-     dnl ========================================================
-     dnl = GConf support module
-     dnl ========================================================
-+    MOZ_ARG_DISABLE_BOOL(gconf,
-+    [  --disable-gconf      Disable Gconf support ],
-+        MOZ_ENABLE_GCONF=,
-+        MOZ_ENABLE_GCONF=force)
-+
-     if test "$MOZ_ENABLE_GCONF"
-     then
-         PKG_CHECK_MODULES(MOZ_GCONF, gconf-2.0 >= $GCONF_VERSION gobject-2.0 ,[
-             MOZ_GCONF_LIBS=`echo $MOZ_GCONF_LIBS | sed 's/-llinc\>//'`
-             MOZ_ENABLE_GCONF=1
-         ],[
-             if test "$MOZ_ENABLE_GCONF" = "force"
-             then

diff --git a/net-libs/xulrunner/xulrunner-2.0-r1.ebuild b/net-libs/xulrunner/xulrunner-2.0-r1.ebuild
index babe994..e31a4c7 100644
--- a/net-libs/xulrunner/xulrunner-2.0-r1.ebuild
+++ b/net-libs/xulrunner/xulrunner-2.0-r1.ebuild
@@ -14,7 +14,7 @@ FF_PV="${FF_PV/_alpha/a}" # Handle alpha for SRC_URI
 FF_PV="${FF_PV/_beta/b}" # Handle beta for SRC_URI
 FF_PV="${FF_PV/_rc/rc}" # Handle rc for SRC_URI
 CHANGESET="e56ecd8b3a68"
-PATCH="${PN}-2.0-patches-1.4"
+PATCH="${PN}-2.0-patches-1.6"
 
 DESCRIPTION="Mozilla runtime package that can be used to bootstrap XUL+XPCOM applications"
 HOMEPAGE="http://developer.mozilla.org/en/docs/XULRunner"
@@ -66,8 +66,6 @@ src_prepare() {
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}"
 
-	epatch "${FILESDIR}"/mozilla-2.0-gconf-config-update.patch
-
 	# Allow user to apply any additional patches without modifing ebuild
 	epatch_user
 

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 2281fa6..df6c72d 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -80,4 +80,4 @@ DIST firefox-4.0-uk.xpi 260129 RMD160 4a7cda6a1ae6dd31d3b089b05e6bc4f85d0b0a3e S
 DIST firefox-4.0-vi.xpi 239966 RMD160 94f90afd4a26b6f9b220a1f096f4259f1c4339ed SHA1 7b5602a5b9e0e67b31b27bc125eb3a62e0c71319 SHA256 9927c8bd3bbd796805bd70eb5a4b37d113715333542b7a262623e0f09b8aa2a6
 DIST firefox-4.0-zu.xpi 227605 RMD160 56d91ea40c9983dc28db96af51a18cdd0b22a50d SHA1 a73c237b85bbb17924a2a2fc8499db380caa0f03 SHA256 474dfa2edf6cd692dbc05c9569d263ea326b02d91feb335a1e2e360117f524ae
 DIST firefox-4.0.source.tar.bz2 66024327 RMD160 2d1a3cf0f37ddbf4a5be9b83949f8f8236e2081d SHA1 403da9dd65662e5c4dd34299214e04cb6f80575e SHA256 78b1e0a66be3604af49b81193e557c27ffaee16b8c26fead052455dd42c9150f
-EBUILD firefox-4.0-r2.ebuild 8003 RMD160 e8f05a2ee352537d60781adcd12049cef1f3d68e SHA1 f2ab4c81ed4dffdf098189b55d1a31b9b5b25480 SHA256 673e5fe37ee86198799789254ea80a9afd83d79cde7a42a8ac8f334315ba0e20
+EBUILD firefox-4.0-r3.ebuild 7874 RMD160 3526e75a811687853b4a75b5b7aba1835c4a73b5 SHA1 a18a05fa5b88a427c876a6fdcfc16953534ebb9a SHA256 ea3296b27fa42b72c8c56db154e3b28196fcb78d0bf7c0e32aa0d13b2d021c12

diff --git a/www-client/firefox/firefox-4.0-r2.ebuild b/www-client/firefox/firefox-4.0-r3.ebuild
similarity index 98%
rename from www-client/firefox/firefox-4.0-r2.ebuild
rename to www-client/firefox/firefox-4.0-r3.ebuild
index ce9926c..163755f 100644
--- a/www-client/firefox/firefox-4.0-r2.ebuild
+++ b/www-client/firefox/firefox-4.0-r3.ebuild
@@ -28,8 +28,6 @@ REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases"
 # More URIs appended below...
 SRC_URI="http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"
 
-# XXX: GConf is used for setting the default browser
-#      revisit to make it optional with GNOME 3
 RDEPEND="
 	>=sys-devel/binutils-2.16.1
 	>=dev-libs/nss-3.12.9
@@ -179,7 +177,6 @@ src_configure() {
 	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
 
 	mozconfig_use_enable system-sqlite
-	mozconfig_use_enable gconf
 
 	# Finalize and report settings
 	mozconfig_final