Update patchset to support libpng-1.5 and gcc-4.6

Package-Manager: portage-2.1.9.46/cvs/Linux x86_64

4 files changed, 9 insertions, 44 deletions

diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog
index a140581f7bc2..7360ca9946bc 100644
--- a/net-libs/xulrunner/ChangeLog
+++ b/net-libs/xulrunner/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-libs/xulrunner
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.408 2011/04/10 11:21:54 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.409 2011/04/17 23:47:46 anarchy Exp $
+
+  17 Apr 2011; Jory A. Pratt <anarchy@gentoo.org> xulrunner-2.0-r1.ebuild:
+  Update patchset to support libpng-1.5 and gcc-4.6
 
   10 Apr 2011; Raúl Porcel <armin76@gentoo.org> xulrunner-1.9.2.16.ebuild:
   alpha/ia64 stable wrt #360055
diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index 6ab0387264e6..3306d7578d5e 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -1,10 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX bug-606109.patch 1243 RMD160 ec262eed0480d8a13c914c4781329e3ea1c23b0f SHA1 0c0cc40ee0a663422b107cc3ae5d1412b8c45ac7 SHA256 266d9c7218cc04c3badadc54f8f31b1238326b9c3052aed057ffce40c69541dc
 AUX fix-animated-gifs.patch 7789 RMD160 a8889110a2daea27e07f92a70df6cb1e39e05546 SHA1 05b335feeefff4f06004a20182f821d998b44879 SHA256 6d85d3c103b0dcdbb073302a4041a37bea97c715384d04d299c1fb49a5da7443
 AUX libnotify-0.7.patch 1777 RMD160 1669210dd704fd4cb84be3fbb8ced8bd10133abb SHA1 981a0cf66608e1b441c21db73a7203711de56fe0 SHA256 153d129004e63baca57182ce2ec381a9103feef9e5fbdf631339bce25cde9489
-AUX mozilla-2.0-gconf-config-update.patch 827 RMD160 9de17d272f6e5899f79d713b965537f66d17db79 SHA1 5f575306bec598b1ff31dccccf42fd87de25c36c SHA256 d9c53a9a728cd4e350fb4a55ab6a0783b38e4c695946b63574e7179a84c346c8
 AUX xulrunner-1.9.2-gtk+-2.21.patch 663 RMD160 20e2465da0e6c884527fd7cfebd3bdb2f8f015a9 SHA1 f2b9c26ed255bde672ccc8cb7ae4ae014f52d6f5 SHA256 79c11dc4304d748f3c2d6e451aa6d44dd1bb450d1db671e7fa4a83420c6f2c05
 AUX xulrunner-default-prefs.js 677 RMD160 73ec130da332c1d6517a6f838d5fab0cc134289a SHA1 b9efc3ef5e95ad3081f6b68d771e32e848b4b9ac SHA256 53493080276f221f1619153c114caf268206a6fa107972b33a4eb7f1c1cf6fe8
 DIST firefox-3.6.12.source.tar.bz2 51423668 RMD160 196e32a4cd9c6725e115aabcf320d7d8df5bca6e SHA1 1cc3885687dd5ad21167d9d45f76eb1458f46bdd SHA256 dd478c653070f451b76befc798cfa1d6b61745d8badf831a3bae453c32e68c2d
@@ -13,17 +9,10 @@ DIST firefox-3.6.16.source.tar.bz2 51492728 RMD160 fdb7b41f25a5b8ba6eb1c5672ecc6
 DIST firefox-4.0.source.tar.bz2 66024327 RMD160 2d1a3cf0f37ddbf4a5be9b83949f8f8236e2081d SHA1 403da9dd65662e5c4dd34299214e04cb6f80575e SHA256 78b1e0a66be3604af49b81193e557c27ffaee16b8c26fead052455dd42c9150f
 DIST xulrunner-1.9.2-patches-0.7.tar.bz2 16366 RMD160 2bfa5f56d58d5bb4508512190cf07454814fb0b5 SHA1 2c6e2cfb0c50a5595795561126de26941dbed576 SHA256 3e25e9b8d5fe9109f03889bca9240f92acd502fd68efe0e7eda304f5487b6bf0
 DIST xulrunner-1.9.2-patches-0.9.tar.bz2 15320 RMD160 2dfb86650c0a9a1f0c5bf86df7434c7c286658d6 SHA1 a2276c708eec2e92611ac1e7a2eaf25c39263d30 SHA256 5cca685442f1ab920eb1ba86719a38a437ae05bd5cefc42ababc2556425ebf5a
