diff options
Diffstat (limited to '')
19 files changed, 228 insertions, 42 deletions
diff --git a/source/l/mozjs60/autoconf/autoconf-2.13-consolidated_fixes-1.patch b/source/l/mozjs68/autoconf/autoconf-2.13-consolidated_fixes-1.patch index 5e7b23113..5e7b23113 100644 --- a/source/l/mozjs60/autoconf/autoconf-2.13-consolidated_fixes-1.patch +++ b/source/l/mozjs68/autoconf/autoconf-2.13-consolidated_fixes-1.patch diff --git a/source/l/mozjs60/autoconf/autoconf.build b/source/l/mozjs68/autoconf/autoconf.build index 05e53f1a5..05e53f1a5 100755 --- a/source/l/mozjs60/autoconf/autoconf.build +++ b/source/l/mozjs68/autoconf/autoconf.build diff --git a/source/l/mozjs60/mozjs60.SlackBuild b/source/l/mozjs68/mozjs68.SlackBuild index 1c35eb129..2f1a4bf37 100755 --- a/source/l/mozjs60/mozjs60.SlackBuild +++ b/source/l/mozjs68/mozjs68.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for SpiderMonkey # Copyright 2011, 2018 Robby Workman, Tuscaloosa, Alabama, USA -# Copyright 2019 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2019, 2020 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,9 +25,9 @@ cd $(dirname $0) ; CWD=$(pwd) -PKGNAM=mozjs60 +PKGNAM=mozjs68 SRCNAME=firefox -VERSION=60.9.0esr +VERSION=68.11.0esr BUILD=${BUILD:-1} @@ -96,20 +96,19 @@ PATH=$TMP/autoconf-tmp/usr/bin:$PATH zcat $CWD/patches/fix-soname.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/patches/copy-headers.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/patches/tests-increase-timeout.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/Always-use-the-equivalent-year-to-determine-the-time-zone.patch.gz | patch -p1 --verbose || exit 1 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/tests-For-tests-that-are-skipped-on-64-bit-mips64-is-also.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 -zcat $CWD/patches/Save-x28-before-clobbering-it-in-the-regex-compiler.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/Save-and-restore-non-volatile-x28-on-ARM64-for-generated-unboxed-object-constructor.patch.gz | patch -p1 --verbose || exit 1 - # Remove bundled security libraries so that we don't link to them: rm -rf security @@ -152,10 +151,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-60.so $PKG/usr/lib${LIBDIRSUFFIX}/libmozjs-60.so.0.0.0 +mv $PKG/usr/lib${LIBDIRSUFFIX}/libmozjs-68.so $PKG/usr/lib${LIBDIRSUFFIX}/libmozjs-68.so.0.0.0 ( cd $PKG/usr/lib${LIBDIRSUFFIX} - ln -sf libmozjs-60.so.0.0.0 libmozjs-60.so.0 - ln -sf libmozjs-60.so.0 libmozjs-60.so + ln -sf libmozjs-68.so.0.0.0 libmozjs-68.so.0 + ln -sf libmozjs-68.so.0 libmozjs-68.so ) mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION 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 new file mode 100644 index 000000000..f493643a8 --- /dev/null +++ b/source/l/mozjs68/patches/Don-t-run-non262-extensions-clone-errors.js-on-s390x.patch @@ -0,0 +1,15 @@ +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 new file mode 100644 index 000000000..d98b577eb --- /dev/null +++ b/source/l/mozjs68/patches/Remove-unused-LLVM-and-Rust-build-dependencies.patch @@ -0,0 +1,72 @@ +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/armv7_disable_WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS.patch b/source/l/mozjs68/patches/armv7_disable_WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS.patch new file mode 100644 index 000000000..0cb26ac76 --- /dev/null +++ b/source/l/mozjs68/patches/armv7_disable_WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS.patch @@ -0,0 +1,10 @@ +--- firefox-68.0/js/src/wasm/WasmSignalHandlers.cpp ++++ firefox-68.0/js/src/wasm/WasmSignalHandlers.cpp +@@ -243,7 +243,7 @@ + // If you run into compile problems on a tier-3 platform, you can disable the + // emulation here. + +-#if defined(__linux__) && defined(__arm__) ++#if 0 && defined(__linux__) && defined(__arm__) + # define WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS + #endif diff --git a/source/l/mozjs60/patches/build-icu-big-endian.patch b/source/l/mozjs68/patches/build-icu-big-endian.patch index 2cfc8396a..70a54817d 100644 --- a/source/l/mozjs60/patches/build-icu-big-endian.patch +++ b/source/l/mozjs68/patches/build-icu-big-endian.patch @@ -1,13 +1,12 @@ -diff -up firefox-60.0/build/autoconf/icu.m4.icu firefox-60.0/build/autoconf/icu.m4 ---- firefox-60.0/build/autoconf/icu.m4.icu 2018-04-24 13:13:03.938961958 +0200 -+++ firefox-60.0/build/autoconf/icu.m4 2018-04-24 13:14:44.472714375 +0200 -@@ -78,7 +78,7 @@ if test -n "$USE_ICU"; then +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" - - MOZ_ICU_DATA_ARCHIVE= fi + AC_SUBST(MOZ_ICU_VERSION) diff --git a/source/l/mozjs60/patches/copy-headers.patch b/source/l/mozjs68/patches/copy-headers.patch index aec3b10a2..aec3b10a2 100644 --- a/source/l/mozjs60/patches/copy-headers.patch +++ b/source/l/mozjs68/patches/copy-headers.patch diff --git a/source/l/mozjs60/patches/emitter.patch b/source/l/mozjs68/patches/emitter.patch index 0f414d7cd..42545534a 100644 --- a/source/l/mozjs60/patches/emitter.patch +++ b/source/l/mozjs68/patches/emitter.patch @@ -1,15 +1,14 @@ --- a/python/mozbuild/mozbuild/frontend/emitter.py +++ b/python/mozbuild/mozbuild/frontend/emitter.py -@@ -1127,11 +1127,6 @@ - raise SandboxValidationError('Path specified in LOCAL_INCLUDES ' - 'does not exist: %s (resolved to %s)' % (local_include, - full_path), context) +@@ -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 ' -- 'is not allowed: %s (resolved to %s)' % (local_include, -- full_path), context) +- '(%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/mozjs60/patches/emitter_test.patch b/source/l/mozjs68/patches/emitter_test.patch index dad8ddc14..59366d360 100644 --- a/source/l/mozjs60/patches/emitter_test.patch +++ b/source/l/mozjs68/patches/emitter_test.patch @@ -1,6 +1,6 @@ --- a/python/mozbuild/mozbuild/test/frontend/test_emitter.py +++ b/python/mozbuild/mozbuild/test/frontend/test_emitter.py -@@ -999,22 +999,6 @@ +@@ -1051,24 +1051,6 @@ self.assertEqual(local_includes, expected) @@ -10,17 +10,18 @@ - - with self.assertRaisesRegexp( - SandboxValidationError, -- 'Path specified in LOCAL_INCLUDES is not allowed:'): +- '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 is not allowed:'): +- 'Path specified in LOCAL_INCLUDES.*resolves to the ' +- 'topsrcdir or topobjdir'): - objs = self.read_topsrcdir(reader) - - def test_generated_includes(self): - """Test that GENERATED_INCLUDES is emitted correctly.""" - reader = self.reader('generated_includes') - + 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/mozjs60/patches/fix-soname.patch b/source/l/mozjs68/patches/fix-soname.patch index fc8052a88..fc8052a88 100644 --- a/source/l/mozjs60/patches/fix-soname.patch +++ b/source/l/mozjs68/patches/fix-soname.patch diff --git a/source/l/mozjs60/patches/icu_sources_data-Write-command-output-to-our-stderr.patch b/source/l/mozjs68/patches/icu_sources_data-Write-command-output-to-our-stderr.patch index 19c0cc05d..e2ed48454 100644 --- a/source/l/mozjs60/patches/icu_sources_data-Write-command-output-to-our-stderr.patch +++ b/source/l/mozjs68/patches/icu_sources_data-Write-command-output-to-our-stderr.patch @@ -13,22 +13,22 @@ diff --git a/intl/icu_sources_data.py b/intl/icu_sources_data.py index 8cf9290..7d2d983 100644 --- a/intl/icu_sources_data.py +++ b/intl/icu_sources_data.py -@@ -84,16 +84,13 @@ def update_sources(topsrcdir): - +@@ -187,16 +187,13 @@ + def try_run(name, command, cwd=None, **kwargs): try: - with tempfile.NamedTemporaryFile(prefix=name, delete=False) as f: - subprocess.check_call(command, cwd=cwd, stdout=f, +- stderr=subprocess.STDOUT, **kwargs) + subprocess.check_call(command, cwd=cwd, stdout=sys.stderr, - stderr=subprocess.STDOUT, **kwargs) ++ stderr=subprocess.STDOUT, **kwargs) except subprocess.CalledProcessError: - print('''Error running "{}" in directory {} - See output in {}'''.format(' '.join(command), cwd, f.name), +- file=sys.stderr) + print('''Error running "{}" in directory {}'''.format(' '.join(command), cwd), - file=sys.stderr) ++ file=sys.stderr) return False else: - os.unlink(f.name) return True - - diff --git a/source/l/mozjs60/patches/icu_sources_data.py-Decouple-from-Mozilla-build-system.patch b/source/l/mozjs68/patches/icu_sources_data.py-Decouple-from-Mozilla-build-system.patch index 5c75a895d..a853a16d1 100644 --- a/source/l/mozjs60/patches/icu_sources_data.py-Decouple-from-Mozilla-build-system.patch +++ b/source/l/mozjs68/patches/icu_sources_data.py-Decouple-from-Mozilla-build-system.patch @@ -13,14 +13,14 @@ diff --git a/intl/icu_sources_data.py b/intl/icu_sources_data.py index 98c0ccb..8cf9290 100644 --- a/intl/icu_sources_data.py +++ b/intl/icu_sources_data.py -@@ -19,7 +19,9 @@ import subprocess +@@ -21,7 +21,9 @@ import sys import tempfile - + -from mozpack import path as mozpath +# Close enough +import os.path as mozpath +mozpath.normsep = lambda p: p - - - def find_source_file(dir, filename): + + # The following files have been determined to be dead/unused by a + # semi-automated analysis. You can just remove any of the files below diff --git a/source/l/mozjs68/patches/init_patch.patch b/source/l/mozjs68/patches/init_patch.patch new file mode 100644 index 000000000..fd09eb797 --- /dev/null +++ b/source/l/mozjs68/patches/init_patch.patch @@ -0,0 +1,13 @@ +--- a/python/mozbuild/mozbuild/configure/__init__.py ++++ b/python/mozbuild/mozbuild/configure/__init__.py +@@ -473,8 +473,8 @@ + msg = 'Unknown option: %s' % without_value + if self._help: + self._logger.warning(msg) +- else: +- raise InvalidOptionError(msg) ++ #else: ++ # raise InvalidOptionError(msg) + + # Run the execution queue + for func, args in self._execution_queue: diff --git a/source/l/mozjs68/patches/jstests_python-3.patch b/source/l/mozjs68/patches/jstests_python-3.patch new file mode 100644 index 000000000..484a02c68 --- /dev/null +++ b/source/l/mozjs68/patches/jstests_python-3.patch @@ -0,0 +1,57 @@ +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/spidermonkey_checks_disable.patch b/source/l/mozjs68/patches/spidermonkey_checks_disable.patch new file mode 100644 index 000000000..14ba0ad71 --- /dev/null +++ b/source/l/mozjs68/patches/spidermonkey_checks_disable.patch @@ -0,0 +1,10 @@ +--- a/config/run_spidermonkey_checks.py ++++ b/config/run_spidermonkey_checks.py +@@ -11,5 +11,5 @@ + for script in scripts: + retcode = subprocess.call( + [sys.executable, script], cwd=buildconfig.topsrcdir) +- if retcode != 0: +- raise Exception(script + " failed") ++ #if retcode != 0: ++ # raise Exception(script + " failed") diff --git a/source/l/mozjs68/patches/spidermonkey_style_check_disable_s390x.patch b/source/l/mozjs68/patches/spidermonkey_style_check_disable_s390x.patch new file mode 100644 index 000000000..690c1c57d --- /dev/null +++ b/source/l/mozjs68/patches/spidermonkey_style_check_disable_s390x.patch @@ -0,0 +1,11 @@ +--- a/config/check_spidermonkey_style.py ++++ b/config/check_spidermonkey_style.py + +@@ -766,6 +766,7 @@ + + + def main(): ++ sys.exit(0) + if sys.argv[1:] == ["--fixup"]: + # Sort #include directives in-place. Fixup mode doesn't solve + # all possible silliness that the script checks for; it's just a diff --git a/source/l/mozjs60/patches/tests-increase-timeout.patch b/source/l/mozjs68/patches/tests-increase-timeout.patch index 91f5fa76e..91f5fa76e 100644 --- a/source/l/mozjs60/patches/tests-increase-timeout.patch +++ b/source/l/mozjs68/patches/tests-increase-timeout.patch diff --git a/source/l/mozjs60/slack-desc b/source/l/mozjs68/slack-desc index 496f7cfa5..496f7cfa5 100644 --- a/source/l/mozjs60/slack-desc +++ b/source/l/mozjs68/slack-desc |