summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rw-r--r--source/l/glib2/glib.allow.gtk-doc-1.32.diff11
-rwxr-xr-xsource/l/glib2/glib2.SlackBuild5
-rw-r--r--source/l/mozjs68/patches/Don-t-run-non262-extensions-clone-errors.js-on-s390x.patch15
-rw-r--r--source/l/mozjs68/patches/Remove-unused-LLVM-and-Rust-build-dependencies.patch72
-rw-r--r--source/l/mozjs68/patches/build-icu-big-endian.patch12
-rw-r--r--source/l/mozjs68/patches/copy-headers.patch29
-rw-r--r--source/l/mozjs68/patches/emitter.patch14
-rw-r--r--source/l/mozjs68/patches/emitter_test.patch27
-rw-r--r--source/l/mozjs68/patches/fix-soname.patch25
-rw-r--r--source/l/mozjs68/patches/jstests_python-3.patch57
-rw-r--r--source/l/mozjs68/patches/tests-increase-timeout.patch22
-rw-r--r--source/l/mozjs78/autoconf/autoconf-2.13-consolidated_fixes-1.patch (renamed from source/l/mozjs68/autoconf/autoconf-2.13-consolidated_fixes-1.patch)0
-rwxr-xr-xsource/l/mozjs78/autoconf/autoconf.build (renamed from source/l/mozjs68/autoconf/autoconf.build)0
-rwxr-xr-xsource/l/mozjs78/mozjs78.SlackBuild (renamed from source/l/mozjs68/mozjs68.SlackBuild)23
-rw-r--r--source/l/mozjs78/patches/armv7_disable_WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS.patch (renamed from source/l/mozjs68/patches/armv7_disable_WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS.patch)0
-rw-r--r--source/l/mozjs78/patches/copy-headers.patch38
-rw-r--r--source/l/mozjs78/patches/emitter.patch61
-rw-r--r--source/l/mozjs78/patches/fix-soname.patch26
-rw-r--r--source/l/mozjs78/patches/icu_sources_data-Write-command-output-to-our-stderr.patch (renamed from source/l/mozjs68/patches/icu_sources_data-Write-command-output-to-our-stderr.patch)0
-rw-r--r--source/l/mozjs78/patches/icu_sources_data.py-Decouple-from-Mozilla-build-system.patch (renamed from source/l/mozjs68/patches/icu_sources_data.py-Decouple-from-Mozilla-build-system.patch)0
-rw-r--r--source/l/mozjs78/patches/init_patch.patch (renamed from source/l/mozjs68/patches/init_patch.patch)0
-rw-r--r--source/l/mozjs78/patches/spidermonkey_checks_disable.patch (renamed from source/l/mozjs68/patches/spidermonkey_checks_disable.patch)0
-rw-r--r--source/l/mozjs78/patches/spidermonkey_style_check_disable_s390x.patch (renamed from source/l/mozjs68/patches/spidermonkey_style_check_disable_s390x.patch)0
-rw-r--r--source/l/mozjs78/patches/tests-increase-timeout.patch26
-rw-r--r--source/l/mozjs78/slack-desc (renamed from source/l/mozjs68/slack-desc)24
25 files changed, 184 insertions, 303 deletions
diff --git a/source/l/glib2/glib.allow.gtk-doc-1.32.diff b/source/l/glib2/glib.allow.gtk-doc-1.32.diff
new file mode 100644
index 00000000..e953d41c
--- /dev/null
+++ b/source/l/glib2/glib.allow.gtk-doc-1.32.diff
@@ -0,0 +1,11 @@
+--- ./docs/reference/meson.build.orig 2020-09-10 05:42:41.475683000 -0500
++++ ./docs/reference/meson.build 2020-09-15 13:26:21.552796804 -0500
+@@ -52,7 +52,7 @@
+ endif
+ # Check we have the minimum gtk-doc version required. Older versions won't
+ # generate correct documentation.
+- dependency('gtk-doc', version : '>=1.32.1',
++ dependency('gtk-doc', version : '>=1.32',
+ fallback : ['gtk-doc', 'dummy_dep'],
+ default_options : ['tests=false'])
+ endif
diff --git a/source/l/glib2/glib2.SlackBuild b/source/l/glib2/glib2.SlackBuild
index 333fe5b6..dd3ff57d 100755
--- a/source/l/glib2/glib2.SlackBuild
+++ b/source/l/glib2/glib2.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=glib2
VERSION=${VERSION:-$(echo glib-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -80,6 +80,9 @@ find . \
# Get the local timezone link from /etc/localtime-copied-from:
zcat $CWD/glib2.slackware.localtime.diff.gz | patch -p1 --verbose || exit 1
+# Allow the slightly older version of gtk-doc to avoid bundling a newer one:
+zcat $CWD/glib.allow.gtk-doc-1.32.diff.gz | patch -p1 --verbose || exit 1
+
# Configure, build, and install:
export CFLAGS="$SLKCFLAGS"
export CXXFLAGS="$SLKCFLAGS"
diff --git a/source/l/mozjs68/patches/Don-t-run-non262-extensions-clone-errors.js-on-s390x.patch b/source/l/mozjs68/patches/Don-t-run-non262-extensions-clone-errors.js-on-s390x.patch
deleted file mode 100644
index f493643a..00000000
--- a/source/l/mozjs68/patches/Don-t-run-non262-extensions-clone-errors.js-on-s390x.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: firefox-68.5.0/js/src/tests/jstests.list
-===================================================================
---- firefox-68.0/js/src/tests/jstests.list
-+++ firefox-68.0/js/src/tests/jstests.list
-@@ -493,6 +493,10 @@ skip script test262/language/expressions
- skip script test262/language/statements/class/elements/derived-cls-direct-eval-err-contains-superproperty-1.js
- skip script test262/language/statements/class/elements/derived-cls-direct-eval-err-contains-superproperty-2.js
-
-+# Crashes on s390x and ppc64, avoid it
-+#
-+skip-if(xulRuntime.XPCOMABI.match(/s390x|ppc64-/)) script non262/extensions/clone-errors.js
-+
-
- ###########################################################
- # Tests disabled due to issues in test262 importer script #
diff --git a/source/l/mozjs68/patches/Remove-unused-LLVM-and-Rust-build-dependencies.patch b/source/l/mozjs68/patches/Remove-unused-LLVM-and-Rust-build-dependencies.patch
deleted file mode 100644
index d98b577e..00000000
--- a/source/l/mozjs68/patches/Remove-unused-LLVM-and-Rust-build-dependencies.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Description: Remove unused LLVM and Rust build dependencies
- Since the Javascript engine is normally part of Firefox, its build
- system has dependencies on the LLVM and Rust toolchains. This limits
- the number of architectures which mozjs68 can be built on.
- .
- It turns out, however, that neither LLVM nor Rust are used when mozjs68
- is being built and these build dependencies are therefore not necessary.
- .
- This patch removes them and allows mozjs68 to be built on any architecture.
- .
-Author: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=959144
-Forwarded: no
-Last-Update: 2020-04-30
-
-Index: mozjs68-68.6.0/js/moz.configure
-===================================================================
---- mozjs68-68.6.0.orig/js/moz.configure
-+++ mozjs68-68.6.0/js/moz.configure
-@@ -18,11 +18,6 @@ def building_js(build_project):
- option(env='JS_STANDALONE', default=building_js,
- help='Reserved for internal use')
-
--include('../build/moz.configure/rust.configure',
-- when='--enable-compile-environment')
--include('../build/moz.configure/bindgen.configure',
-- when='--enable-compile-environment')
--
- @depends('JS_STANDALONE')
- def js_standalone(value):
- if value:
-Index: mozjs68-68.6.0/moz.configure
-===================================================================
---- mozjs68-68.6.0.orig/moz.configure
-+++ mozjs68-68.6.0/moz.configure
-@@ -598,36 +598,6 @@ set_config('MAKENSISU_FLAGS', nsis_flags
-
- check_prog('7Z', ('7z', '7za'), allow_missing=True, when=target_is_windows)
-
--
--@depends(host_c_compiler, c_compiler, bindgen_config_paths)
--def llvm_objdump(host_c_compiler, c_compiler, bindgen_config_paths):
-- clang = None
-- for compiler in (host_c_compiler, c_compiler):
-- if compiler and compiler.type == 'clang':
-- clang = compiler.compiler
-- break
-- elif compiler and compiler.type == 'clang-cl':
-- clang = os.path.join(os.path.dirname(compiler.compiler), 'clang')
-- break
--
-- if not clang and bindgen_config_paths:
-- clang = bindgen_config_paths.clang_path
-- llvm_objdump = 'llvm-objdump'
-- if clang:
-- out = check_cmd_output(clang, '--print-prog-name=llvm-objdump',
-- onerror=lambda: None)
-- if out:
-- llvm_objdump = out.rstrip()
-- return (llvm_objdump,)
--
--
--llvm_objdump = check_prog('LLVM_OBJDUMP', llvm_objdump, what='llvm-objdump',
-- when='--enable-compile-environment',
-- paths=toolchain_search_path)
--
--add_old_configure_assignment('LLVM_OBJDUMP', llvm_objdump)
--
--
- # Please do not add configure checks from here on.
-
- # Fallthrough to autoconf-based configure
diff --git a/source/l/mozjs68/patches/build-icu-big-endian.patch b/source/l/mozjs68/patches/build-icu-big-endian.patch
deleted file mode 100644
index 70a54817..00000000
--- a/source/l/mozjs68/patches/build-icu-big-endian.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up firefox-68.0/build/autoconf/icu.m4.icu firefox-68.0/build/autoconf/icu.m4
---- firefox-68.0/build/autoconf/icu.m4.icu 2018-04-24 13:13:03.938961958 +0200
-+++ firefox-68.0/build/autoconf/icu.m4 2018-04-24 13:14:44.472714375 +0200
-@@ -78,7 +78,7 @@
- # TODO: the l is actually endian-dependent
- # We could make this set as 'l' or 'b' for little or big, respectively,
- # but we'd need to check in a big-endian version of the file.
-- ICU_DATA_FILE="icudt${version}l.dat"
-+ ICU_DATA_FILE="icudt${version}b.dat"
- fi
-
- AC_SUBST(MOZ_ICU_VERSION)
diff --git a/source/l/mozjs68/patches/copy-headers.patch b/source/l/mozjs68/patches/copy-headers.patch
deleted file mode 100644
index aec3b10a..00000000
--- a/source/l/mozjs68/patches/copy-headers.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Wed, 5 Jul 2017 22:45:59 -0700
-Subject: build: Copy headers on install instead of symlinking
-
-Patch ported forward to mozjs52 by Philip Chimento
-<philip.chimento@gmail.com>.
----
- 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 dd9020d..6918ef8 100644
---- a/python/mozbuild/mozbuild/backend/recursivemake.py
-+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
-@@ -1427,11 +1427,11 @@ class RecursiveMakeBackend(CommonBackend):
- 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)
- else:
-- install_manifest.add_link(f.full_path, dest)
-+ install_manifest.add_copy(f.full_path, dest)
- else:
- install_manifest.add_optional_exists(dest)
- backend_file.write('%s_FILES += %s\n' % (
diff --git a/source/l/mozjs68/patches/emitter.patch b/source/l/mozjs68/patches/emitter.patch
deleted file mode 100644
index 42545534..00000000
--- a/source/l/mozjs68/patches/emitter.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/python/mozbuild/mozbuild/frontend/emitter.py
-+++ b/python/mozbuild/mozbuild/frontend/emitter.py
-@@ -1195,11 +1195,6 @@
- raise SandboxValidationError('Path specified in LOCAL_INCLUDES '
- '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/source/l/mozjs68/patches/emitter_test.patch b/source/l/mozjs68/patches/emitter_test.patch
deleted file mode 100644
index 59366d36..00000000
--- a/source/l/mozjs68/patches/emitter_test.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/python/mozbuild/mozbuild/test/frontend/test_emitter.py
-+++ b/python/mozbuild/mozbuild/test/frontend/test_emitter.py
-@@ -1051,24 +1051,6 @@
-
- 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 self.assertRaisesRegexp(
-- SandboxValidationError,
-- 'Path specified in LOCAL_INCLUDES.*resolves to the '
-- 'topsrcdir or topobjdir'):
-- objs = self.read_topsrcdir(reader)
--
-- reader = self.reader('local_includes-invalid/objdir')
--
-- with self.assertRaisesRegexp(
-- SandboxValidationError,
-- 'Path specified in LOCAL_INCLUDES.*resolves to the '
-- 'topsrcdir or topobjdir'):
-- objs = 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')
diff --git a/source/l/mozjs68/patches/fix-soname.patch b/source/l/mozjs68/patches/fix-soname.patch
deleted file mode 100644
index fc8052a8..00000000
--- a/source/l/mozjs68/patches/fix-soname.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: "Laszlo Boszormenyi (GCS)" <gcs@debian.org>
-Date: Fri, 2 May 2014 22:20:45 +0200
-Subject: fix soname
-
-Add soname switch to linker, regardless of Operating System
-
-Bug-Debian: http://bugs.debian.org/746705
----
- config/rules.mk | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/config/rules.mk b/config/rules.mk
-index eb86b0c..1bb3988 100644
---- a/config/rules.mk
-+++ b/config/rules.mk
-@@ -359,6 +359,9 @@ endif
- endif
- EXTRA_DEPS += $(SYMBOLS_FILE)
- endif
-+
-+EXTRA_DSO_LDOPTS += -Wl,-soname,lib$(JS_LIBRARY_NAME).so.0
-+
- #
- # GNU doesn't have path length limitation
- #
diff --git a/source/l/mozjs68/patches/jstests_python-3.patch b/source/l/mozjs68/patches/jstests_python-3.patch
deleted file mode 100644
index 484a02c6..00000000
--- a/source/l/mozjs68/patches/jstests_python-3.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From e75a1c531767f3efd158fd8309084cf5157307be Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
-Date: Tue, 5 Nov 2019 19:14:38 +0100
-Subject: [PATCH] Python 3
-
----
- js/src/jit-test/jit_test.py | 2 +-
- js/src/tests/lib/manifest.py | 5 ++++-
- js/src/tests/lib/tasks_unix.py | 3 +++
- 3 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/js/src/jit-test/jit_test.py b/js/src/jit-test/jit_test.py
-index 8fcd0c5..f51c544 100755
---- a/js/src/jit-test/jit_test.py
-+++ b/js/src/jit-test/jit_test.py
-@@ -138,7 +138,7 @@ def main(argv):
- help='With --write-failures=FILE, additionally write the'
- ' output of failed tests to [FILE]')
- op.add_option('--jitflags', dest='jitflags', default='none',
-- choices=valid_jitflags(),
-+ choices=list(valid_jitflags()),
- help='IonMonkey option combinations. One of %s.' % ', '.join(valid_jitflags()))
- op.add_option('--ion', dest='jitflags', action='store_const', const='ion',
- help='Run tests once with --ion-eager and once with'
-diff --git a/js/src/tests/lib/manifest.py b/js/src/tests/lib/manifest.py
-index 617f0f1..f54cc1e 100644
---- a/js/src/tests/lib/manifest.py
-+++ b/js/src/tests/lib/manifest.py
-@@ -105,7 +105,10 @@ class XULInfoTester:
- '-e', self.js_prologue,
- '-e', 'print(!!({}))'.format(cond)
- ]
-- p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)
-+ try:
-+ p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE, encoding="utf-8")
-+ except TypeError:
-+ p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)
- out, err = p.communicate()
- if out in ('true\n', 'true\r\n'):
- ans = True
-diff --git a/js/src/tests/lib/tasks_unix.py b/js/src/tests/lib/tasks_unix.py
-index 40528b8..5edfe92 100644
---- a/js/src/tests/lib/tasks_unix.py
-+++ b/js/src/tests/lib/tasks_unix.py
-@@ -182,6 +182,9 @@ def reap_zombies(tasks, timeout):
- if os.WIFSIGNALED(status):
- returncode = -os.WTERMSIG(status)
-
-+ ended.out=[x.decode('utf-8') for x in ended.out]
-+ ended.err=[x.decode('utf-8') for x in ended.err]
-+
- finished.append(
- TestOutput(
- ended.test,
---
-2.23.0
-
diff --git a/source/l/mozjs68/patches/tests-increase-timeout.patch b/source/l/mozjs68/patches/tests-increase-timeout.patch
deleted file mode 100644
index 91f5fa76..00000000
--- a/source/l/mozjs68/patches/tests-increase-timeout.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Adrian Bunk <bunk@debian.org>
-Date: Tue, 3 Jul 2018 10:03:37 +0100
-Subject: Increase the test timeout for slower buildds
-
-Bug-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 4ac9f48..6ab5582 100644
---- a/js/src/Makefile.in
-+++ b/js/src/Makefile.in
-@@ -72,7 +72,7 @@ check:: check-style check-masm check-js-msg check-opcode
-
- check-jstests:
- $(wildcard $(RUN_TEST_PROGRAM)) $(PYTHON) -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)
-
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 5e7b2311..5e7b2311 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 05e53f1a..05e53f1a 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 815d58d1..eb87c8d9 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 0cb26ac7..0cb26ac7 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 00000000..dfa1fdbe
--- /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 00000000..15e752ba
--- /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 00000000..30894e44
--- /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 e2ed4845..e2ed4845 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 a853a16d..a853a16d 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 fd09eb79..fd09eb79 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 14ba0ad7..14ba0ad7 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 690c1c57..690c1c57 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 00000000..c86cca40
--- /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 565e95a5..94125293 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: