Fix for bug #280562

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

4 files changed, 25 insertions, 14 deletions

diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog
index acf764d410df..4a4c451c6936 100644
--- a/net-libs/xulrunner/ChangeLog
+++ b/net-libs/xulrunner/ChangeLog
@@ -1,6 +1,11 @@
 # 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.238 2009/08/24 17:54:36 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.239 2009/08/24 20:41:18 anarchy Exp $
+
+  24 Aug 2009; Jory A. Pratt <anarchy@gentoo.org> xulrunner-1.8.1.19.ebuild,
+  +files/xulrunner-1.8.1.19-glibc-2.10-support.patch:
+  Fix compilation with glibc-2.10.x and gcc-4.4.1, bug #280562, thanks
+  Attila Toth
 
   24 Aug 2009; Christian Faulhammer <fauli@gentoo.org>
   xulrunner-1.9.0.13.ebuild:
diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index d6eaacac6b8c..7ce166c3a526 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -1,9 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 000_flex-configure-LANG.patch 1761 RMD160 638ae47607f582d6d264f7b6f4c3626ff60dbcb6 SHA1 db6d868d034b46b63ad292ab2e1c9b889fbeef75 SHA256 88719f2b3ab2be74a4d27173f7464f6fbc8e7697b84e3c32d19cf6e16170e532
 AUX 066-fix-includedir-mozilla-js.patch 747 RMD160 39c4430f77e42f5f5ad5f8038c036fccac1a7bb0 SHA1 9a1a09ee9bdca8ab9aeec6408baf207da9abe88a SHA256 069f6b1a43662e417e7f0194ceb039941c209409f8fb788914f862595cdf52f4
 AUX xulrunner-1.8-gcc-4.4.patch 310 RMD160 9d8f402aa66752b7d61fc47b6f4a1526f1f8a4e5 SHA1 741a8679bb6d65d83dfdc1ea0cd277c08b3bcc7e SHA256 2bb5b927e11307daf14b4cdab381fba27c6fcb0ba8631e7952d38821282e2c6f
+AUX xulrunner-1.8.1.19-glibc-2.10-support.patch 696 RMD160 171629110f94ecf974e7d0ac71ac842f16786b27 SHA1 316f3f325ed219643362a1837dd8451000945393 SHA256 1cf9a4c0dd54a537886dff05be9e996fc25e63518f5eaef5781492a2a21150b2
 AUX xulrunner-default-prefs.js 677 RMD160 73ec130da332c1d6517a6f838d5fab0cc134289a SHA1 b9efc3ef5e95ad3081f6b68d771e32e848b4b9ac SHA256 53493080276f221f1619153c114caf268206a6fa107972b33a4eb7f1c1cf6fe8
 AUX xulrunner.conf 113 RMD160 8be48cf5040eb5753c8eb35c048cc6b2c1a8a057 SHA1 62cce7ee5b1e51343c3dbc388894011da913d9d4 SHA256 9ac56b42cfb48854d23c299330ad327af5f0815140dcb7fdee905b660cd9a8a3
 DIST firefox-3.5.2-source.tar.bz2 46787928 RMD160 d5e0b5f0e8b19b216394584ccabf37d776b89a39 SHA1 6439923ff9d316297926ebe193bac3ac1a41b494 SHA256 d68b5988907e06cc37793489589f5545487a9b1bbe6444b7e2e16450bd1cb9ae
@@ -16,18 +14,11 @@ DIST xulrunner-1.9.0.12-patches-0.1.tar.bz2 6548 RMD160 135cf202dd34c2dce5624d15
 DIST xulrunner-1.9.0.13.tar.bz2 34400077 RMD160 a58cf7845eb28d8db16996050b99c093582ac21a SHA1 0df1d8eff4c1b0fceddf6e17921cc27aaeb81ac2 SHA256 51e25eaaad90c9f6f945de49b5c0e21869076a4037a6ca796ef35ed6411b5c4c
 DIST xulrunner-1.9.1.2-patches-0.2.tar.bz2 8123 RMD160 f4c0b52bdd32f26b9a924ad4b331e99c2bb13895 SHA1 535f7f21576de4f333b922e101381b19a5bcb8d0 SHA256 04e09609dad1057fac11aa8db551eaef9a7ee41dd536523b81d11d9f37a5db91
 DIST xulrunner-1.9.1.2-patches-0.3.tar.bz2 8839 RMD160 aa1902800aedf3323e1836bb9befea41b2b0d90c SHA1 fc1689350cb3955ef6fceb942627003663464c64 SHA256 9c6bf20c29b0cddd06ba87943962a3870ea5a1beccf0d914bbd671404ea4105a