-DIST xulrunner-2.0-patches-1.3.tar.bz2 63693 RMD160 aaa6901e5dc94cbe88a2e0b5cfacbf7325ef97d2 SHA1 e3968f710e018b2c0ce017cea3e9152d157cd39b SHA256 f91949ef2cc61d9d7f7ccd242c3b0da730acb99e68a612d6ff3dfa9e7fd2aa25
+DIST xulrunner-2.0-patches-1.6.tar.bz2 66183 RMD160 3f2796a4908c759faeec8dfaa1f32fa11da2b621 SHA1 a052d3d60a6d71d3de9dbbc01dea98a29555650d SHA256 f5dba005951582d06ee5d53f80554fe4febb44ca1f892685eacf38350a8b031f
 EBUILD xulrunner-1.9.2.12.ebuild 8274 RMD160 cab01d63e74c6c26034d5b5d673243f4a8000859 SHA1 965061217b8980576f3ad2d6587c49a97549b2e1 SHA256 c0b882935adebc2a63df12cfcd56b2204f9bf86658beb7c1d5bf1bad1ba4ed4e
 EBUILD xulrunner-1.9.2.15.ebuild 8247 RMD160 81faa5447d3c8a385ede7e9bbc58f5b871ea8b8a SHA1 3c6d725da62e5cd25d7e2e8748b71b21c99a3216 SHA256 663e64489d7ff75f1d3baed66fdfe4b33d7d9c0f414b6eb37a1bfa003b683b22
 EBUILD xulrunner-1.9.2.16.ebuild 8247 RMD160 620bbe359323e41763a889c170cd0ba1be782201 SHA1 c11a4decf85926b1cdb4802d18e652cb0e919833 SHA256 dbb46a99cb9eb310bde59d247448e05524fa71ee0dccb86731a7ca8e6343c56d
-EBUILD xulrunner-2.0-r1.ebuild 5543 RMD160 e3a454919e80d59b4de74fd7930ec73f188c80fc SHA1 69a9f3ecdc44a3b25a075461070ba42ae411e8bc SHA256 5374e541a1eabb131c971f2bc0f5b863a48cf97e630c7c674cccb5ad07f72438
-MISC ChangeLog 56606 RMD160 2e86dc00937c616fc1792b2f27ccefb95e0adb0d SHA1 6f5a8930a569357d7abff8c4a484d939dc818ab1 SHA256 5b8c7e79fa488aab1f3bfd8016f66088a5a738063cf38a9d7c4457b4cef2530a
+EBUILD xulrunner-2.0-r1.ebuild 5482 RMD160 c5957bee2ae0bb60794536f90099af2f89dcfb5b SHA1 dece307e41b151b47417847256f2709183942c26 SHA256 c064463f61ee219c87b58a09b8ed62c374ed35b2719a4939fe2279c045a948ff
+MISC ChangeLog 56734 RMD160 0e60cedf7d77ecad4fc451df62c524633cd4d6f3 SHA1 b5b47f1e0311731b58e25b6af1425c32c940dfe2 SHA256 43c091bf5b721afdaf935e5b8ef4d21025cadbeb7ba84dc639a5ba9a38ae3827
 MISC metadata.xml 737 RMD160 ee298932f419af0c12657a8df62b797e1ae7720b SHA1 8b9e4d04ae106f928b374568a5d3e2ff0eddcc88 SHA256 400effb40ec15054f2a51ce3d9ea5c27359a4a4456c18459c014c58773491be0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAk2hktwACgkQuQc30/atMkDp5ACfVpXhQp275CBQBXby1ZIJIXP3
-HVQAn0BwpHkYbZoHhA6y95nOvV3JQtDY
-=gvKO
------END PGP SIGNATURE-----
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 464e1e118f99..000000000000
--- 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 7f689d908a2a..b63ca007a4f8 100644
--- a/net-libs/xulrunner/xulrunner-2.0-r1.ebuild
+++ b/net-libs/xulrunner/xulrunner-2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-2.0-r1.ebuild,v 1.1 2011/04/04 02:12:32 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-2.0-r1.ebuild,v 1.2 2011/04/17 23:47:46 anarchy Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -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.3"
+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"
@@ -65,8 +65,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