Fix gcc-4.4 porting bug 270093. Trivial patch, straight to stable w/o bump

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 26 insertions, 4 deletions

diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog
index 7ccd66f70842..a820abc58d4b 100644
--- a/net-libs/xulrunner/ChangeLog
+++ b/net-libs/xulrunner/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/xulrunner
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.218 2009/07/02 06:17:02 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.219 2009/07/07 15:03:57 nirbheek Exp $
+
+  07 Jul 2009; <nirbheek@gentoo.org> +files/xulrunner-1.8-gcc-4.4.patch,
+  xulrunner-1.8.1.19.ebuild:
+  Fix gcc-4.4 porting bug 270093. Trivial patch, straight to stable w/o bump
 
   02 Jul 2009; <nirbheek@gentoo.org> +files/067-force-bundled-ply.patch,
   xulrunner-1.9.1.ebuild:
diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index c6832fcdfe80..81f6c1f26cf5 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -1,5 +1,6 @@
 AUX 066-fix-includedir-mozilla-js.patch 747 RMD160 39c4430f77e42f5f5ad5f8038c036fccac1a7bb0 SHA1 9a1a09ee9bdca8ab9aeec6408baf207da9abe88a SHA256 069f6b1a43662e417e7f0194ceb039941c209409f8fb788914f862595cdf52f4
 AUX 067-force-bundled-ply.patch 560 RMD160 ed07a71c278e80546781387067435b779f3cc2d8 SHA1 040fbfa00135454b51dac33878bf787db5d1bbbe SHA256 a11818c09ab074145b3722bb53095f52d73a8ce84b14a696db01bd2d1eae4090
+AUX xulrunner-1.8-gcc-4.4.patch 310 RMD160 9d8f402aa66752b7d61fc47b6f4a1526f1f8a4e5 SHA1 741a8679bb6d65d83dfdc1ea0cd277c08b3bcc7e SHA256 2bb5b927e11307daf14b4cdab381fba27c6fcb0ba8631e7952d38821282e2c6f
 AUX xulrunner.conf 113 RMD160 8be48cf5040eb5753c8eb35c048cc6b2c1a8a057 SHA1 62cce7ee5b1e51343c3dbc388894011da913d9d4 SHA256 9ac56b42cfb48854d23c299330ad327af5f0815140dcb7fdee905b660cd9a8a3
 DIST firefox-3.5-source.tar.bz2 46444013 RMD160 00e862a86fad716b5c9b8c6ad25daa65e245a421 SHA1 acf223f2ba3b5e601f8832a3870a5d9034ac8d10 SHA256 15f80f5cc83ebcd559975019837d12f8cda0b7130337d352410195689915b23a
 DIST xulrunner-1.8.1.19-patches-0.1.tar.bz2 62219 RMD160 ecc59c5204090c6aa9c475bc181f745a6be84e98 SHA1 1b19bb5b4203a582d990175189b11f0215531327 SHA256 621a9e7abdfd667b05d0c8cee7b3cc284decd3ee50958ea849969f9ac3475f73
@@ -8,9 +9,9 @@ DIST xulrunner-1.9.0.10-patches-0.1.tar.bz2 7077 RMD160 73612f1b619fef5d02e8c8f8
 DIST xulrunner-1.9.0.10.tar.bz2 34167778 RMD160 96ca5c569bbee78924c6e9cb5fea660870a8c096 SHA1 926d9042557e2d767db91b1d183327713fb090d3 SHA256 fe4091f4de50278567b4e26effea66a998dd41f455077e1e37cff8b3417a8f34
 DIST xulrunner-1.9.0.11.tar.bz2 34209785 RMD160 63ace56728ceac5d54b8613c842d69791a87be3d SHA1 9e64464303eef215c11793ac1c096abac58215f6 SHA256 142aa222bbf800867f6301f05ca8c158edc17bfb3ad11c73c38a57ca7da3c5a2
 DIST xulrunner-1.9.1-patches-0.1.tar.bz2 6077 RMD160 8837d4c7a0440b6e2d4e12316aa243bd73334dcf SHA1 e8fc552acb5fa981c64d8e9d9b03ac893f18b253 SHA256 61b35e55889c16633684e6b9ac645a9a427c21931925137261feb576a781a404