-EBUILD xulrunner-1.8.1.19.ebuild 5112 RMD160 ae56c846a18f9edd396aa18169619250a2c3d293 SHA1 af67a48b3c7690d996aef1caf0ce71a4bab1d4d6 SHA256 cbef00c1ae6f23becdad8b9754ed7d4a034a152e17e87334ac4f7dce483dc385
+EBUILD xulrunner-1.8.1.19.ebuild 5164 RMD160 35f73e1a6e27b86f3e94e3000a6d5e197f5eff9b SHA1 0874e166bb9f80c0032bb79c881f8d281be9931d SHA256 53ef65858659ae8843234751632f2a806b73aec3a34cc846e9a42f175e4a6a2b
 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.0.13.ebuild 4829 RMD160 c4cde9f9c02d8042a893688c727f3f710a4938ee SHA1 b0c555ad39710737a7dc6b6426eb7778a2a5d7bb SHA256 15049e0ad2e986c64e7a179317dfc0ff52f44964767d2add54a02ba2793ccb17
 EBUILD xulrunner-1.9.1.2-r1.ebuild 7309 RMD160 e25c1fb6c07c69982ca7c18aa52de383c24ed976 SHA1 6088188f7f984c66598e14e720608ce267007595 SHA256 60e42f3a0656142520bdfd30ea253686822d39b3793acf6add9e677710e101da
 EBUILD xulrunner-1.9.1.2.ebuild 7409 RMD160 439aea280a40fadab9d0a88fdf732f36261f7883 SHA1 df6bf4865fa842cb3c7924f6ce0adc2bb049f03f SHA256 6450a1c67adfa7bd6a9c6d32682fab20b03fe3162b7771fb05fc19f481bcdb58
-MISC ChangeLog 31645 RMD160 bf7b8bbb59912501a4c39f3738a92362fd77592a SHA1 1559d950ff2d5ad43b1e2e0489f0a292be0d2806 SHA256 97498fef0dc964b78a6a029f9765a4eb5f29c19269d3256c23952646a922191f
+MISC ChangeLog 31864 RMD160 c360c0cd46eab8fc21253804cea3bc49fa974a52 SHA1 ac7ceaa2a4696cc91458583616edbe2c38fd8b0f SHA256 c8a07f0fc3a594156857aaa0f52dd5609a227d467b35599a340a71915a338785
 MISC metadata.xml 263 RMD160 9ed9d79d17d0a991e88c31ae6342996519ffef5b SHA1 0de183203298ce0f1c2ecc3fc8149842c4a0ec60 SHA256 64bfc93c4ab02ef2fe9b61b8157eb722d6cca5d552eecc18eaaf8e95980d2550
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqS0+0ACgkQNQqtfCuFneP0ywCfeshOCtXMC2diSSffDAZDfcyc
-9mUAn1j4kwlNF396Eu6JwSCzFQ0uLtJW
-=GgIf
------END PGP SIGNATURE-----
diff --git a/net-libs/xulrunner/files/xulrunner-1.8.1.19-glibc-2.10-support.patch b/net-libs/xulrunner/files/xulrunner-1.8.1.19-glibc-2.10-support.patch
new file mode 100644
index 000000000000..4a4cefc25ae6
--- /dev/null
+++ b/net-libs/xulrunner/files/xulrunner-1.8.1.19-glibc-2.10-support.patch
@@ -0,0 +1,14 @@
+diff -urN mozilla.orig/xpcom/glue/standalone/nsGlueLinkingDlopen.cpp mozilla.dwokfur/xpcom/glue/standalone/nsGlueLinkingDlopen.cpp
+--- mozilla.orig/xpcom/glue/standalone/nsGlueLinkingDlopen.cpp	2009-08-23 08:56:52.000000000 +0200
++++ mozilla.dwokfur/xpcom/glue/standalone/nsGlueLinkingDlopen.cpp	2009-08-23 10:00:46.000000000 +0200
+@@ -87,7 +87,8 @@
+ XPCOMGlueLoad(const char *xpcomFile)
+ {
+     char xulFile[MAXPATHLEN];
+-    char *lastSlash = strrchr(xpcomFile, '/');
++    char *xpcomFileb = const_cast<char*>(xpcomFile);
++    char *lastSlash = strrchr(xpcomFileb, '/');
+     if (!lastSlash) {
+         snprintf(xulFile, MAXPATHLEN, "./%s", xpcomFile);
+         return XPCOMGlueLoad(xulFile);
+
diff --git a/net-libs/xulrunner/xulrunner-1.8.1.19.ebuild b/net-libs/xulrunner/xulrunner-1.8.1.19.ebuild
index 70a34074f4ec..ec72e382ccaf 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.9 2009/07/07 15:03:57 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.8.1.19.ebuild,v 1.10 2009/08/24 20:41:18 anarchy Exp $
 
 WANT_AUTOCONF="2.1"
 
@@ -62,6 +62,7 @@ src_unpack() {
 
 	# gcc-4.4 #elif -> #else, bug 270093
 	epatch "${FILESDIR}/xulrunner-1.8-gcc-4.4.patch"
+	epatch "${FILESDIR}/${P}-glibc-2.10-support.patch"
 
 	eautoreconf || die "failed  running eautoreconf"
 }