summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhang Le <r0bertz@gentoo.org>2009-07-19 03:55:30 +0800
committerZhang Le <r0bertz@gentoo.org>2009-07-19 03:55:30 +0800
commitc67f4017706b8545c5ee96e1a736d21fb06d02ae (patch)
treef11ddb42941038b3d18f0b76d695d7e78e216541 /net-libs
parentadd \-mplt to ALLOWED_FLAGS so that it will not be strip-flags'ed (diff)
downloadloongson-c67f4017706b8545c5ee96e1a736d21fb06d02ae.tar.gz
loongson-c67f4017706b8545c5ee96e1a736d21fb06d02ae.tar.bz2
loongson-c67f4017706b8545c5ee96e1a736d21fb06d02ae.zip
added xulrunner-1.9.1-r1.ebuild
Signed-off-by: Zhang Le <r0bertz@gentoo.org>
Diffstat (limited to 'net-libs')
-rw-r--r--net-libs/xulrunner/Manifest5
-rw-r--r--net-libs/xulrunner/files/067-fix-includedir-mozilla-plugin.patch19
-rw-r--r--net-libs/xulrunner/xulrunner-1.9.1-r1.ebuild (renamed from net-libs/xulrunner/xulrunner-1.9.1.ebuild)14
3 files changed, 30 insertions, 8 deletions
diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index 14af403..6c6384d 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -1,3 +1,4 @@
+AUX 067-fix-includedir-mozilla-plugin.patch 619 RMD160 43fa210f770e36e52c135ff3ea7f3efce548c719 SHA1 da46894e53fe3f046e4338ac89a36f2f04be064b SHA256 5eaf528993bc8cea8bfe209abb8241577322d419bdca19e3551b476756beb25f
AUX 067-force-bundled-ply.patch 560 RMD160 ed07a71c278e80546781387067435b779f3cc2d8 SHA1 040fbfa00135454b51dac33878bf787db5d1bbbe SHA256 a11818c09ab074145b3722bb53095f52d73a8ce84b14a696db01bd2d1eae4090
AUX README 145 RMD160 e6b6991f1dc429a081f6f16a0a7a24909c2ee576 SHA1 10e9be7039df62377a2e2ba8358beeceffbbbb07 SHA256 9b7fac0b4b5834c404c392bd34408eb3cbcfc75be6335395f44f8953adc102df
AUX xulrunner-1.9.0.5-gcc4.4.patch 1893 RMD160 8510bc33a55a1d3580439ed510e4705c3e217e57 SHA1 fcc5577e290e20bfa6bfa052a343dc5fad774250 SHA256 c21cc87796f0f1c3ec0f82e2e907b5a12c800a77d3a909f0d293879df1a23f05
@@ -5,11 +6,11 @@ AUX xulrunner-mips-bus-error.patch 1412 RMD160 2194194a38a1631450d199784b80c7f6d
AUX xulrunner-mips-n32.patch 24732 RMD160 d5020c88801e6647131c6c2d780a90ccc0717c7a SHA1 37be69001a75f62d51e84b8b22f1946c27e8baa1 SHA256 5cce08d42a0cf629717b34ec0310b86080640ff6fe5bc14988d1b046562e7254
AUX xulrunner-mips-o32.patch 17598 RMD160 997add4cc1c0aa96c2484e860bb51441d5adb7e1 SHA1 e32d33007446db694ca5e61c853620970fe9d22e SHA256 9ce5a23a4d2582e48ae43a4cb414a7ce690e1cf029e24d0d5d93b8e301b41bc5
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 firefox-3.5.1-source.tar.bz2 46438473 RMD160 a7fe7bba679160b1b6c995acbc1cb69b4dcad334 SHA1 8659dd873e8a82a9f39fcb1f0add8afb39cb7274 SHA256 935a84aa07e40e342e178c31287cfa7d314db882b23997bffc220222f0b5e883
DIST xulrunner-1.9.0.10-patches-0.1.tar.bz2 7077 RMD160 73612f1b619fef5d02e8c8f8318afe192e435e42 SHA1 8a48e53951216c330d4908def93a5c0201f5a890 SHA256 bc0c0d26258bc17ffa5cd513089fe94395ff8f6c17023cd363fac30cdd675410
DIST xulrunner-1.9.0.10.tar.bz2 34167778 RMD160 96ca5c569bbee78924c6e9cb5fea660870a8c096 SHA1 926d9042557e2d767db91b1d183327713fb090d3 SHA256 fe4091f4de50278567b4e26effea66a998dd41f455077e1e37cff8b3417a8f34
DIST xulrunner-1.9.1-patches-0.1.tar.bz2 6077 RMD160 8837d4c7a0440b6e2d4e12316aa243bd73334dcf SHA1 e8fc552acb5fa981c64d8e9d9b03ac893f18b253 SHA256 61b35e55889c16633684e6b9ac645a9a427c21931925137261feb576a781a404
EBUILD xulrunner-1.9.0.10.ebuild 4924 RMD160 812e4fb1216d76dd84c1041365001bb9291cb448 SHA1 1843a099e8dbf0475cc37ebd41c6e477165579db SHA256 d0fc674b97a2cf9d2a499ec5d7b915c570ca4e88873882c7cc4157500415d59e
-EBUILD xulrunner-1.9.1.ebuild 6886 RMD160 5753fc66fec57f03b03de58eb8d91ad84f2989d9 SHA1 0d87dc90deb9cd109a5e50c56f009c5c2e9ba041 SHA256 9d6c02f8c213cd3c6e1305306201bbaa51cc100e35ccefd87ebafba145c9afa4
+EBUILD xulrunner-1.9.1-r1.ebuild 6900 RMD160 a9442ed66022bffd393d3d1b5365d16893e37708 SHA1 b2e379855f425220771680ff32109ad724145454 SHA256 bdb5f9cdebacf3076f25890ae1fd3c955aaba249ab06350f09f161ada1de4add
MISC ChangeLog 20231 RMD160 53d013acdc632eee5a57c68cc91590a9d97d322b SHA1 50a8a72f61cdf952923a6c40d3ddbdafa10682fc SHA256 4dc8981ad9cda5b06ff6f5e7b826a01d32082c6a306879ee1e3923a8aa93a449
MISC metadata.xml 263 RMD160 9ed9d79d17d0a991e88c31ae6342996519ffef5b SHA1 0de183203298ce0f1c2ecc3fc8149842c4a0ec60 SHA256 64bfc93c4ab02ef2fe9b61b8157eb722d6cca5d552eecc18eaaf8e95980d2550
diff --git a/net-libs/xulrunner/files/067-fix-includedir-mozilla-plugin.patch b/net-libs/xulrunner/files/067-fix-includedir-mozilla-plugin.patch
new file mode 100644
index 0000000..0e475b4
--- /dev/null
+++ b/net-libs/xulrunner/files/067-fix-includedir-mozilla-plugin.patch
@@ -0,0 +1,19 @@
+mozilla-plugin stuff is actually in /unstable not in /stable
+
+Causes bugs like http://bugs.gentoo.org/257803
+
+---
+--- xulrunner/installer/mozilla-plugin.pc.in~ 2009-06-26 08:37:34.458635913 -0500
++++ xulrunner/installer/mozilla-plugin.pc.in 2009-06-26 08:38:13.623656097 -0500
+@@ -1,9 +1,10 @@
+ prefix=%prefix%
+ sdkdir=%sdkdir%
+ includedir=%includedir%
++includetypes=unstable
+
+ Name: Mozilla Plug-In API
+ Description: Mozilla Plug-In API
+ Version: %MOZILLA_VERSION%
+ Requires: %NSPR_NAME% >= %NSPR_VERSION%
+-Cflags: -I${includedir}/stable -DXP_UNIX %ojidef%
++Cflags: -I${includedir}/${includetypes} -DXP_UNIX %ojidef%
diff --git a/net-libs/xulrunner/xulrunner-1.9.1.ebuild b/net-libs/xulrunner/xulrunner-1.9.1-r1.ebuild
index 3f8f0a5..746c625 100644
--- a/net-libs/xulrunner/xulrunner-1.9.1.ebuild
+++ b/net-libs/xulrunner/xulrunner-1.9.1-r1.ebuild
@@ -9,7 +9,7 @@ inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib java-p
MY_PV="${PV/_beta/b}" # Handle betas
MY_PV="${PV/_/}" # Handle rc1, rc2 etc
-MY_PV="${MY_PV/1.9.1/3.5}"
+MY_PV="${MY_PV/1.9.1/3.5.1}"
MAJ_PV="${PV/_*/}"
PATCH="${PN}-${MAJ_PV}-patches-0.1"
@@ -72,6 +72,9 @@ src_prepare() {
# bug 276018 upstreamed, remove in 1.9.2
epatch "${FILESDIR}/067-force-bundled-ply.patch"
+ # bug 257803, fix broken mozilla-plugin.pc
+ epatch "${FILESDIR}/067-fix-includedir-mozilla-plugin.patch"
+
# Same as in config/autoconf.mk.in
MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
SDKDIR="/usr/$(get_libdir)/${PN}-devel-${MAJ_PV}/sdk"
@@ -80,16 +83,15 @@ src_prepare() {
|| die "\${MAJ_PV} sed failed!"
# enable gnomebreakpad by default
- sed -i -e 's/GNOME_DISABLE_CRASH_DIALOG=1/GNOME_DISABLE_CRASH_DIALOG=0/g' \
- "${S}/build/unix/run-mozilla.sh"
+ if use debug; then
+ sed -i -e 's/GNOME_DISABLE_CRASH_DIALOG=1/GNOME_DISABLE_CRASH_DIALOG=0/g' \
+ "${S}/build/unix/run-mozilla.sh"
+ fi
eautoreconf
cd js/src
eautoreconf
-
- # We need to re-patch this because autoreconf overwrites it
-# epatch "${FILESDIR}"/patch/000_flex-configure-LANG.patch
}
src_configure() {