-EBUILD xulrunner-1.8.1.19.ebuild 5022 RMD160 22bdb064b24d37257aebb27335243f2a6703e7c4 SHA1 52870fb58e61cd22d8b5cd459a7002201125d64d SHA256 7888b47136eab95aee6da57942b653df474732ce7c9ef1b73842d2900a9b10c9
+EBUILD xulrunner-1.8.1.19.ebuild 5112 RMD160 ae56c846a18f9edd396aa18169619250a2c3d293 SHA1 af67a48b3c7690d996aef1caf0ce71a4bab1d4d6 SHA256 cbef00c1ae6f23becdad8b9754ed7d4a034a152e17e87334ac4f7dce483dc385
 EBUILD xulrunner-1.9.0.10.ebuild 4704 RMD160 4c9c1bd079a72df2da35ce654d42b4a8ef230a3f SHA1 59758a181a9b94fce9cf7b5f6fa11af77d56b2c1 SHA256 c88b9f9a01e10ecae1fb072c320771384f56f772e9c6cce8cf7e89b438aae7df
 EBUILD xulrunner-1.9.0.11-r1.ebuild 4829 RMD160 bab59a48bda5b5e98d4353309bf8d5c777374734 SHA1 9d3f2170975d30c9356a6f47d81c7e8a540ac7e3 SHA256 ebc9495cdeac42cca8d288ac8d8771732e36e5ef1e561e4860e271d2018fe750
 EBUILD xulrunner-1.9.1.ebuild 6754 RMD160 6a65ee94af4e77eed2ab6b80c0a45fc607a9f3eb SHA1 e9ecbc7ac80490ca6da43652d383a738305bcada SHA256 d843812e7389a251f8596a679e457861d23fdc8199eb4665d849114a15b4bfcf
-MISC ChangeLog 28308 RMD160 a27b14569eeb59a0fca982903e6633138743dcef SHA1 2d7238fac5e46b28ef315a36e79512876ae680b0 SHA256 ef34c5dcc40ac3b15007fa6be4097d52c356c6e3fe2bbd04185e8269f062c593
+MISC ChangeLog 28488 RMD160 3e2bfb7f629e6115a5fd7a6212d86d0d752be94a SHA1 a1a88e0cf810d2b775606d760444a6abca96df45 SHA256 e2b33d6a768f6fd231a1325ad94710ff5fecb74e310e0eb010f8bea174f5997d
 MISC metadata.xml 263 RMD160 9ed9d79d17d0a991e88c31ae6342996519ffef5b SHA1 0de183203298ce0f1c2ecc3fc8149842c4a0ec60 SHA256 64bfc93c4ab02ef2fe9b61b8157eb722d6cca5d552eecc18eaaf8e95980d2550
diff --git a/net-libs/xulrunner/files/xulrunner-1.8-gcc-4.4.patch b/net-libs/xulrunner/files/xulrunner-1.8-gcc-4.4.patch
new file mode 100644
index 000000000000..583656b4441e
--- /dev/null
+++ b/net-libs/xulrunner/files/xulrunner-1.8-gcc-4.4.patch
@@ -0,0 +1,14 @@
+Port to gcc-4.4, bug 270093
+Patch by Evan Teran
+---
+--- mozilla/toolkit/xre/nsAppRunner.cpp
++++ mozilla/toolkit/xre/nsAppRunner.cpp
+@@ -1370,7 +1370,7 @@ XRE_GetBinaryPath(const char* argv0, nsI
+   if (NS_FAILED(rv))
+     return rv;
+ 
+-#elif
++#else
+ #error Oops, you need platform-specific code here
+ #endif
+ 
diff --git a/net-libs/xulrunner/xulrunner-1.8.1.19.ebuild b/net-libs/xulrunner/xulrunner-1.8.1.19.ebuild
index d6011eaf19ec..70a34074f4ec 100644
--- a/net-libs/xulrunner/xulrunner-1.8.1.19.ebuild
+++ b/net-libs/xulrunner/xulrunner-1.8.1.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.8.1.19.ebuild,v 1.8 2009/01/25 21:16:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.8.1.19.ebuild,v 1.9 2009/07/07 15:03:57 nirbheek Exp $
 
 WANT_AUTOCONF="2.1"
 
@@ -60,6 +60,9 @@ src_unpack() {
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}"/patch
 
+	# gcc-4.4 #elif -> #else, bug 270093
+	epatch "${FILESDIR}/xulrunner-1.8-gcc-4.4.patch"
+
 	eautoreconf || die "failed  running eautoreconf"
 }