14 files changed, 169 insertions, 29 deletions
diff --git a/source/l/mozjs68/autoconf/autoconf-2.13-consolidated_fixes-1.patch b/source/l/mozjs78/autoconf/autoconf-2.13-consolidated_fixes-1.patch
index 5e7b23113..5e7b23113 100644
--- a/source/l/mozjs68/autoconf/autoconf-2.13-consolidated_fixes-1.patch
+++ b/source/l/mozjs78/autoconf/autoconf-2.13-consolidated_fixes-1.patch
diff --git a/source/l/mozjs68/autoconf/autoconf.build b/source/l/mozjs78/autoconf/autoconf.build
index 05e53f1a5..05e53f1a5 100755
--- a/source/l/mozjs68/autoconf/autoconf.build
+++ b/source/l/mozjs78/autoconf/autoconf.build
diff --git a/source/l/mozjs68/mozjs68.SlackBuild b/source/l/mozjs78/mozjs78.SlackBuild
index 815d58d11..eb87c8d9c 100755
--- a/source/l/mozjs68/mozjs68.SlackBuild
+++ b/source/l/mozjs78/mozjs78.SlackBuild
@@ -25,11 +25,10 @@
 
 cd $(dirname $0) ; CWD=$(pwd)
 
-PKGNAM=mozjs68
+PKGNAM=mozjs78
 SRCNAME=firefox
-VERSION=68.11.0esr
-BUILD=${BUILD:-2}
-
+VERSION=78.2.0esr
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -99,18 +98,9 @@ zcat $CWD/patches/tests-increase-timeout.patch.gz | patch -p1 --verbose || exit
 zcat $CWD/patches/icu_sources_data.py-Decouple-from-Mozilla-build-system.patch.gz | patch -p1 --verbose || exit 1
 zcat $CWD/patches/icu_sources_data-Write-command-output-to-our-stderr.patch.gz | patch -p1 --verbose || exit 1
 zcat $CWD/patches/emitter.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/emitter_test.patch.gz | patch -p1 --verbose || exit 1
 zcat $CWD/patches/init_patch.patch.gz | patch -p1 --verbose || exit 1
 zcat $CWD/patches/spidermonkey_checks_disable.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/Remove-unused-LLVM-and-Rust-build-dependencies.patch.gz | patch -p1 --verbose || exit 1
 #zcat $CWD/patches/encies.armv7_disable_WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/jstests_python-3.patch.gz | patch -p1 --verbose || exit 1
-
-# DON'T APPLY THIS ONE UNLESS YOU ENJOY A FAILED COMPILE:
-#zcat $CWD/patches/build-icu-big-endian.patch.gz | patch -p1 --verbose || exit 1
-
-# Remove bundled security libraries so that we don't link to them:
-rm -rf security
 
 # Remove bundled zlib directory and use system version:
 rm -rf modules/zlib
@@ -129,7 +119,6 @@ CXXFLAGS+="$SLKCFLAGS -fno-delete-null-pointer-checks -fno-strict-aliasing -fno-
   --localstatedir=/var \
   --mandir=/usr/man \
   --without-system-icu \
-  --enable-posix-nspr-emulation \
   --with-system-zlib \
   --enable-tests \
   --disable-strip \
@@ -151,10 +140,10 @@ rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libjs_static.*
 rm -f $PKG/usr/bin/js*-config
 
 # Rename shared library to have a proper soname:
