Merge pull request #1222 from friberk/master

Updated spidermonkey to 78.10.1

system/base/spidermonkey/actions.py

@@ -23,12 +23,11 @@ def setup():
    shelltools.cd("build-js")
 
    shelltools.system("../js/src/configure \
-	                  --prefix=/usr       \
+	                  --prefix=/usr \
-					  --libdir=/usr/lib   \
+					  --libdir=/usr/lib \
-					  --enable-readline   \
+					  --enable-readline \
-					  --enable-posix-nspr-emulation \
 					  --with-intl-api \
-					  --disable-debug     \
+					  --disable-debug \
                       --disable-debug-symbols \
                       --disable-jemalloc \
                       --disable-strip  \
@@ -41,6 +40,7 @@ def setup():
                       --enable-tests \
                       --with-intl-api \
                       --with-system-zlib \
+                      --with-system-nspr \
                       --without-system-icu")
 
 def build():

system/base/spidermonkey/files/mozjs78-fix-soname.patch

@@ -1,6 +1,6 @@
-diff -Nuar a/js/src/build/Makefile.in b/js/src/build/Makefile.in
+"Carried over from mozjs68"
---- a/js/src/build/Makefile.in	2020-07-20 21:02:51.000000000 +0000
+--- a/js/src/build/Makefile.in
-+++ b/js/src/build/Makefile.in	2020-08-28 15:16:55.659934940 +0000
++++ b/js/src/build/Makefile.in
 @@ -78,6 +78,8 @@
  endif
  ifneq (,$(SHARED_LIBRARY))
@@ -10,9 +10,8 @@ diff -Nuar a/js/src/build/Makefile.in b/js/src/build/Makefile.in
  ifeq ($(OS_ARCH),Darwin)
  	install_name_tool -id $(abspath $(libdir)/$(SHARED_LIBRARY)) $(DESTDIR)$(libdir)/$(SHARED_LIBRARY)
  endif
-diff -Nuar a/js/src/build/moz.build b/js/src/build/moz.build
+--- a/js/src/build/moz.build
---- a/js/src/build/moz.build	2020-07-20 21:02:51.000000000 +0000
++++ b/js/src/build/moz.build
-+++ b/js/src/build/moz.build	2020-08-28 15:18:37.389927600 +0000
 @@ -25,6 +25,7 @@
  if CONFIG['JS_SHARED_LIBRARY']:
      GeckoSharedLibrary('js', linkage=None)

system/base/spidermonkey/files/mozjs78-silence-sandbox-violations.patch

@@ -0,0 +1,27 @@
+"Carried over + updated from mozjs68"
+Upstream: no
+From 9ad10569e11a2fb96377188f895bc66abcc9511d Mon Sep 17 00:00:00 2001
+From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+Date: Wed, 5 Sep 2018 15:05:24 +0200
+Subject: [PATCH] silence sandbox violations
+
+Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+---
+ python/mozbuild/mozbuild/frontend/emitter.py | 5 -----
+ 1 file changed, 5 deletions(-)
+
+--- a/python/mozbuild/mozbuild/frontend/emitter.py
++++ b/python/mozbuild/mozbuild/frontend/emitter.py
+@@ -1239,12 +1239,6 @@ class TreeMetadataEmitter(LoggingMixin):
+                                                  'is a filename, but a directory is required: %s '
+                                                  '(resolved to %s)' % (local_include, full_path),
+                                                  context)
+-            if (full_path == context.config.topsrcdir or
+-                    full_path == context.config.topobjdir):
+-                raise SandboxValidationError(
+-                    'Path specified in LOCAL_INCLUDES '
+-                    '(%s) resolves to the topsrcdir or topobjdir (%s), which is '
+-                    'not allowed' % (local_include, full_path), context)
+             include_obj = LocalInclude(context, local_include)
+             local_includes.append(include_obj.path.full_path)
+             yield include_obj

system/base/spidermonkey/pspec.xml

@@ -12,18 +12,20 @@
         <IsA>library</IsA>
         <Summary>Stand-alone JavaScript C Library</Summary>
         <Description>Spidermonkey is Mozilla's C implementation of JavaScript.</Description>
-        <Archive type="tarxz" sha1sum="976fae5c3cdee8b7929e4f17eca6cf44513d08b4">https://ftp.mozilla.org/pub/firefox/releases/68.12.0esr/source/firefox-68.12.0esr.source.tar.xz</Archive>
+        <Archive type="tarxz" sha1sum="9e8ed091437e8eed3807e40e7dd798db9f788dd2">https://ftp.mozilla.org/pub/firefox/releases/78.10.1esr/source/firefox-78.10.1esr.source.tar.xz</Archive>
         <BuildDependencies>
-            <Dependency>python3</Dependency>
+            <Dependency>python3-devel</Dependency>
             <Dependency>zlib-devel</Dependency>
             <Dependency>nspr-devel</Dependency>
             <Dependency>readline-devel</Dependency>
-            <Dependency>libffi-devel</Dependency>
             <Dependency>autoconf213</Dependency>
+            <Dependency>rust</Dependency>
+            <Dependency>llvm</Dependency>
         </BuildDependencies>
         <Patches>
-            <Patch level="1">Remove-unused-LLVM-and-Rust-build-dependencies.patch</Patch>
+            <Patch level="1">mozjs78-silence-sandbox-violations.patch</Patch>
-            <Patch level="1">mozjs68-fix-soname.patch</Patch>
+            <Patch level="1">mozjs78-fix-soname.patch</Patch>
+            <!--Patch level="1">Remove-unused-LLVM-and-Rust-build-dependencies.patch</Patch-->
         </Patches>
     </Source>
 
@@ -53,11 +55,18 @@
         <Files>
             <Path fileType="header">/usr/include</Path>
             <Path fileType="data">/usr/lib/pkgconfig</Path>
-<!--             <Path fileType="executable">/usr/bin/js17-config</Path> -->
+            <!--Path fileType="executable">/usr/bin/js17-config</Path-->
         </Files>
     </Package>
 
     <History>
+        <Update release="11">
+            <Date>2021-05-28</Date>
+            <Version>78.10.1</Version>
+            <Comment>Version bump</Comment>
+            <Name>Berk Çakar</Name>
+            <Email>berk2238@hotmail.com</Email>
+        </Update>
         <Update release="10">
             <Date>2020-12-09</Date>
             <Version>68.12.0</Version>