From 37e7a182c55739c93ed1b13536eb0bcc2dd89682 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Mon, 5 Feb 2024 04:43:07 -0800 Subject: [PATCH 1/2] New package: mozjs115-115.7.0 --- common/shlibs | 1 + srcpkgs/mozjs115-devel | 1 + srcpkgs/mozjs115/patches/001-fix-soname.patch | 26 ++++++ .../mozjs115/patches/002-copy-headers.patch | 38 ++++++++ .../mozjs115/patches/003-tests-timeout.patch | 26 ++++++ .../004-icu-sources-data-py-decouple.patch | 29 ++++++ ...cu-sources-data-write-command-stderr.patch | 44 +++++++++ srcpkgs/mozjs115/patches/006-emitter.patch | 67 ++++++++++++++ ...-tests-use-native-temporarydirectory.patch | 65 ++++++++++++++ srcpkgs/mozjs115/patches/008-init-patch.patch | 28 ++++++ .../patches/009-sloppy-m4-detection.patch | 29 ++++++ .../011-failing-tests-ppc64-s390x.patch | 36 ++++++++ srcpkgs/mozjs115/patches/012-fix-musl.patch | 21 +++++ .../013-disable-spidermonkey-jslint.patch | 26 ++++++ .../mozjs115/patches/014-rust-target.patch | 28 ++++++ .../patches/015-drop-rustc-validation.patch | 80 +++++++++++++++++ .../mozjs115/patches/017-no-lto-readelf.patch | 35 ++++++++ .../mozjs115/patches/MOZ_NO_RUST_LTO.patch | 18 ++++ srcpkgs/mozjs115/patches/armv6l-isb.patch | 16 ++++ .../mozjs115/patches/fix-build-ppc32.patch | 18 ++++ .../mozjs115/patches/fix-i386-fdlibm.patch | 18 ++++ srcpkgs/mozjs115/template | 89 +++++++++++++++++++ srcpkgs/mozjs115/update | 2 + 23 files changed, 741 insertions(+) create mode 120000 srcpkgs/mozjs115-devel create mode 100644 srcpkgs/mozjs115/patches/001-fix-soname.patch create mode 100644 srcpkgs/mozjs115/patches/002-copy-headers.patch create mode 100644 srcpkgs/mozjs115/patches/003-tests-timeout.patch create mode 100644 srcpkgs/mozjs115/patches/004-icu-sources-data-py-decouple.patch create mode 100644 srcpkgs/mozjs115/patches/005-icu-sources-data-write-command-stderr.patch create mode 100644 srcpkgs/mozjs115/patches/006-emitter.patch create mode 100644 srcpkgs/mozjs115/patches/007-tests-use-native-temporarydirectory.patch create mode 100644 srcpkgs/mozjs115/patches/008-init-patch.patch create mode 100644 srcpkgs/mozjs115/patches/009-sloppy-m4-detection.patch create mode 100644 srcpkgs/mozjs115/patches/011-failing-tests-ppc64-s390x.patch create mode 100644 srcpkgs/mozjs115/patches/012-fix-musl.patch create mode 100644 srcpkgs/mozjs115/patches/013-disable-spidermonkey-jslint.patch create mode 100644 srcpkgs/mozjs115/patches/014-rust-target.patch create mode 100644 srcpkgs/mozjs115/patches/015-drop-rustc-validation.patch create mode 100644 srcpkgs/mozjs115/patches/017-no-lto-readelf.patch create mode 100644 srcpkgs/mozjs115/patches/MOZ_NO_RUST_LTO.patch create mode 100644 srcpkgs/mozjs115/patches/armv6l-isb.patch create mode 100644 srcpkgs/mozjs115/patches/fix-build-ppc32.patch create mode 100644 srcpkgs/mozjs115/patches/fix-i386-fdlibm.patch create mode 100644 srcpkgs/mozjs115/template create mode 100644 srcpkgs/mozjs115/update diff --git a/common/shlibs b/common/shlibs index 61e838157b2ab..d4cdd1cb55f88 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3447,6 +3447,7 @@ libmysqlpp.so.3 mysql++-3.2.5_1 libKF5Syndication.so.5 syndication-5.50.0_1 liblqr-1.so.0 liblqr-0.4.2_1 libmozjs-102.so.0 mozjs102-102.3.0_1 +libmozjs-115.so.0 mozjs115-115.7.0_1 libebur128.so.1 libebur128-1.2.4_1 libgtksourceview-4.so.0 gtksourceview4-4.0.2_1 libgtksourceview-5.so.0 gtksourceview5-5.2.0_1 diff --git a/srcpkgs/mozjs115-devel b/srcpkgs/mozjs115-devel new file mode 120000 index 0000000000000..9d8ba498685a5 --- /dev/null +++ b/srcpkgs/mozjs115-devel @@ -0,0 +1 @@ +mozjs115 \ No newline at end of file diff --git a/srcpkgs/mozjs115/patches/001-fix-soname.patch b/srcpkgs/mozjs115/patches/001-fix-soname.patch new file mode 100644 index 0000000000000..a319d9e975ef9 --- /dev/null +++ b/srcpkgs/mozjs115/patches/001-fix-soname.patch @@ -0,0 +1,26 @@ +From d21c7cb9343d8c495d987e71be0f35887574c820 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= +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 0f9b2ac..f6b4efe 100644 +--- a/config/rules.mk ++++ b/config/rules.mk +@@ -285,6 +285,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.31.1 + diff --git a/srcpkgs/mozjs115/patches/002-copy-headers.patch b/srcpkgs/mozjs115/patches/002-copy-headers.patch new file mode 100644 index 0000000000000..aafe1aa84bd34 --- /dev/null +++ b/srcpkgs/mozjs115/patches/002-copy-headers.patch @@ -0,0 +1,38 @@ +From 3b3c8e37cca418e07bdeceaf3a601805df28d925 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= +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 d964466..0285ad9 100644 +--- a/python/mozbuild/mozbuild/backend/recursivemake.py ++++ b/python/mozbuild/mozbuild/backend/recursivemake.py +@@ -1568,9 +1568,9 @@ class RecursiveMakeBackend(MakeBackend): + " of srcdir-relative or absolute paths." + ) + +- install_manifest.add_pattern_link(basepath, wild, dest_dir) ++ install_manifest.add_pattern_copy(basepath, wild, dest_dir) + else: +- install_manifest.add_pattern_link(f.srcdir, f, dest_dir) ++ install_manifest.add_pattern_copy(f.srcdir, f, dest_dir) + elif isinstance(f, AbsolutePath): + if not f.full_path.lower().endswith((".dll", ".pdb", ".so")): + raise Exception( +@@ -1581,7 +1581,7 @@ class RecursiveMakeBackend(MakeBackend): + install_manifest.add_optional_exists(dest_file) + absolute_files.append(f.full_path) + else: +- install_manifest.add_link(f.full_path, dest_file) ++ install_manifest.add_copy(f.full_path, dest_file) + else: + install_manifest.add_optional_exists(dest_file) + objdir_files.append(self._pretty_path(f, backend_file)) +-- +2.31.1 + diff --git a/srcpkgs/mozjs115/patches/003-tests-timeout.patch b/srcpkgs/mozjs115/patches/003-tests-timeout.patch new file mode 100644 index 0000000000000..c86cca403deb0 --- /dev/null +++ b/srcpkgs/mozjs115/patches/003-tests-timeout.patch @@ -0,0 +1,26 @@ +From 9be85b155c6df0454c5faef9e850f572c99e3615 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= +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/srcpkgs/mozjs115/patches/004-icu-sources-data-py-decouple.patch b/srcpkgs/mozjs115/patches/004-icu-sources-data-py-decouple.patch new file mode 100644 index 0000000000000..8572c21fd4ec2 --- /dev/null +++ b/srcpkgs/mozjs115/patches/004-icu-sources-data-py-decouple.patch @@ -0,0 +1,29 @@ +From: Simon McVittie +Date: Mon, 9 Oct 2017 09:22:12 +0100 +Subject: icu_sources_data.py: Decouple from Mozilla build system + +mozpack.path is a wrapper around os.path that normalizes path +separators on Windows, but on Unix we only have one path separator +so there's nothing to normalize. Avoid needing to import all of it. +--- + intl/icu_sources_data.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/intl/icu_sources_data.py b/intl/icu_sources_data.py +index 2936df9..4db52af 100644 +--- a/intl/icu_sources_data.py ++++ b/intl/icu_sources_data.py +@@ -21,7 +21,9 @@ import subprocess + import sys + import tempfile + +-from mozpack import path as mozpath ++# Close enough ++import os.path as mozpath ++mozpath.normsep = lambda p: p + + # The following files have been determined to be dead/unused by a + # semi-automated analysis. You can just remove any of the files below +-- +2.31.1 + diff --git a/srcpkgs/mozjs115/patches/005-icu-sources-data-write-command-stderr.patch b/srcpkgs/mozjs115/patches/005-icu-sources-data-write-command-stderr.patch new file mode 100644 index 0000000000000..84684250ce4c7 --- /dev/null +++ b/srcpkgs/mozjs115/patches/005-icu-sources-data-write-command-stderr.patch @@ -0,0 +1,44 @@ +From: Simon McVittie +Date: Mon, 9 Oct 2017 09:23:14 +0100 +Subject: icu_sources_data: Write command output to our stderr + +Saying "See output in /tmp/foobar" is all very well for a developer +build, but on a buildd our /tmp is going to get thrown away after +the build. Just log the usual way instead. +--- + intl/icu_sources_data.py | 16 ++++------------ + 1 file changed, 4 insertions(+), 12 deletions(-) + +diff --git a/intl/icu_sources_data.py b/intl/icu_sources_data.py +index 4db52af..d62960d 100644 +--- a/intl/icu_sources_data.py ++++ b/intl/icu_sources_data.py +@@ -188,21 +188,13 @@ def update_sources(topsrcdir): + + 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 +- ) +- except subprocess.CalledProcessError: +- print( +- """Error running "{}" in directory {} +- See output in {}""".format( +- " ".join(command), cwd, f.name +- ), +- file=sys.stderr, ++ subprocess.check_call( ++ command, cwd=cwd, stdout=sys.stderr, stderr=subprocess.STDOUT, **kwargs + ) ++ except subprocess.CalledProcessError: ++ print('''Error running "{}" in directory {}'''.format(' '.join(command), cwd), file=sys.stderr) + return False + else: +- os.unlink(f.name) + return True + + +-- +2.31.1 + diff --git a/srcpkgs/mozjs115/patches/006-emitter.patch b/srcpkgs/mozjs115/patches/006-emitter.patch new file mode 100644 index 0000000000000..556bebd257caa --- /dev/null +++ b/srcpkgs/mozjs115/patches/006-emitter.patch @@ -0,0 +1,67 @@ +From d1d785c169345b81c76213f6dd9be32b4db60294 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= +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 | 10 --------- + .../mozbuild/test/frontend/test_emitter.py | 22 ------------------- + 2 files changed, 32 deletions(-) + +diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py +index 44b916e..f2e821d 100644 +--- a/python/mozbuild/mozbuild/frontend/emitter.py ++++ b/python/mozbuild/mozbuild/frontend/emitter.py +@@ -1367,16 +1367,6 @@ class TreeMetadataEmitter(LoggingMixin): + "(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 e53bc5e..c1b9d32 100644 +--- a/python/mozbuild/mozbuild/test/frontend/test_emitter.py ++++ b/python/mozbuild/mozbuild/test/frontend/test_emitter.py +@@ -1098,28 +1098,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.31.1 + diff --git a/srcpkgs/mozjs115/patches/007-tests-use-native-temporarydirectory.patch b/srcpkgs/mozjs115/patches/007-tests-use-native-temporarydirectory.patch new file mode 100644 index 0000000000000..96571ebf825ac --- /dev/null +++ b/srcpkgs/mozjs115/patches/007-tests-use-native-temporarydirectory.patch @@ -0,0 +1,65 @@ +From 1af9fdd2124547099eb0cf5a71b513ef5592dbf9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= +Date: Tue, 10 Aug 2021 00:00:50 +0200 +Subject: [PATCH] Tests: Use native TemporaryDirectory + +Without ugly wrapper for Py < 3.2 that doesn't work half of the times... +--- + js/src/jit-test/jit_test.py | 2 +- + js/src/tests/jstests.py | 2 +- + js/src/tests/lib/tempfile.py | 17 +---------------- + 3 files changed, 3 insertions(+), 18 deletions(-) + +diff --git a/js/src/jit-test/jit_test.py b/js/src/jit-test/jit_test.py +index f5d7794..8d443aa 100755 +--- a/js/src/jit-test/jit_test.py ++++ b/js/src/jit-test/jit_test.py +@@ -28,7 +28,7 @@ def add_tests_dir_to_path(): + add_tests_dir_to_path() + + from lib import jittests +-from lib.tempfile import TemporaryDirectory ++from tempfile import TemporaryDirectory + from lib.tests import ( + change_env, + get_cpu_count, +diff --git a/js/src/tests/jstests.py b/js/src/tests/jstests.py +index 6fa2f5f..53ceff6 100755 +--- a/js/src/tests/jstests.py ++++ b/js/src/tests/jstests.py +@@ -27,7 +27,7 @@ from subprocess import call, list2cmdlin + from lib.adaptor import xdr_annotate + from lib.progressbar import ProgressBar + from lib.results import ResultsSink, TestOutput +-from lib.tempfile import TemporaryDirectory ++from tempfile import TemporaryDirectory + from lib.tests import ( + RefTestCase, + change_env, +diff --git a/js/src/tests/lib/tempfile.py b/js/src/tests/lib/tempfile.py +index ecc21c9..f0a1fa3 100644 +--- a/js/src/tests/lib/tempfile.py ++++ b/js/src/tests/lib/tempfile.py +@@ -1,18 +1,4 @@ + # This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. +-try: +- # Python 3.2 +- from tempfile import TemporaryDirectory +-except ImportError: +- import shutil +- import tempfile +- from contextlib import contextmanager +- +- @contextmanager +- def TemporaryDirectory(*args, **kwds): +- d = tempfile.mkdtemp(*args, **kwds) +- try: +- yield d +- finally: +- shutil.rmtree(d) ++from tempfile import TemporaryDirectory +-- +2.31.1 + diff --git a/srcpkgs/mozjs115/patches/008-init-patch.patch b/srcpkgs/mozjs115/patches/008-init-patch.patch new file mode 100644 index 0000000000000..1954a55bf3691 --- /dev/null +++ b/srcpkgs/mozjs115/patches/008-init-patch.patch @@ -0,0 +1,28 @@ +From 00414eb67ab0591911167155963b5524fbf2b0c0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= +Date: Mon, 9 Aug 2021 14:38:58 +0200 +Subject: [PATCH] Don't throw InvalidOptionError on invalid options + +--- + python/mozbuild/mozbuild/configure/__init__.py | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/python/mozbuild/mozbuild/configure/__init__.py b/python/mozbuild/mozbuild/configure/__init__.py +index f3167f6..c9e1132 100644 +--- a/python/mozbuild/mozbuild/configure/__init__.py ++++ b/python/mozbuild/mozbuild/configure/__init__.py +@@ -553,10 +553,7 @@ class ConfigureSandbox(dict): + for arg in self._helper: + without_value = arg.split("=", 1)[0] + msg = "Unknown option: %s" % without_value +- if self._help: +- self._logger.warning(msg) +- else: +- raise InvalidOptionError(msg) ++ self._logger.warning(msg) + + # Run the execution queue + for func, args in self._execution_queue: +-- +2.31.1 + diff --git a/srcpkgs/mozjs115/patches/009-sloppy-m4-detection.patch b/srcpkgs/mozjs115/patches/009-sloppy-m4-detection.patch new file mode 100644 index 0000000000000..10b8b16ea7dc9 --- /dev/null +++ b/srcpkgs/mozjs115/patches/009-sloppy-m4-detection.patch @@ -0,0 +1,29 @@ +From 2d99a7b076578a3394fb9d5be6eb44f9cfebc681 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= +Date: Mon, 9 Aug 2021 16:15:37 +0200 +Subject: [PATCH] Remove sloppy m4 detection from bundled autoconf + +--- + build/autoconf/autoconf.sh | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/build/autoconf/autoconf.sh b/build/autoconf/autoconf.sh +index ceb8a25..606c74e 100644 +--- a/build/autoconf/autoconf.sh ++++ b/build/autoconf/autoconf.sh +@@ -114,12 +114,6 @@ fi + + # Use the frozen version of Autoconf if available. + r= f= +-# Some non-GNU m4's don't reject the --help option, so give them /dev/null. +-case `$M4 --help < /dev/null 2>&1` in +-*reload-state*) test -r $AC_MACRODIR/autoconf.m4f && { r=--reload f=f; } ;; +-*traditional*) ;; +-*) echo Autoconf requires GNU m4 1.1 or later >&2; rm -f $tmpin; exit 1 ;; +-esac + + $M4 -I$AC_MACRODIR $use_localdir $r autoconf.m4$f $infile > $tmpout || + { rm -f $tmpin $tmpout; exit 2; } +-- +2.31.1 + diff --git a/srcpkgs/mozjs115/patches/011-failing-tests-ppc64-s390x.patch b/srcpkgs/mozjs115/patches/011-failing-tests-ppc64-s390x.patch new file mode 100644 index 0000000000000..5c286647325cf --- /dev/null +++ b/srcpkgs/mozjs115/patches/011-failing-tests-ppc64-s390x.patch @@ -0,0 +1,36 @@ +From db3a0a25b97377b388532b23e73a10d246f66496 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= +Date: Mon, 3 Aug 2020 10:27:00 +0200 +Subject: [PATCH] Skip failing tests on ppc64 and s390x + +ppc64 and s390x: non262/extensions/clone-errors.js +s390x: test262/built-ins/TypedArray/prototype/set/typedarray-arg-set-values-same-buffer-other-type.js +s390x, ppc64 and aarch64: test262/built-ins/Date/UTC/fp-evaluation-order.js +--- + js/src/tests/jstests.list | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/js/src/tests/jstests.list b/js/src/tests/jstests.list +index 73ce42f..1797646 100644 +--- a/js/src/tests/jstests.list ++++ b/js/src/tests/jstests.list +@@ -53,6 +53,15 @@ skip-if(!this.hasOwnProperty("Intl")) include test262/intl402/jstests.list + skip-if(!this.hasOwnProperty("Atomics")) include test262/built-ins/Atomics/jstests.list + skip-if(!this.hasOwnProperty("SharedArrayBuffer")) include test262/built-ins/SharedArrayBuffer/jstests.list + ++# Crashes on s390x and ppc64, avoid it ++skip-if(xulRuntime.XPCOMABI.match(/s390x|ppc64-/)) script non262/extensions/clone-errors.js ++ ++# Crashes on s390x, ppc64, aarch64 ++skip-if(xulRuntime.XPCOMABI.match(/s390x|aarch64|ppc64-/)) script test262/built-ins/Date/UTC/fp-evaluation-order.js ++ ++# Crashes on s390x, avoid it ++skip-if(xulRuntime.XPCOMABI.match(/s390x/)) script test262/built-ins/TypedArray/prototype/set/typedarray-arg-set-values-same-buffer-other-type.js ++ + ##################################### + # Test262 tests disabled on browser # + ##################################### +-- +2.31.1 + + diff --git a/srcpkgs/mozjs115/patches/012-fix-musl.patch b/srcpkgs/mozjs115/patches/012-fix-musl.patch new file mode 100644 index 0000000000000..814912633217e --- /dev/null +++ b/srcpkgs/mozjs115/patches/012-fix-musl.patch @@ -0,0 +1,21 @@ +commit 80ae97f2b875493c5714d00ae5c2a13efbd6e017 +Author: Daniel Kolesa +Date: Sun Jan 23 21:06:47 2022 +0100 + + fix musl miscompilation + + https://github.com/void-linux/void-packages/issues/2598 + +diff --git a/js/src/old-configure.in b/js/src/old-configure.in +index 77652f67..ab5e917b 100644 +--- a/js/src/old-configure.in ++++ b/js/src/old-configure.in +@@ -1069,7 +1069,7 @@ if test "$ac_cv_thread_keyword" = yes; then + mips*-*) + : + ;; +- *-android*|*-linuxandroid*) ++ *-android*|*-linuxandroid*|*-musl*) + : + ;; + *) diff --git a/srcpkgs/mozjs115/patches/013-disable-spidermonkey-jslint.patch b/srcpkgs/mozjs115/patches/013-disable-spidermonkey-jslint.patch new file mode 100644 index 0000000000000..93e8c83f9337a --- /dev/null +++ b/srcpkgs/mozjs115/patches/013-disable-spidermonkey-jslint.patch @@ -0,0 +1,26 @@ +commit 34d8f3fb025e930450ce44f7aac501da4c2adc9c +Author: Daniel Kolesa +Date: Sun Jan 23 21:09:42 2022 +0100 + + disable spidermonkey jslint + +diff --git a/js/src/build/moz.build b/js/src/build/moz.build +index 55c66b97..243f7db2 100644 +--- a/js/src/build/moz.build ++++ b/js/src/build/moz.build +@@ -97,15 +97,3 @@ NO_EXPAND_LIBS = True + + DIST_INSTALL = True + +-# Run SpiderMonkey style checker after linking the static library. This avoids +-# running the script for no-op builds. +-GeneratedFile( +- "spidermonkey_checks", +- script="/config/run_spidermonkey_checks.py", +- inputs=[ +- "!%sjs_static.%s" % (CONFIG["LIB_PREFIX"], CONFIG["LIB_SUFFIX"]), +- "/config/check_spidermonkey_style.py", +- "/config/check_macroassembler_style.py", +- "/config/check_js_opcode.py", +- ], +-) diff --git a/srcpkgs/mozjs115/patches/014-rust-target.patch b/srcpkgs/mozjs115/patches/014-rust-target.patch new file mode 100644 index 0000000000000..4d8918a2a54c5 --- /dev/null +++ b/srcpkgs/mozjs115/patches/014-rust-target.patch @@ -0,0 +1,28 @@ +commit 34b3ac3195a40757bc5f51a1db5a47a4b18c68b5 +Author: Daniel Kolesa +Date: Sun Jan 23 21:13:38 2022 +0100 + + bypass rust triplet checks and just force ours + +diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure +index cd77d72b..0c03cab7 100644 +--- a/build/moz.configure/rust.configure ++++ b/build/moz.configure/rust.configure +@@ -261,7 +261,7 @@ def rust_supported_targets(rustc): + data.setdefault(key, []).append(namespace(rust_target=t, target=info)) + return data + +- ++@imports("os") + def detect_rustc_target( + host_or_target, compiler_info, arm_target, rust_supported_targets + ): +@@ -383,7 +383,7 @@ def detect_rustc_target( + + return None + +- rustc_target = find_candidate(candidates) ++ rustc_target = os.environ["RUST_TARGET"] + + if rustc_target is None: + die("Don't know how to translate {} for rustc".format(host_or_target.alias)) diff --git a/srcpkgs/mozjs115/patches/015-drop-rustc-validation.patch b/srcpkgs/mozjs115/patches/015-drop-rustc-validation.patch new file mode 100644 index 0000000000000..e2b340cd060e4 --- /dev/null +++ b/srcpkgs/mozjs115/patches/015-drop-rustc-validation.patch @@ -0,0 +1,80 @@ +drop some rust compiler validation + +--- a/build/moz.configure/rust.configure ++++ b/build/moz.configure/rust.configure +@@ -91,9 +91,6 @@ def unwrap_rustup(prog, name): + return unwrap + + +-rustc = unwrap_rustup(rustc, "rustc") +-cargo = unwrap_rustup(cargo, "cargo") +- + + set_config("CARGO", cargo) + set_config("RUSTC", rustc) +@@ -411,35 +408,6 @@ def assert_rust_compile(host_or_target, rustc_target, rustc): + + os.write(in_fd, ensure_binary(source)) + os.close(in_fd) +- +- cmd = [ +- rustc, +- "--crate-type", +- "staticlib", +- target_arg, +- "-o", +- out_path, +- in_path, +- ] +- +- def failed(): +- die( +- dedent( +- """\ +- Cannot compile for {} with {} +- The target may be unsupported, or you may not have +- a rust std library for that target installed. Try: +- +- rustup target add {} +- """.format( +- host_or_target.alias, rustc, rustc_target +- ) +- ) +- ) +- +- check_cmd_output(*cmd, onerror=failed) +- if not os.path.exists(out_path) or os.path.getsize(out_path) == 0: +- failed() + finally: + os.remove(in_path) + os.remove(out_path) +@@ -462,29 +430,6 @@ def rust_host_triple( + rustc_target = detect_rustc_target( + host, compiler_info, arm_target, rust_supported_targets + ) +- if rustc_target != rustc_host: +- if host.alias == rustc_target: +- configure_host = host.alias +- else: +- configure_host = "{}/{}".format(host.alias, rustc_target) +- die( +- dedent( +- """\ +- The rust compiler host ({rustc}) is not suitable for the configure host ({configure}). +- +- You can solve this by: +- * Set your configure host to match the rust compiler host by editing your +- mozconfig and adding "ac_add_options --host={rustc}". +- * Or, install the rust toolchain for {configure}, if supported, by running +- "rustup default stable-{rustc_target}" +- """.format( +- rustc=rustc_host, +- configure=configure_host, +- rustc_target=rustc_target, +- ) +- ) +- ) +- assert_rust_compile(host, rustc_target, rustc) + return rustc_target + + diff --git a/srcpkgs/mozjs115/patches/017-no-lto-readelf.patch b/srcpkgs/mozjs115/patches/017-no-lto-readelf.patch new file mode 100644 index 0000000000000..903a72a809767 --- /dev/null +++ b/srcpkgs/mozjs115/patches/017-no-lto-readelf.patch @@ -0,0 +1,35 @@ +commit 1cc729c5221d0ce4c80786ccdcb2de4a6ca382b6 +Author: Daniel Kolesa +Date: Sun Jan 23 21:55:43 2022 +0100 + + drop some library checks + + This calls readelf and won't work with LTO'd setups. + +diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk +index 401c2933..ade4f1da 100644 +--- a/config/makefiles/rust.mk ++++ b/config/makefiles/rust.mk +@@ -444,22 +444,6 @@ RUST_LIBRARY_DEP_FILE := $(basename $(RU + RUST_LIBRARY_DEPS := $(wordlist 2, 10000000, $(if $(wildcard $(RUST_LIBRARY_DEP_FILE)),$(shell cat $(RUST_LIBRARY_DEP_FILE)))) + $(RUST_LIBRARY_FILE): $(CARGO_FILE) $(if $(RUST_LIBRARY_DEPS),$(RUST_LIBRARY_DEPS), force-cargo-library-build) + $(if $(RUST_LIBRARY_DEPS),+$(MAKE) force-cargo-library-build,:) +-# When we are building in --enable-release mode; we add an additional check to confirm +-# that we are not importing any networking-related functions in rust code. This reduces +-# the chance of proxy bypasses originating from rust code. +-# The check only works when rust code is built with -Clto but without MOZ_LTO_RUST_CROSS. +-# Sanitizers and sancov also fail because compiler-rt hooks network functions. +-ifndef MOZ_PROFILE_GENERATE +-ifeq ($(OS_ARCH), Linux) +-ifeq (,$(rustflags_sancov)$(MOZ_ASAN)$(MOZ_TSAN)$(MOZ_UBSAN)) +-ifndef MOZ_LTO_RUST_CROSS +-ifneq (,$(filter -Clto,$(cargo_rustc_flags))) +- $(call py_action,check_binary,--target --networking $@) +-endif +-endif +-endif +-endif +-endif + + define make_default_rule + $(1): diff --git a/srcpkgs/mozjs115/patches/MOZ_NO_RUST_LTO.patch b/srcpkgs/mozjs115/patches/MOZ_NO_RUST_LTO.patch new file mode 100644 index 0000000000000..4a9b0b42a5752 --- /dev/null +++ b/srcpkgs/mozjs115/patches/MOZ_NO_RUST_LTO.patch @@ -0,0 +1,18 @@ +--- a/config/makefiles/rust.mk ++++ b/config/makefiles/rust.mk +@@ -64,6 +64,7 @@ endif + # These flags are passed via `cargo rustc` and only apply to the final rustc + # invocation (i.e., only the top-level crate, not its dependencies). + cargo_rustc_flags = $(CARGO_RUSTCFLAGS) ++ifneq (1,$(MOZ_NO_RUST_LTO)) + ifndef DEVELOPER_OPTIONS + ifndef MOZ_DEBUG_RUST + # Enable link-time optimization for release builds, but not when linking +@@ -77,6 +78,7 @@ RUSTFLAGS += -Cembed-bitcode=yes + endif + endif + endif ++endif + + ifdef CARGO_INCREMENTAL + export CARGO_INCREMENTAL diff --git a/srcpkgs/mozjs115/patches/armv6l-isb.patch b/srcpkgs/mozjs115/patches/armv6l-isb.patch new file mode 100644 index 0000000000000..1a7f3e45ee42a --- /dev/null +++ b/srcpkgs/mozjs115/patches/armv6l-isb.patch @@ -0,0 +1,16 @@ +diff -rup Architecture-arm.cpp.orig Architecture-arm.cpp +--- a/js/src/jit/arm/Architecture-arm.cpp ++++ b/js/src/jit/arm/Architecture-arm.cpp +@@ -531,7 +531,11 @@ void FlushExecutionContext() { + #ifndef JS_SIMULATOR_ARM + // Ensure that any instructions already in the pipeline are discarded and + // reloaded from the icache. +- asm volatile("isb\n" : : : "memory"); ++# if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) ++ asm volatile("isb\n" : : : "memory"); ++# else ++ asm volatile("mcr p15, 0, %0, c7, c5, 4" : : "r" (0) : "memory"); ++# endif + #else + // We assume the icache flushing routines on other platforms take care of this + #endif diff --git a/srcpkgs/mozjs115/patches/fix-build-ppc32.patch b/srcpkgs/mozjs115/patches/fix-build-ppc32.patch new file mode 100644 index 0000000000000..f9f8e0cd7acec --- /dev/null +++ b/srcpkgs/mozjs115/patches/fix-build-ppc32.patch @@ -0,0 +1,18 @@ +From 62780b31095fcd37a5d9218d0393d552bc44149f Mon Sep 17 00:00:00 2001 +From: q66 +Date: Mon Jun 13 14:01:59 2022 +0200 +Subject: fix ftbfs on powerpc32 + +diff --git a/js/src/wasm/WasmDebugFrame.h b/js/src/wasm/WasmDebugFrame.h +index 47652e9..02a13559 100644 +--- a/js/src/wasm/WasmDebugFrame.h ++++ b/js/src/wasm/WasmDebugFrame.h +@@ -112,7 +112,7 @@ class DebugFrame { + + // Avoid -Wunused-private-field warnings. + protected: +-#if defined(JS_CODEGEN_ARM) || defined(JS_CODEGEN_X86) || defined(__wasi__) ++#if defined(JS_CODEGEN_ARM) || defined(JS_CODEGEN_X86) || defined(__wasi__) || (defined(__powerpc__) && !defined(__powerpc64__)) + // See alignmentStaticAsserts(). For ARM32 and X86 DebugFrame is only + // 4-byte aligned, so we add another word to get up to 8-byte + // alignment. diff --git a/srcpkgs/mozjs115/patches/fix-i386-fdlibm.patch b/srcpkgs/mozjs115/patches/fix-i386-fdlibm.patch new file mode 100644 index 0000000000000..831e5e03678d8 --- /dev/null +++ b/srcpkgs/mozjs115/patches/fix-i386-fdlibm.patch @@ -0,0 +1,18 @@ +# error: typedef redefinition with different types ('__double_t' (aka 'double') vs 'long double') +# https://bugzilla.mozilla.org/show_bug.cgi?id=1729459 + +--- a/modules/fdlibm/src/math_private.h ++++ b/modules/fdlibm/src/math_private.h +@@ -30,7 +30,12 @@ + * Adapted from https://github.com/freebsd/freebsd-src/search?q=__double_t + */ + ++#if defined(__linux__) && defined(__i386__) ++// rely on glibc's double_t ++typedef long double __double_t; ++#else + typedef double __double_t; ++#endif + typedef __double_t double_t; + + /* diff --git a/srcpkgs/mozjs115/template b/srcpkgs/mozjs115/template new file mode 100644 index 0000000000000..0582ff566c0b7 --- /dev/null +++ b/srcpkgs/mozjs115/template @@ -0,0 +1,89 @@ +# Template file for 'mozjs115' +pkgname=mozjs115 +version=115.7.0 +revision=1 +build_wrksrc=js/src +build_style=gnu-configure +build_helper=rust +make_check_target=check-jit-test +configure_args="--disable-jemalloc --disable-strip --disable-tests \ + --disable-optimize --disable-debug --enable-ctypes --enable-readline \ + --enable-shared-js --enable-system-ffi --with-intl-api --with-system-icu \ + --with-system-nspr --with-system-zlib --enable-hardening --enable-release" +hostmakedepends="make pkg-config python3 python3-setuptools python3-six perl m4 + rust cargo llvm12 clang" +makedepends="icu-devel libffi-devel nspr-devel python3-devel readline-devel + zlib-devel rust-std" +checkdepends="python3" +short_desc="SpiderMonkey JavaScript interpreter and library (115.x)" +maintainer="oreo639 " +license="MPL-2.0" +homepage="https://spidermonkey.dev" +distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz" +checksum=13edffcd3ce9ff485eafe84ad256794a8ca3ca91fe06e5ed4df8e008c157a429 + +LDFLAGS="-Wl,-z,stack-size=1048576" + +pre_configure() { + if [ "$CROSS_BUILD" ]; then + configure_args+=" --host=${XBPS_TRIPLET} --target=${XBPS_CROSS_TRIPLET} --enable-linker=bfd" + fi + export M4=m4 + export AWK=awk + export AC_MACRODIR=${wrksrc}/build/autoconf + + rm -r ${wrksrc}/third_party/python/six + mkdir ${wrksrc}/third_party/python/six + ln -s /${py3_sitelib}/six.py ${wrksrc}/third_party/python/six +} + +post_install() { + # Remove unneeded static library + rm -f "${DESTDIR}"/usr/lib/*.ajs + + # it has correct soname but not the right file name + mv "${DESTDIR}"/usr/lib/libmozjs-${version%%.*}.so \ + "${DESTDIR}"/usr/lib/libmozjs-${version%%.*}.so.0 + ln -rs "${DESTDIR}"/usr/lib/libmozjs-${version%%.*}.so.0 \ + "${DESTDIR}"/usr/lib/libmozjs-${version%%.*}.so +} + +pre_check() { + if [ "$XBPS_WORDSIZE" = 32 ]; then + vsed -i jit-test/tests/basic/bug653153.js -e s/65536/65568/g + vsed -i jit-test/tests/basic/bug653153.js -e s/65537/65569/g + fi + if [ "$XBPS_TARGET_MACHINE" = i686 ]; then + export JITTEST_EXTRA_ARGS="${JITTEST_EXTRA_ARGS} \ + -x basic/fdlibm-for-sin-cos-tan-argument.js \ + -x gc/gcparam.js \ + -x ion/dce-with-rinstructions.js \ + -x sunspider/check-3d-cube.js \ + -x sunspider/check-3d-raytrace.js \ + -x sunspider/check-access-nbody.js \ + -x wasm/nan-semantics.js \ + -x wasm/spec/spec/float_literals.wast.js \ + -x wasm/spec/spec/float_memory.wast.js \ + -x wasm/spec/threads/float_memory.wast.js \ + " + fi + if [ "$XBPS_LIBC" = musl ]; then + export JITTEST_EXTRA_ARGS="${JITTEST_EXTRA_ARGS} \ + -x sunspider/check-date-format-tofte.js \ + " + fi + export JITTEST_EXTRA_ARGS="${JITTEST_EXTRA_ARGS} \ + --timeout 600 \ + " +} + +mozjs115-devel_package() { + depends="nspr-devel ${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/bin + vmove usr/include + vmove "usr/lib/*.so" + vmove usr/lib/pkgconfig + } +} diff --git a/srcpkgs/mozjs115/update b/srcpkgs/mozjs115/update new file mode 100644 index 0000000000000..f942fe4f0fc95 --- /dev/null +++ b/srcpkgs/mozjs115/update @@ -0,0 +1,2 @@ +site="${MOZILLA_SITE}/firefox/releases/" +pattern="releases/\K${version%%.*}.*(?=esr/\")" From e118ffd37999e29bb4c5f97e3879dbc90ed9ae0c Mon Sep 17 00:00:00 2001 From: oreo639 Date: Mon, 5 Feb 2024 05:30:30 -0800 Subject: [PATCH 2/2] gjs: update to 1.78.3. --- ...44573672668e8bc8692afaaa7d8a73365660.patch | 49 ------------------- srcpkgs/gjs/template | 8 +-- 2 files changed, 4 insertions(+), 53 deletions(-) delete mode 100644 srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch diff --git a/srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch b/srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch deleted file mode 100644 index 52743a99f6cfd..0000000000000 --- a/srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 83683d093c157828cf7787e53a32c586ae4e85d3 Mon Sep 17 00:00:00 2001 -From: Dominik Opyd -Date: Wed, 8 Mar 2023 15:13:56 +0100 -Subject: [PATCH] fix(build, tests): move `have_gtk4` to the appropriate place - ---- - installed-tests/js/meson.build | 10 +++++++--- - meson.build | 4 ---- - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build -index 6db887d22..1e953ceb7 100644 ---- a/installed-tests/js/meson.build -+++ b/installed-tests/js/meson.build -@@ -203,9 +203,13 @@ endif - # during build should be run using dbus-run-session - - dbus_tests = ['GDBus'] --if have_gtk4 and not get_option('skip_gtk_tests') -- # FIXME: find out why GTK4 tries to acquire a message bus -- dbus_tests += 'Gtk4' -+if not get_option('skip_gtk_tests') -+ have_gtk4 = dependency('gtk4', required: false).found() -+ -+ if have_gtk4 -+ # FIXME: find out why GTK4 tries to acquire a message bus -+ dbus_tests += 'Gtk4' -+ endif - endif - - bus_config = files('../../test/test-bus.conf') -diff --git a/meson.build b/meson.build -index 3ac372a16..5c7703935 100644 ---- a/meson.build -+++ b/meson.build -@@ -679,10 +679,6 @@ endif - - ### Tests and test setups ###################################################### - --if not get_option('skip_gtk_tests') -- have_gtk4 = dependency('gtk4', required: false).found() --endif -- - subdir('installed-tests') - - # Note: The test program in test/ needs to be ported --- -GitLab - diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template index f229763ea8836..5dd14d3f17c68 100644 --- a/srcpkgs/gjs/template +++ b/srcpkgs/gjs/template @@ -1,12 +1,12 @@ # Template file for 'gjs' pkgname=gjs -version=1.76.0 +version=1.78.3 revision=1 build_style=meson build_helper="gir qemu" configure_args="-Dprofiler=disabled -Dinstalled_tests=false" hostmakedepends="glib-devel pkg-config icu-libs" -makedepends="dbus-glib-devel mozjs102-devel readline-devel sysprof-devel" +makedepends="dbus-glib-devel mozjs115-devel readline-devel sysprof-devel" checkdepends="xvfb-run cantarell-fonts" short_desc="Mozilla-based javascript bindings for the GNOME platform" maintainer="Enno Boland " @@ -15,7 +15,7 @@ homepage="https://gitlab.gnome.org/GNOME/gjs" #changelog="https://gitlab.gnome.org/GNOME/gjs/-/raw/master/NEWS" changelog="https://gitlab.gnome.org/GNOME/gjs/-/raw/gnome-44/NEWS" distfiles="${GNOME_SITE}/gjs/${version%.*}/gjs-${version}.tar.xz" -checksum=a63f156964b136053eab51ea013114e7d7c193b7518d28c040b6b02c3c933a6d +checksum=42d50364caa5d792c76734fe5bbcc4b9dbb48819da20a4060061e8b9526134a4 make_check_pre="xvfb-run" if [ "$XBPS_CHECK_PKGS" ]; then @@ -29,7 +29,7 @@ post_install() { } gjs-devel_package() { - depends="libgirepository-devel mozjs102-devel ${sourcepkg}>=${version}_${revision}" + depends="libgirepository-devel mozjs115-devel ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include