-mv $PKG/usr/lib${LIBDIRSUFFIX}/libmozjs-68.so $PKG/usr/lib${LIBDIRSUFFIX}/libmozjs-68.so.0.0.0
+mv $PKG/usr/lib${LIBDIRSUFFIX}/libmozjs-78.so $PKG/usr/lib${LIBDIRSUFFIX}/libmozjs-78.so.0.0.0
 ( cd $PKG/usr/lib${LIBDIRSUFFIX}
-  ln -sf libmozjs-68.so.0.0.0 libmozjs-68.so.0
-  ln -sf libmozjs-68.so.0 libmozjs-68.so
+  ln -sf libmozjs-78.so.0.0.0 libmozjs-78.so.0
+  ln -sf libmozjs-78.so.0 libmozjs-78.so
 )
 
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
diff --git a/source/l/mozjs68/patches/armv7_disable_WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS.patch b/source/l/mozjs78/patches/armv7_disable_WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS.patch
index 0cb26ac76..0cb26ac76 100644
--- a/source/l/mozjs68/patches/armv7_disable_WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS.patch
+++ b/source/l/mozjs78/patches/armv7_disable_WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS.patch
diff --git a/source/l/mozjs78/patches/copy-headers.patch b/source/l/mozjs78/patches/copy-headers.patch
new file mode 100644
index 000000000..dfa1fdbee
--- /dev/null
+++ b/source/l/mozjs78/patches/copy-headers.patch
@@ -0,0 +1,38 @@
+From 3b3c8e37cca418e07bdeceaf3a601805df28d925 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
+Date: Wed, 15 Jul 2020 08:27:39 +0200
+Subject: [PATCH] build: Copy headers on install instead of symlinking
+
+Patch by Philip Chimento ported forward to mozjs78
+---
+ python/mozbuild/mozbuild/backend/recursivemake.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py
+index e3fc8fe..bed5ae9 100644
+--- a/python/mozbuild/mozbuild/backend/recursivemake.py
++++ b/python/mozbuild/mozbuild/backend/recursivemake.py
+@@ -1457,9 +1457,9 @@ class RecursiveMakeBackend(MakeBackend):
+                                 raise Exception("Wildcards are only supported in the filename part"
+                                                 " of srcdir-relative or absolute paths.")
+ 
+-                            install_manifest.add_pattern_link(basepath, wild, path)
++                            install_manifest.add_pattern_copy(basepath, wild, path)
+                         else:
+-                            install_manifest.add_pattern_link(f.srcdir, f, path)
++                            install_manifest.add_pattern_copy(f.srcdir, f, path)
+                     elif isinstance(f, AbsolutePath):
+                         if not f.full_path.lower().endswith(('.dll', '.pdb', '.so')):
+                             raise Exception("Absolute paths installed to FINAL_TARGET_FILES must"
+@@ -1468,7 +1468,7 @@ class RecursiveMakeBackend(MakeBackend):
+                         install_manifest.add_optional_exists(dest)
+                         absolute_files.append(f.full_path)
+                     else:
+-                        install_manifest.add_link(f.full_path, dest)
++                        install_manifest.add_copy(f.full_path, dest)
+                 else:
+                     install_manifest.add_optional_exists(dest)
+                     objdir_files.append(self._pretty_path(f, backend_file))
+-- 
+2.26.2
+
diff --git a/source/l/mozjs78/patches/emitter.patch b/source/l/mozjs78/patches/emitter.patch
new file mode 100644
index 000000000..15e752ba7
--- /dev/null
+++ b/source/l/mozjs78/patches/emitter.patch
@@ -0,0 +1,61 @@
+From d1d785c169345b81c76213f6dd9be32b4db60294 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
+Date: Wed, 15 Jul 2020 08:39:47 +0200
+Subject: [PATCH] Build: allow LOCAL_INCLUDES paths with topsrcdir or topobjdir
+
+---
+ python/mozbuild/mozbuild/frontend/emitter.py  |  6 ------
+ .../mozbuild/test/frontend/test_emitter.py    | 20 -------------------
+ 2 files changed, 26 deletions(-)
+
+diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py
+index 8d5ab8e..65c43ff 100644
+--- 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
+diff --git a/python/mozbuild/mozbuild/test/frontend/test_emitter.py b/python/mozbuild/mozbuild/test/frontend/test_emitter.py
+index e8cbd81..d45ccee 100644
+--- a/python/mozbuild/mozbuild/test/frontend/test_emitter.py
++++ b/python/mozbuild/mozbuild/test/frontend/test_emitter.py
+@@ -1040,26 +1040,6 @@ class TestEmitterBasic(unittest.TestCase):
+ 
+         self.assertEqual(local_includes, expected)
+ 
+-    def test_local_includes_invalid(self):
+-        """Test that invalid LOCAL_INCLUDES are properly detected."""
+-        reader = self.reader('local_includes-invalid/srcdir')
+-
+-        with six.assertRaisesRegex(
+-                self,
+-                SandboxValidationError,
+-                'Path specified in LOCAL_INCLUDES.*resolves to the '
+-                'topsrcdir or topobjdir'):
+-            self.read_topsrcdir(reader)
+-
+-        reader = self.reader('local_includes-invalid/objdir')
+-
+-        with six.assertRaisesRegex(
+-                self,
+-                SandboxValidationError,
+-                'Path specified in LOCAL_INCLUDES.*resolves to the '
+-                'topsrcdir or topobjdir'):
+-            self.read_topsrcdir(reader)
+-
+     def test_local_includes_file(self):
+         """Test that a filename can't be used in LOCAL_INCLUDES."""
+         reader = self.reader('local_includes-filename')
+-- 
+2.26.2
+
diff --git a/source/l/mozjs78/patches/fix-soname.patch b/source/l/mozjs78/patches/fix-soname.patch
new file mode 100644
index 000000000..30894e44d
--- /dev/null
+++ b/source/l/mozjs78/patches/fix-soname.patch
@@ -0,0 +1,26 @@
+From d21c7cb9343d8c495d987e71be0f35887574c820 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
+Date: Wed, 15 Jul 2020 08:21:47 +0200
+Subject: [PATCH] Add soname switch to linker, regardless of Operating System
+
+Fix backported from Debian: http://bugs.debian.org/746705
+---
+ config/rules.mk | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/config/rules.mk b/config/rules.mk
+index 3965c88..3f92f83 100644
+--- a/config/rules.mk
++++ b/config/rules.mk
+@@ -320,6 +320,8 @@ ifeq ($(OS_ARCH),GNU)
+ OS_CPPFLAGS += -DPATH_MAX=1024 -DMAXPATHLEN=1024
+ endif
+ 
++EXTRA_DSO_LDOPTS += -Wl,-soname,lib$(JS_LIBRARY_NAME).so.0
++
+ #
+ # MINGW32
+ #
+-- 
+2.26.2
+
diff --git a/source/l/mozjs68/patches/icu_sources_data-Write-command-output-to-our-stderr.patch b/source/l/mozjs78/patches/icu_sources_data-Write-command-output-to-our-stderr.patch
index e2ed48454..e2ed48454 100644
--- a/source/l/mozjs68/patches/icu_sources_data-Write-command-output-to-our-stderr.patch
+++ b/source/l/mozjs78/patches/icu_sources_data-Write-command-output-to-our-stderr.patch
diff --git a/source/l/mozjs68/patches/icu_sources_data.py-Decouple-from-Mozilla-build-system.patch b/source/l/mozjs78/patches/icu_sources_data.py-Decouple-from-Mozilla-build-system.patch
index a853a16d1..a853a16d1 100644
--- a/source/l/mozjs68/patches/icu_sources_data.py-Decouple-from-Mozilla-build-system.patch
+++ b/source/l/mozjs78/patches/icu_sources_data.py-Decouple-from-Mozilla-build-system.patch
diff --git a/source/l/mozjs68/patches/init_patch.patch b/source/l/mozjs78/patches/init_patch.patch
index fd09eb797..fd09eb797 100644
--- a/source/l/mozjs68/patches/init_patch.patch
+++ b/source/l/mozjs78/patches/init_patch.patch
diff --git a/source/l/mozjs68/patches/spidermonkey_checks_disable.patch b/source/l/mozjs78/patches/spidermonkey_checks_disable.patch
index 14ba0ad71..14ba0ad71 100644
--- a/source/l/mozjs68/patches/spidermonkey_checks_disable.patch
+++ b/source/l/mozjs78/patches/spidermonkey_checks_disable.patch
diff --git a/source/l/mozjs68/patches/spidermonkey_style_check_disable_s390x.patch b/source/l/mozjs78/patches/spidermonkey_style_check_disable_s390x.patch
index 690c1c57d..690c1c57d 100644
--- a/source/l/mozjs68/patches/spidermonkey_style_check_disable_s390x.patch
+++ b/source/l/mozjs78/patches/spidermonkey_style_check_disable_s390x.patch
diff --git a/source/l/mozjs78/patches/tests-increase-timeout.patch b/source/l/mozjs78/patches/tests-increase-timeout.patch
new file mode 100644
index 000000000..c86cca403
--- /dev/null
+++ b/source/l/mozjs78/patches/tests-increase-timeout.patch
@@ -0,0 +1,26 @@
+From 9be85b155c6df0454c5faef9e850f572c99e3615 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
+Date: Wed, 15 Jul 2020 08:32:44 +0200
+Subject: [PATCH] Increase the test timeout for slower buildds
+
+Ported forward from Debian: https://bugs.debian.org/878284
+---
+ js/src/Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/js/src/Makefile.in b/js/src/Makefile.in
+index b86aeed..d68655a 100644
+--- a/js/src/Makefile.in
++++ b/js/src/Makefile.in
+@@ -53,7 +53,7 @@ check:: check-js-msg
+ 
+ check-jstests:
+ 	$(wildcard $(RUN_TEST_PROGRAM)) $(PYTHON3) -u $(srcdir)/tests/jstests.py \
+-		--no-progress --format=automation --timeout 300 \
++		--no-progress --format=automation --timeout 600 \
+ 		$(JSTESTS_EXTRA_ARGS) \
+ 		$(DIST)/bin/$(JS_SHELL_NAME)$(BIN_SUFFIX)
+ 
+-- 
+2.26.2
+
diff --git a/source/l/mozjs68/slack-desc b/source/l/mozjs78/slack-desc
index 565e95a59..94125293d 100644
--- a/source/l/mozjs68/slack-desc
+++ b/source/l/mozjs78/slack-desc
@@ -6,15 +6,15 @@
 # customary to leave one space after the ':'.
 
        |-----handy-ruler------------------------------------------------------|
-mozjs68: mozjs68 (Mozilla's JavaScript Engine)
-mozjs68:
-mozjs68: SpiderMonkey is Mozilla's JavaScript engine written in C/C++. It is
-mozjs68: used in various Mozilla products (including Firefox) and is available
-mozjs68: under MPL/GPL/LGPL tri-license.
-mozjs68:
-mozjs68: Homepage:
-mozjs68: https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey
-mozjs68:
-mozjs68:
-mozjs68:
-mozjs68:
+mozjs78: mozjs78 (Mozilla's JavaScript Engine)
+mozjs78:
+mozjs78: SpiderMonkey is Mozilla's JavaScript engine written in C/C++. It is
+mozjs78: used in various Mozilla products (including Firefox) and is available
+mozjs78: under MPL/GPL/LGPL tri-license.
+mozjs78:
+mozjs78: Homepage:
+mozjs78: https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey
+mozjs78:
+mozjs78:
+mozjs78:
+mozjs78: