aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSardem FF7 <sardemff7.pub@gmail.com>2011-01-16 13:35:16 +0100
committerSardem FF7 <sardemff7.pub@gmail.com>2011-01-16 13:35:16 +0100
commitfcd4369ebbcffa197dce0247b63cb29fc4ec9f9e (patch)
treee0121ca96f2aade1d5cdc48a1028b7f55185a593 /net-libs
parentUpdate xulrunner/firefox dependencies (diff)
downloadsardemff7-fcd4369ebbcffa197dce0247b63cb29fc4ec9f9e.tar.gz
sardemff7-fcd4369ebbcffa197dce0247b63cb29fc4ec9f9e.tar.bz2
sardemff7-fcd4369ebbcffa197dce0247b63cb29fc4ec9f9e.zip
Add a patch from Keruspe to temporary fix a segfault
Diffstat (limited to 'net-libs')
-rw-r--r--net-libs/xulrunner/Manifest3
-rw-r--r--net-libs/xulrunner/files/keruspe-fix-segfault.patch10
-rw-r--r--net-libs/xulrunner/xulrunner-9999.ebuild2
3 files changed, 14 insertions, 1 deletions
diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index 361cae1..f3a6bcf 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -1,5 +1,6 @@
AUX gentoo-specific.patch 2957 RMD160 684dc2176769a56c2b1c206b59f999cd44d99c45 SHA1 35ff8e325e45b5384a404a4f99b12fdba9d5e0f3 SHA256 23d981e48a5308dd11ce2fc831071d138d54717bff9cb546dfc5467b0f4204c7
+AUX keruspe-fix-segfault.patch 475 RMD160 d10df2f0b7c4273f8654d12b3920897028949bd7 SHA1 129133176e72b4cb2b17ba577e1061f53f6b1b40 SHA256 4b8f77c1ebadc9163abb8acebe7d26153f5dc7468e27c8f1c341484c711e2769
AUX libnotify-0.7-fix.patch 1209 RMD160 07615cde8fb0dbd9876635d0b437943df3f4879c SHA1 16caf17a571b4ede370fc20ffffc87179afd3cd3 SHA256 80dbd0906b45cd42b0fda0ec6fa48daf04cb5f85a14e164287565ffa4e486642
AUX system-cairo-fixup.patch 3146 RMD160 c1e15592ab30360cb1b528e174674ace83cf60d1 SHA1 4f5687a84d3a7687242a34a713b28272788feb5e SHA256 376292d4be0f0b3e760a6d30c1cce240a176774cd5a4f62e01ebd7d30f16bf56
AUX xulrunner-default-prefs.js 709 RMD160 a4d062f75c17552545267ec3fe2f6b54073dafbd SHA1 580128e9edf8021fdbbca2c91abf63cb83bab2c7 SHA256 e6850b0a22f7d3889b49ec4a79a3c4d3d077edd98c8f0ffdc26e30bc70bb4b09
-EBUILD xulrunner-9999.ebuild 7365 RMD160 993a86cff7157a5031b8fd48d0d671315dce496e SHA1 66b954b4ad748af330357e61ac43ec4dda1895b4 SHA256 e5d42ee2d45c7a89b1eb1fbeecc52d88e81e9ef5f595072f1a8b94945816a4c2
+EBUILD xulrunner-9999.ebuild 7451 RMD160 cbd069bb9425ac4a6648192445fd65d0757d4b00 SHA1 0c9b6fe5c2d4badcbc8291274beb6dfa3c032a9b SHA256 2def77a4a3681b1387cfe8086f6e4dde1a460da5ef710f22f16b178bef690f76
diff --git a/net-libs/xulrunner/files/keruspe-fix-segfault.patch b/net-libs/xulrunner/files/keruspe-fix-segfault.patch
new file mode 100644
index 0000000..35cd3d7
--- /dev/null
+++ b/net-libs/xulrunner/files/keruspe-fix-segfault.patch
@@ -0,0 +1,10 @@
+--- mozilla-central/js/src/jsapi.cpp.old 2011-01-16 12:49:43.631571635 +0100
++++ mozilla-central/js/src/jsapi.cpp 2011-01-16 12:21:27.357155893 +0100
+@@ -2932,6 +2932,7 @@
+ JS_PUBLIC_API(JSObject *)
+ JS_NewGlobalObject(JSContext *cx, JSClass *clasp)
+ {
++ if (!cx->compartment) cx->compartment = NewCompartment(cx, NULL);
+ JS_THREADSAFE_ASSERT(cx->compartment != cx->runtime->atomsCompartment);
+ CHECK_REQUEST(cx);
+ JS_ASSERT(clasp->flags & JSCLASS_IS_GLOBAL);
diff --git a/net-libs/xulrunner/xulrunner-9999.ebuild b/net-libs/xulrunner/xulrunner-9999.ebuild
index 189d7f4..47e2082 100644
--- a/net-libs/xulrunner/xulrunner-9999.ebuild
+++ b/net-libs/xulrunner/xulrunner-9999.ebuild
@@ -67,6 +67,8 @@ src_prepare() {
xulrunner/installer/Makefile.in \
xulrunner/app/nsRegisterGREUnix.cpp
+ # Thanks to Keruspe, fix a segfault
+ epatch "${FILESDIR}"/keruspe-fix-segfault.patch
# Up-to-date geek stuff
epatch "${FILESDIR}"/libnotify-0.7-fix.patch