summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Olexa <darkside@gentoo.org>2009-07-22 03:42:28 +0000
committerJeremy Olexa <darkside@gentoo.org>2009-07-22 03:42:28 +0000
commit386549c58195116c82a8dbae1456ae32e8951d7d (patch)
tree5e277efc7ea7d9b9fa9091b3317a4555c3541a43 /net-libs
parentamd64 stable, bug 278174 (diff)
downloadhistorical-386549c58195116c82a8dbae1456ae32e8951d7d.tar.gz
historical-386549c58195116c82a8dbae1456ae32e8951d7d.tar.bz2
historical-386549c58195116c82a8dbae1456ae32e8951d7d.zip
add back patch that was accidently removed, bug 278622
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64
Diffstat (limited to 'net-libs')
-rw-r--r--net-libs/xulrunner/ChangeLog6
-rw-r--r--net-libs/xulrunner/Manifest3
-rw-r--r--net-libs/xulrunner/files/066-fix-includedir-mozilla-js.patch24
3 files changed, 31 insertions, 2 deletions
diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog
index 61b5b4a4f6bc..d85d3a1729db 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.220 2009/07/21 14:01:40 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.221 2009/07/22 03:42:28 darkside Exp $
+
+ 22 Jul 2009; Jeremy Olexa <darkside@gentoo.org>
+ +files/066-fix-includedir-mozilla-js.patch:
+ add back patch that was accidently removed, bug 278622
*xulrunner-1.9.1-r1 (21 Jul 2009)
diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index 4bfc8738c331..79f78ec7b29d 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -1,3 +1,4 @@
+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.conf 113 RMD160 8be48cf5040eb5753c8eb35c048cc6b2c1a8a057 SHA1 62cce7ee5b1e51343c3dbc388894011da913d9d4 SHA256 9ac56b42cfb48854d23c299330ad327af5f0815140dcb7fdee905b660cd9a8a3
DIST firefox-3.5.1-source.tar.bz2 46438473 RMD160 a7fe7bba679160b1b6c995acbc1cb69b4dcad334 SHA1 8659dd873e8a82a9f39fcb1f0add8afb39cb7274 SHA256 935a84aa07e40e342e178c31287cfa7d314db882b23997bffc220222f0b5e883
@@ -11,5 +12,5 @@ EBUILD xulrunner-1.8.1.19.ebuild 5112 RMD160 ae56c846a18f9edd396aa18169619250a2c
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-r1.ebuild 6560 RMD160 fbe1531ef8b5d708a223aafe997698a2d2f05ccf SHA1 e2ef18545deacc69c882e61a65e918bc672909b4 SHA256 3c668cec862f878e21745d9ce6a2745e0a4475ed52e625f7ae469873ed7fd2d1
-MISC ChangeLog 28766 RMD160 5e6f4ff23635e14900666c5b9779825e3390f982 SHA1 379cfef666fd4d1f112def90ac3d79c55b1893d8 SHA256 0bd07f50c9f489b0aa56f409e0f4dd1e3dfd7d99d14e316c6a69c4c06056bb3d
+MISC ChangeLog 28920 RMD160 1d4f5b4b5d901cadd26a90784fdb8e12b2a378ff SHA1 0b4f88b3994142981d4e0a9b8450ea865968baa7 SHA256 982e2008a728b6636d6b75128ac820dc6acde76abc6cb641df30cd29dca11067
MISC metadata.xml 263 RMD160 9ed9d79d17d0a991e88c31ae6342996519ffef5b SHA1 0de183203298ce0f1c2ecc3fc8149842c4a0ec60 SHA256 64bfc93c4ab02ef2fe9b61b8157eb722d6cca5d552eecc18eaaf8e95980d2550
diff --git a/net-libs/xulrunner/files/066-fix-includedir-mozilla-js.patch b/net-libs/xulrunner/files/066-fix-includedir-mozilla-js.patch
new file mode 100644
index 000000000000..490042730cd9
--- /dev/null
+++ b/net-libs/xulrunner/files/066-fix-includedir-mozilla-js.patch
@@ -0,0 +1,24 @@
+mozjs stuff is actually in /unstable not in /stable
+
+Causes bugs like http://bugs.gentoo.org/275318
+
+Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=500645
+
+Will likely be fixed in 1.9.2
+
+---
+--- xulrunner/installer/mozilla-js.pc.in 2009-06-26 08:37:34.458635913 -0500
++++ xulrunner/installer/mozilla-js.pc.in 2009-06-26 08:38:13.623656097 -0500
+@@ -1,10 +1,11 @@
+ prefix=%prefix%
+ sdkdir=%sdkdir%
+ includedir=%includedir%
++includetypes=unstable
+
+ Name: JavaScript
+ Description: The Mozilla JavaScript Library
+ Version: %MOZILLA_VERSION%
+ Requires: %NSPR_NAME% >= %NSPR_VERSION%
+ Libs: -L${sdkdir}/lib -lmozjs
+-Cflags: -I${includedir}/stable -DXP_UNIX -DJS_THREADSAFE
++Cflags: -I${includedir}/${includetypes} -DXP_UNIX -DJS_THREADSAFE