diff options
| author |   Florian Fischer <vlooe@web.de> | 2009-07-04 18:47:10 +0200 |
|---|---|---|
| committer | Florian Fischer <vlooe@web.de> | 2009-07-04 18:47:10 +0200 |
| commit | 8464b044d88f268b6942880d04b30cf7ec0ceb0f (patch) | |
| tree | 93095c34b455275e4c89a0acb7ad1ceec85bed6f | |
| parent | synced net-wireless/bluez with portage tree (diff) | |
| download | multilib-portage-8464b044d88f268b6942880d04b30cf7ec0ceb0f.tar.gz multilib-portage-8464b044d88f268b6942880d04b30cf7ec0ceb0f.tar.bz2 multilib-portage-8464b044d88f268b6942880d04b30cf7ec0ceb0f.zip | |
synced net-libs/xulrunner with portage tree
| -rw-r--r-- | metadata/cache/net-libs/xulrunner-1.9.0.11-r1 (renamed from metadata/cache/net-libs/xulrunner-1.9.0.11) | 0 | ||||
| -rw-r--r-- | net-libs/xulrunner/Manifest | 3 | ||||
| -rw-r--r-- | net-libs/xulrunner/files/066-fix-includedir-mozilla-js.patch | 24 | ||||
| -rw-r--r-- | net-libs/xulrunner/xulrunner-1.9.0.11-r1.ebuild (renamed from net-libs/xulrunner/xulrunner-1.9.0.11.ebuild) | 5 |
4 files changed, 30 insertions, 2 deletions
diff --git a/metadata/cache/net-libs/xulrunner-1.9.0.11 b/metadata/cache/net-libs/xulrunner-1.9.0.11-r1 index d3cf6a1d6..d3cf6a1d6 100644 --- a/metadata/cache/net-libs/xulrunner-1.9.0.11 +++ b/metadata/cache/net-libs/xulrunner-1.9.0.11-r1 diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest index 7679c1bb2..70e990577 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.conf 113 RMD160 8be48cf5040eb5753c8eb35c048cc6b2c1a8a057 SHA1 62cce7ee5b1e51343c3dbc388894011da913d9d4 SHA256 9ac56b42cfb48854d23c299330ad327af5f0815140dcb7fdee905b660cd9a8a3 DIST xulrunner-1.8.1.19-patches-0.1.tar.bz2 62219 RMD160 ecc59c5204090c6aa9c475bc181f745a6be84e98 SHA1 1b19bb5b4203a582d990175189b11f0215531327 SHA256 621a9e7abdfd667b05d0c8cee7b3cc284decd3ee50958ea849969f9ac3475f73 DIST xulrunner-1.8.1.19-source.tar.bz2 38110248 RMD160 2b742243c6370a2790f48d2ceae2be756b4737ce SHA1 fb1b85088000142e24609d5ab9e6e483a82f8917 SHA256 3c1873b3e6c660acdae9e102391bbc64274cea3ed6238d9d693ab09fcf2b53ee @@ -6,4 +7,4 @@ DIST xulrunner-1.9.0.10.tar.bz2 34167778 RMD160 96ca5c569bbee78924c6e9cb5fea6608 DIST xulrunner-1.9.0.11.tar.bz2 34209785 RMD160 63ace56728ceac5d54b8613c842d69791a87be3d SHA1 9e64464303eef215c11793ac1c096abac58215f6 SHA256 142aa222bbf800867f6301f05ca8c158edc17bfb3ad11c73c38a57ca7da3c5a2 EBUILD xulrunner-1.8.1.19.ebuild 5233 RMD160 f0da564f363e04d5f2ca7c169798ccdb628c814e SHA1 a6ce2f92954b6ea28f8d94f54fe65fee5625f43c SHA256 cd330be6debd53170a0be8b6d12d789573d0e3870c33eed30b2bd7d035e9090d EBUILD xulrunner-1.9.0.10.ebuild 4848 RMD160 0a6be1466641e189ce03231e24fed9b7760dd22c SHA1 e4dbe4d6192a359a77fccaa4dae342158dd822aa SHA256 7be58384abcd49811bf783ef467d7ac603dcaa437e41fe683f5b198d59f2a9dc -EBUILD xulrunner-1.9.0.11.ebuild 4857 RMD160 f0117ccf3e17e472e2a7a8dbce505d7ceb1d50e4 SHA1 9a1365eae51cab08e076b95c33d83f9cf149286a SHA256 293a16b37e3d64bcb313cec78f5e071b17753a14d98aa3d364da4ba2f1c4007b +EBUILD xulrunner-1.9.0.11-r1.ebuild 4974 RMD160 47ba06171be94b41276e29b9aa0dfbbf6d803348 SHA1 656e12507fe73d4d4ad04772f4937b94ee2e1e18 SHA256 3b0c0aea91fa648e6456e41d72f6f2d0191bbff85921f5c96b3a289e94aed0f0 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 000000000..490042730 --- /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 diff --git a/net-libs/xulrunner/xulrunner-1.9.0.11.ebuild b/net-libs/xulrunner/xulrunner-1.9.0.11-r1.ebuild index 0928e9ab6..ff9227f8f 100644 --- a/net-libs/xulrunner/xulrunner-1.9.0.11.ebuild +++ b/net-libs/xulrunner/xulrunner-1.9.0.11-r1.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.9.0.11.ebuild,v 1.6 2009/06/26 00:23:12 rich0 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.0.11-r1.ebuild,v 1.1 2009/06/29 16:42:04 nirbheek Exp $ EAPI="2" WANT_AUTOCONF="2.1" @@ -52,6 +52,9 @@ src_prepare() { EPATCH_FORCE="yes" \ epatch "${WORKDIR}"/patch + # Bad mozilla-js.pc, causes stuff like bug 275318 + epatch "${FILESDIR}/066-fix-includedir-mozilla-js.patch" + eautoreconf || die "failed running eautoreconf" # We need to re-patch this because autoreconf overwrites it |