Revert "mozjs60: update to 60.2.2."
This reverts commit 6cb78074f2
.
The update causes gnome-shell to crash randomly at startup.
This commit is contained in:
parent
e6995be69a
commit
e98da98888
2 changed files with 34 additions and 3 deletions
24
srcpkgs/mozjs60/patches/add-exposeToActiveJS.patch
Normal file
24
srcpkgs/mozjs60/patches/add-exposeToActiveJS.patch
Normal file
|
@ -0,0 +1,24 @@
|
|||
Upstream: Yes
|
||||
Reason: Required for GJS
|
||||
# HG changeset patch
|
||||
# User Philip Chimento <philip.chimento@gmail.com>
|
||||
# Date 1527544053 25200
|
||||
# Mon May 28 14:47:33 2018 -0700
|
||||
# Node ID a50e7374d0952b893f843e9d21d13d5b7ec8564c
|
||||
# Parent a466172aed4bc2afc21169b749b8068a4b98c93f
|
||||
Bug 1464912 - Add exposeToActiveJS specialization for JSString. r=sfink
|
||||
|
||||
diff --git a/js/public/RootingAPI.h b/js/public/RootingAPI.h
|
||||
--- a/js/public/RootingAPI.h
|
||||
+++ b/js/public/RootingAPI.h
|
||||
@@ -719,6 +719,10 @@ struct BarrierMethods<JSString*>
|
||||
static void postBarrier(JSString** vp, JSString* prev, JSString* next) {
|
||||
JS::HeapStringPostBarrier(vp, prev, next);
|
||||
}
|
||||
+ static void exposeToJS(JSString* v) {
|
||||
+ if (v)
|
||||
+ js::gc::ExposeGCThingToActiveJS(JS::GCCellPtr(v));
|
||||
+ }
|
||||
};
|
||||
|
||||
// Provide hash codes for Cell kinds that may be relocated and, thus, not have
|
|
@ -1,7 +1,8 @@
|
|||
# Template file for 'mozjs60'
|
||||
pkgname=mozjs60
|
||||
version=60.2.2
|
||||
revision=1
|
||||
reverts="60.2.2_1"
|
||||
version=60.0.2
|
||||
revision=5
|
||||
wrksrc="firefox-${version}"
|
||||
build_wrksrc=js/src
|
||||
build_style=gnu-configure
|
||||
|
@ -12,7 +13,7 @@ license="MPL-2.0"
|
|||
maintainer="Rasmus Thomsen <cogitri@exherbo.org>"
|
||||
homepage="https://www.mozilla.org/js/"
|
||||
distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
|
||||
checksum=8f27ac9ebf253a87d161147b6ec7a56d486db2428565a2e97324c3bb55f684d2
|
||||
checksum=4c629edac14e15c41b04320b0f66a46f25537661324cdc0ed30dc0799d7708a0
|
||||
patch_args="-Np1"
|
||||
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
|
@ -45,6 +46,12 @@ do_check() {
|
|||
dist/bin/jsapi-tests
|
||||
}
|
||||
|
||||
post_install() {
|
||||
# temp fix for mozjs60 not installing headers into the right place
|
||||
mkdir $DESTDIR/usr/include/mozjs-60
|
||||
mv $DESTDIR/usr/include/{double-conversion,js,mozilla,*.h} $DESTDIR/usr/include/mozjs-60/
|
||||
}
|
||||
|
||||
mozjs60-devel_package() {
|
||||
depends="nspr-devel ${sourcepkg}>=${version}_${revision}"
|
||||
short_desc+=" - development files"
|
||||
|
|
Loading…
Reference in a new issue