Added patch to fix compilation against >=gtk+-2.21

Package-Manager: portage-2.2.0_alpha2/cvs/Linux x86_64

4 files changed, 34 insertions, 14 deletions

diff --git a/www-client/icecat/ChangeLog b/www-client/icecat/ChangeLog
index b8848d4dc7d1..dff54d35957d 100644
--- a/www-client/icecat/ChangeLog
+++ b/www-client/icecat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/icecat
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/ChangeLog,v 1.51 2010/10/28 14:49:25 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/ChangeLog,v 1.52 2010/10/28 15:58:01 polynomial-c Exp $
+
+  28 Oct 2010; Lars Wendler <polynomial-c@gentoo.org>
+  +files/xulrunner-1.9.2-gtk+-2.21.patch, icecat-3.6.11.ebuild:
+  Added patch to fix compilation against >=gtk+-2.21
 
   28 Oct 2010; Markos Chandras <hwoarang@gentoo.org> icecat-3.6.11.ebuild:
   Stable on amd64 wrt bug #341821
diff --git a/www-client/icecat/Manifest b/www-client/icecat/Manifest
index 303574c9d168..894eb7ab4f94 100644
--- a/www-client/icecat/Manifest
+++ b/www-client/icecat/Manifest
@@ -1,11 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 137-bz460917_reload_new_plugins-gentoo-update-3.6.4.patch 2473 RMD160 cfbed88e1813f4880dabb18b6a9540cf3747f7f4 SHA1 5e0d98b3e3bf3ffb5f88eef30b1af095a6f0057d SHA256 be069b468eff7f06bb0fe160dea947c081cb00e1a8cbde2bd39c52ebf9aa2984
 AUX 801-enable-x86_64-tracemonkey.patch 501 RMD160 e8341671a9ab7f05cf58735a2b862ded55d82829 SHA1 d0c194c79993c3c47a8c46726d3f024e044766a0 SHA256 20f558efbf4ed1960b390c353c7eeb94108fcdb8aaf33f1fea6caf44468aeb7c
 AUX firefox-default-prefs.js 95 RMD160 805cdfec6fb31c224322cb71125547ad7a515f49 SHA1 7fab69d85b12a9f1b0c87fbb1821bdafd7485ac9 SHA256 8bc4cb870bc402db1f20b135a689f8c5dbfa5de8f1755b1926198d627c12c5f1
 AUX fix_blocklist_support.patch 3194 RMD160 87254cfdbd7fae1ed5704ecfff4ad5c691b44dba SHA1 3da1bb6544bb1b07548faa1b94bbe9fd7350dcb6 SHA256 4e0de29d5dc65b3bd9a5bb7ad1adee92056af78da66c5c1c7153dec3026931f3
 AUX icon/icecat.desktop 245 RMD160 3cef06f5a0280d91ce56b3d1e29ac931c88b9cc2 SHA1 245a7edffd6d3a78f0d4f90269adbfa1076f467c SHA256 3797d3c1ceafe3951a8cd0c1c06520efabb4b38b6da1e6977b470a4b971ac909
+AUX xulrunner-1.9.2-gtk+-2.21.patch 663 RMD160 20e2465da0e6c884527fd7cfebd3bdb2f8f015a9 SHA1 f2b9c26ed255bde672ccc8cb7ae4ae014f52d6f5 SHA256 79c11dc4304d748f3c2d6e451aa6d44dd1bb450d1db671e7fa4a83420c6f2c05
 AUX xulrunner-1.9.2-noalsa-fixup.patch 1031 RMD160 6eae45ee3e29fa47a7b31688cfcbfb594fcdd79b SHA1 845d4962708281bbd0cba45db82335739a50897b SHA256 1c4e017b6a8d81267a9d4b29b10cc4cfe69b090f8f8903a663f25b5e300eddd5
 DIST firefox-3.6-patches-0.2.tar.bz2 6335 RMD160 1f8297ad4279af70348a848349e75aa1a94c7372 SHA1 4c47c76fbdab937850558751ac73fe71e3269ece SHA256 1dc4278c143fa67c373a090f5698c4174d00aaa91ea63a444c2eca1cc328a523
 DIST icecat-3.6.11-af.xpi 122469 RMD160 0f36c3fd961f345cf3675c3e048ec39e3419f8c8 SHA1 6120538bc18171c543101d3fd0bc9037be3b6284 SHA256 dafae920811770a11e792af73baa53842fabf08c2b0bd0ec81ca90e0fda537c4
@@ -156,15 +154,8 @@ DIST icecat-3.6.9-vi.xpi 129789 RMD160 6d2c92a073b3e148264d40785330a2f377415a7f
 DIST icecat-3.6.9-zh-CN.xpi 127506 RMD160 cde246ac17ddc8ab7e4dfce43c6e70425832a6e0 SHA1 385e06768695b3191913c89c9d32c8e4029ca583 SHA256 0d335514e9f1ffb7960f53b93f952e2a2f920b51a2f3189f0d533059c1ee107f
 DIST icecat-3.6.9-zh-TW.xpi 128870 RMD160 431187eadf614b238328860bcfcbfae1b0fde04d SHA1 008449d4124e9f0e2497de0a622eb7d72b60321f SHA256 55417825e555b996276aff3f9a6bbbcaf19749ae8953d5e1d43dc884cc00332b
 DIST icecat-3.6.9.tar.bz2 48106577 RMD160 588be6a5b91f40fc96315afda79a0f3e1b867062 SHA1 037b4ed519ca462af956fd7e27643ae1234c06e6 SHA256 9be65001827a0ef9e5b4720a9fc2b83038d7ea44832102c37ba870de663f3d84
-EBUILD icecat-3.6.11.ebuild 8477 RMD160 1e86f7817c648b41c065bda7dbafaa61e2ccafb7 SHA1 6d0811499fcadcb1360e3f0d4194df1fe970be54 SHA256 21a5124c937337a29769e00566e1028383ebceff07038549c9775fdd0010a2f5
+EBUILD icecat-3.6.11.ebuild 8536 RMD160 2748845c84cbc3b1510f4075cf8ac288974f130e SHA1 e65c0d47f042b91ad289f4d273203a7426607660 SHA256 7e4a439f40e7a136a6bec98bc988a91e48d9c4061f9231a6b258a1e551f6bed0
 EBUILD icecat-3.6.9-r1.ebuild 8363 RMD160 027a879b1d0f4608e1b315140e43d7d625b2097b SHA1 bb3a9ca1baf58a48289621884dde039eb5433bbd SHA256 40b053d06a8100a7c627627f52ab684fc431545b0c57bea996f55249ce2e8504
 EBUILD icecat-3.6.9.ebuild 8305 RMD160 51800797f8e47d361a0c78e81d01562f4e2f4331 SHA1 8f208906debc3da502ce43d9e28b5d9626330342 SHA256 15fee101af9dd9fa969894c5975ef170855b6d11af419c0c089f7b6127afcdb3
-MISC ChangeLog 7318 RMD160 753b9526f594c4d2634ae37afbc10881909d109a SHA1 eaa3786d02506be42d7557fc4a8d58ee9aa86a3a SHA256 298f54178a0ec99dfd7f0c14d138b8a8a6ee5c096cc9e40f071e6184b518ca0a
+MISC ChangeLog 7494 RMD160 61bab0cb7d88d004ef61d890e5632facc189504f SHA1 576cd7b2520448e4a35c98021fb462a87bc83a28 SHA256 9b643144b31997827c52f590587b01b2be1425bfb054c0c9ab64e56300d6051a
 MISC metadata.xml 539 RMD160 1c03f865d6541dd4dcf565c5da2d9ff64675d8e5 SHA1 6007bf5a10fff04ae371bf625b855ddf9ab677bd SHA256 c7f2acb59cf5194b0c1d9215056765b908e2d71000ca3019bbf735be7d0c2f65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkzJjYQACgkQ9/cejkQaxBDHXQCfWh7JWtBa4cyLlH1rEFmoGxR3
-buMAnicYHrcuHwYkfANxKtogHiLeuQOS
-=EojB
------END PGP SIGNATURE-----
diff --git a/www-client/icecat/files/xulrunner-1.9.2-gtk+-2.21.patch b/www-client/icecat/files/xulrunner-1.9.2-gtk+-2.21.patch
new file mode 100644
index 000000000000..8a1e83134bb0
--- /dev/null
+++ b/www-client/icecat/files/xulrunner-1.9.2-gtk+-2.21.patch
@@ -0,0 +1,23 @@
+# HG changeset patch
+# User Jonathan Callen <abcd@gentoo.org>
+# Parent 2599ed882191d88a8e8f0cb68492a156163c5ca7
+pass MOZ_GTK_CFLAGS to ensure proper includes are avaliable.
+
+diff --git a/toolkit/system/gnome/Makefile.in b/toolkit/system/gnome/Makefile.in
+--- a/toolkit/system/gnome/Makefile.in
++++ b/toolkit/system/gnome/Makefile.in
+@@ -84,13 +84,14 @@ EXTRA_DSO_LDOPTS += \
+ 		$(MOZ_LIBNOTIFY_LIBS) \
+ 		$(NULL)
+ 
+ LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/components/build/
+ 
+ include $(topsrcdir)/config/rules.mk
+ 
+ CXXFLAGS += \
++	$(MOZ_GTK2_CFLAGS) \
+ 	$(MOZ_GCONF_CFLAGS) \
+ 	$(MOZ_GNOMEVFS_CFLAGS) \
+ 	$(GLIB_CFLAGS) \
+ 	$(MOZ_LIBNOTIFY_CFLAGS) \
+ 	$(NULL)
diff --git a/www-client/icecat/icecat-3.6.11.ebuild b/www-client/icecat/icecat-3.6.11.ebuild
index d8f19e5e5d51..a1b4914a0eb9 100644
--- a/www-client/icecat/icecat-3.6.11.ebuild
+++ b/www-client/icecat/icecat-3.6.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/icecat-3.6.11.ebuild,v 1.3 2010/10/28 14:49:25 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/icecat-3.6.11.ebuild,v 1.4 2010/10/28 15:58:01 polynomial-c Exp $
 EAPI="3"
 WANT_AUTOCONF="2.1"
 
@@ -133,6 +133,8 @@ src_prepare() {
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}"
 
+	epatch "${FILESDIR}/xulrunner-1.9.2-gtk+-2.21.patch"
+
 	# Fix rebranding
 	sed -i 's|\$(DIST)/bin/firefox|\$(DIST)/bin/icecat|' browser/app/Makefile.in