summaryrefslogtreecommitdiffstats
path: root/source/l/mozjs52/patches
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2018-11-19 02:46:11 +0000
committer Eric Hameleers <alien@slackware.com>2018-11-19 08:59:43 +0100
commit595bebf6676bdb224371224673779e411b9428a9 (patch)
tree10a40fc1c5f1e775fb4ddfc77c47209554b6bb41 /source/l/mozjs52/patches
parent6a677844125bf74f4dac1fc2e4e7181281f7ae39 (diff)
downloadcurrent-595bebf6676bdb224371224673779e411b9428a9.tar.gz
current-595bebf6676bdb224371224673779e411b9428a9.tar.xz
Mon Nov 19 02:46:11 UTC 201820181119024611
l/js185-1.0.0-x86_64-2.txz: Removed. l/libwebp-1.0.1-x86_64-1.txz: Upgraded. l/mozjs52-52.9.0esr-x86_64-1.txz: Added. Required by the new version of polkit. l/polkit-0.115-x86_64-1.txz: Upgraded. Thanks to Robby Workman.
Diffstat (limited to 'source/l/mozjs52/patches')
-rw-r--r--source/l/mozjs52/patches/build-icu-big-endian.patch12
-rw-r--r--source/l/mozjs52/patches/build-missing-xlocale-h.patch12
-rw-r--r--source/l/mozjs52/patches/copy-headers.patch30
-rw-r--r--source/l/mozjs52/patches/disable-mozglue.patch66
-rw-r--r--source/l/mozjs52/patches/fix-soname.patch34
-rw-r--r--source/l/mozjs52/patches/include-configure-script.patch48
-rw-r--r--source/l/mozjs52/patches/mozilla-1253216.patch12
-rw-r--r--source/l/mozjs52/patches/tests-increase-timeout.patch16
-rw-r--r--source/l/mozjs52/patches/tests-snans-be.patch29
-rw-r--r--source/l/mozjs52/patches/xulrunner-24.0-jemalloc-ppc.patch12
-rw-r--r--source/l/mozjs52/patches/xulrunner-24.0-s390-inlines.patch12
11 files changed, 283 insertions, 0 deletions
diff --git a/source/l/mozjs52/patches/build-icu-big-endian.patch b/source/l/mozjs52/patches/build-icu-big-endian.patch
new file mode 100644
index 000000000..68fbea1a0
--- /dev/null
+++ b/source/l/mozjs52/patches/build-icu-big-endian.patch
@@ -0,0 +1,12 @@
+diff -up mozilla-aurora/build/autoconf/icu.m4.icu-endian mozilla-aurora/build/autoconf/icu.m4
+--- mozilla-aurora/build/autoconf/icu.m4.icu-endian 2016-12-09 09:11:01.227317790 +0100
++++ mozilla-aurora/build/autoconf/icu.m4 2016-12-09 09:18:40.608712247 +0100
+@@ -78,7 +78,7 @@ if test -n "$USE_ICU"; then
+ # 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"
+
+ dnl We won't build ICU data as a separate file when building
+ dnl JS standalone so that embedders don't have to deal with it.
diff --git a/source/l/mozjs52/patches/build-missing-xlocale-h.patch b/source/l/mozjs52/patches/build-missing-xlocale-h.patch
new file mode 100644
index 000000000..b4a62b268
--- /dev/null
+++ b/source/l/mozjs52/patches/build-missing-xlocale-h.patch
@@ -0,0 +1,12 @@
+diff -up thunderbird-52.3.0/mozilla/intl/icu/source/i18n/digitlst.cpp.xlocale thunderbird-52.3.0/mozilla/intl/icu/source/i18n/digitlst.cpp
+--- thunderbird-52.3.0/mozilla/intl/icu/source/i18n/digitlst.cpp.xlocale 2017-08-24 14:42:48.634084293 +0200
++++ thunderbird-52.3.0/mozilla/intl/icu/source/i18n/digitlst.cpp 2017-08-24 14:42:50.534084676 +0200
+@@ -64,7 +64,7 @@
+ # if U_PLATFORM_USES_ONLY_WIN32_API || U_PLATFORM == U_PF_CYGWIN
+ # include <locale.h>
+ # else
+-# include <xlocale.h>
++# include <locale.h>
+ # endif
+ #endif
+
diff --git a/source/l/mozjs52/patches/copy-headers.patch b/source/l/mozjs52/patches/copy-headers.patch
new file mode 100644
index 000000000..69b216151
--- /dev/null
+++ b/source/l/mozjs52/patches/copy-headers.patch
@@ -0,0 +1,30 @@
+From 8b2d7a77bfb4dbd513763501ed7e9722058ee9af Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Wed, 5 Jul 2017 22:45:59 -0700
+Subject: [PATCH] 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 132dcf94..33d489a6 100644
+--- a/python/mozbuild/mozbuild/backend/recursivemake.py
++++ b/python/mozbuild/mozbuild/backend/recursivemake.py
+@@ -1307,11 +1307,11 @@ def _process_final_target_files(self, obj, files, backend_file):
+ raise Exception("Wildcards are only supported in the filename part of "
+ "srcdir-relative or absolute paths.")
+
+- install_manifest.add_pattern_symlink(basepath, wild, path)
++ install_manifest.add_pattern_copy(basepath, wild, path)
+ else:
+- install_manifest.add_pattern_symlink(f.srcdir, f, path)
++ install_manifest.add_pattern_copy(f.srcdir, f, path)
+ else:
+- install_manifest.add_symlink(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/mozjs52/patches/disable-mozglue.patch b/source/l/mozjs52/patches/disable-mozglue.patch
new file mode 100644
index 000000000..8355cf4b0
--- /dev/null
+++ b/source/l/mozjs52/patches/disable-mozglue.patch
@@ -0,0 +1,66 @@
+From 7e6d628456af3e99ebcb9a01a27e1461585082a4 Mon Sep 17 00:00:00 2001
+From: Till Schneidereit <till@tillschneidereit.net>
+Date: Thu, 1 Oct 2015 12:59:09 +0200
+Subject: [PATCH] Disable MOZ_GLUE_IN_PROGRAM in stand-alone builds on all
+ platforms
+
+Otherwise, build fails not being able to find HashBytes.
+
+Patch ported forward to mozjs52 by Philip Chimento
+<philip.chimento@gmail.com>.
+
+https://bugzilla.mozilla.org/show_bug.cgi?id=1176787
+---
+ js/src/old-configure.in | 23 ++++++++++++++---------
+ mozglue/build/moz.build | 2 +-
+ 2 files changed, 15 insertions(+), 10 deletions(-)
+
+diff --git a/js/src/old-configure.in b/js/src/old-configure.in
+index 1c5c9e21..ff0617e3 100644
+--- a/js/src/old-configure.in
++++ b/js/src/old-configure.in
+@@ -1623,16 +1623,21 @@ dnl ========================================================
+ dnl = Enable jemalloc
+ dnl ========================================================
+
+-case "${OS_TARGET}" in
+-Android|WINNT|Darwin)
++dnl In stand-alone builds we always only want to link executables against mozglue.
++if test "$JS_STANDALONE"; then
+ MOZ_GLUE_IN_PROGRAM=
+- ;;
+-*)
+- dnl On !Android !Windows !OSX, we only want to link executables against mozglue
+- MOZ_GLUE_IN_PROGRAM=1
+- AC_DEFINE(MOZ_GLUE_IN_PROGRAM)
+- ;;
+-esac
++else
++ case "${OS_TARGET}" in
++ Android|WINNT|Darwin)
++ MOZ_GLUE_IN_PROGRAM=
++ ;;
++ *)
++ dnl On !Android !Windows !OSX, we only want to link executables against mozglue
++ MOZ_GLUE_IN_PROGRAM=1
++ AC_DEFINE(MOZ_GLUE_IN_PROGRAM)
++ ;;
++ esac
++fi
+
+ if test "$MOZ_MEMORY"; then
+ if test "x$MOZ_DEBUG" = "x1"; then
+diff --git a/mozglue/build/moz.build b/mozglue/build/moz.build
+index d2897477..e3be5a2b 100644
+--- a/mozglue/build/moz.build
++++ b/mozglue/build/moz.build
+@@ -6,7 +6,7 @@
+
+ # Build mozglue as a shared lib on Windows, OSX and Android.
+ # If this is ever changed, update MOZ_SHARED_MOZGLUE in browser/installer/Makefile.in
+-if CONFIG['OS_TARGET'] in ('WINNT', 'Darwin', 'Android'):
++if CONFIG['OS_TARGET'] in ('WINNT', 'Darwin', 'Android') and not CONFIG['JS_STANDALONE']:
+ SharedLibrary('mozglue')
+ else:
+ Library('mozglue')
+
diff --git a/source/l/mozjs52/patches/fix-soname.patch b/source/l/mozjs52/patches/fix-soname.patch
new file mode 100644
index 000000000..a91107c15
--- /dev/null
+++ b/source/l/mozjs52/patches/fix-soname.patch
@@ -0,0 +1,34 @@
+From: Laszlo Boszormenyi (GCS) <gcs@debian.org>
+Date: Fri, 02 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 | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+Index: mozjs52-52.2.1~artful1/config/rules.mk
+===================================================================
+--- mozjs52-52.2.1~artful1.orig/config/rules.mk
++++ mozjs52-52.2.1~artful1/config/rules.mk
+@@ -418,7 +418,7 @@ endif # AIX
+ #
+ # Linux: add -Bsymbolic flag for components
+ #
+-ifeq ($(OS_ARCH),Linux)
++#ifeq ($(OS_ARCH),Linux)
+ ifdef IS_COMPONENT
+ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
+ endif
+@@ -426,7 +426,8 @@ ifdef LD_VERSION_SCRIPT
+ EXTRA_DSO_LDOPTS += -Wl,--version-script,$(LD_VERSION_SCRIPT)
+ EXTRA_DEPS += $(LD_VERSION_SCRIPT)
+ endif
+-endif
++#endif
++EXTRA_DSO_LDOPTS += -Wl,-soname,lib$(JS_LIBRARY_NAME).so.0
+
+ ifdef SYMBOLS_FILE
+ ifeq ($(OS_TARGET),WINNT)
diff --git a/source/l/mozjs52/patches/include-configure-script.patch b/source/l/mozjs52/patches/include-configure-script.patch
new file mode 100644
index 000000000..c24d7b157
--- /dev/null
+++ b/source/l/mozjs52/patches/include-configure-script.patch
@@ -0,0 +1,48 @@
+From 4a06a1a6a71293decb83aee7adb74bc709493106 Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip.chimento@gmail.com>
+Date: Wed, 5 Jul 2017 22:57:09 -0700
+Subject: [PATCH] build: Include configure script, be nicer about options
+
+A configure script is not included in the SpiderMonkey tarball by
+default. Also, we have to account for JHbuild passing extra unknown
+options like --disable-Werror.
+
+https://bugzilla.mozilla.org/show_bug.cgi?id=1379540
+---
+ js/src/configure | 9 +++++++++
+ python/mozbuild/mozbuild/configure/__init__.py | 2 +-
+ python/mozbuild/mozbuild/configure/options.py | 6 +++++-
+ 3 files changed, 15 insertions(+), 2 deletions(-)
+ create mode 100755 js/src/configure
+
+diff --git a/python/mozbuild/mozbuild/configure/__init__.py b/python/mozbuild/mozbuild/configure/__init__.py
+index 0fe640ca..09b460d3 100644
+--- a/python/mozbuild/mozbuild/configure/__init__.py
++++ b/python/mozbuild/mozbuild/configure/__init__.py
+@@ -356,7 +356,7 @@ def run(self, path=None):
+ # All options should have been removed (handled) by now.
+ for arg in self._helper:
+ without_value = arg.split('=', 1)[0]
+- raise InvalidOptionError('Unknown option: %s' % without_value)
++ print('Ignoring', without_value, ': Unknown option')
+
+ # Run the execution queue
+ for func, args in self._execution_queue:
+diff --git a/python/mozbuild/mozbuild/configure/options.py b/python/mozbuild/mozbuild/configure/options.py
+index 4310c862..15bfe425 100644
+--- a/python/mozbuild/mozbuild/configure/options.py
++++ b/python/mozbuild/mozbuild/configure/options.py
+@@ -402,7 +402,11 @@ def __init__(self, environ=os.environ, argv=sys.argv):
+
+ def add(self, arg, origin='command-line', args=None):
+ assert origin != 'default'
+- prefix, name, values = Option.split_option(arg)
++ try:
++ prefix, name, values = Option.split_option(arg)
++ except InvalidOptionError as e:
++ print('Ignoring', arg, ':', e)
++ return
+ if args is None:
+ args = self._extra_args
+ if args is self._extra_args and name in self._extra_args:
+
diff --git a/source/l/mozjs52/patches/mozilla-1253216.patch b/source/l/mozjs52/patches/mozilla-1253216.patch
new file mode 100644
index 000000000..c9252da5f
--- /dev/null
+++ b/source/l/mozjs52/patches/mozilla-1253216.patch
@@ -0,0 +1,12 @@
+diff -up firefox-48.0/js/src/jit/AtomicOperations.h.old firefox-48.0/js/src/jit/AtomicOperations.h
+--- firefox-48.0/js/src/jit/AtomicOperations.h.old 2016-07-27 09:42:43.148175449 +0200
++++ firefox-48.0/js/src/jit/AtomicOperations.h 2016-07-27 09:41:13.000000000 +0200
+@@ -340,7 +340,7 @@ AtomicOperations::isLockfree(int32_t siz
+ # elif defined(__aarch64__)
+ # include "jit/arm64/AtomicOperations-arm64.h"
+ # else
+-# include "jit/none/AtomicOperations-none.h" // These MOZ_CRASH() always
++# include "jit/none/AtomicOperations-ppc.h"
+ # endif
+ #elif defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64)
+ # include "jit/x86-shared/AtomicOperations-x86-shared.h"
diff --git a/source/l/mozjs52/patches/tests-increase-timeout.patch b/source/l/mozjs52/patches/tests-increase-timeout.patch
new file mode 100644
index 000000000..f51dc16b9
--- /dev/null
+++ b/source/l/mozjs52/patches/tests-increase-timeout.patch
@@ -0,0 +1,16 @@
+Description: Increase the test timeout for slower buildds
+Author: Adrian Bunk <bunk@debian.org>
+Bug-Debian: https://bugs.debian.org/878284
+
+--- mozjs52-52.3.1.orig/js/src/Makefile.in
++++ mozjs52-52.3.1/js/src/Makefile.in
+@@ -104,7 +104,7 @@ check:: check-style check-masm check-js-
+
+ 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/mozjs52/patches/tests-snans-be.patch b/source/l/mozjs52/patches/tests-snans-be.patch
new file mode 100644
index 000000000..4e65cd913
--- /dev/null
+++ b/source/l/mozjs52/patches/tests-snans-be.patch
@@ -0,0 +1,29 @@
+Description: Fix sort_snans.js test on big endian
+Author: Adrian Bunk <bunk@debian.org>
+Bug-Debian: https://bugs.debian.org/878285
+
+--- mozjs52-52.3.1.orig/js/src/tests/ecma_6/TypedArray/sort_snans.js
++++ mozjs52-52.3.1/js/src/tests/ecma_6/TypedArray/sort_snans.js
+@@ -34,8 +34,20 @@ function testFloat32NaNRanges(start, end
+ // and startHi, startLow and endHi, endLow should be 32-bit integers which,
+ // when combined (Hi + Low), form Float64 NaNs.
+ function testFloat64NaNRanges(startHi, startLow, endHi, endLow) {
+- let skipN = 10e6;
+
++ // Swap on big endian platforms
++ if ((new Uint32Array((new Uint8Array([1,2,3,4])).buffer))[0] === 0x01020304) {
++ let tmp = startHi;
++ startHi = startLow;
++ startLow = tmp;
++
++ tmp = endHi;
++ endHi = endLow;
++ endLow = tmp;
++ }
++
++ let skipN = 10e6;
++
+ let sampleSizeHi = Math.floor((endHi - startHi)/skipN);
+ let sampleSizeLow = Math.floor((endLow - startLow)/skipN);
+
+
diff --git a/source/l/mozjs52/patches/xulrunner-24.0-jemalloc-ppc.patch b/source/l/mozjs52/patches/xulrunner-24.0-jemalloc-ppc.patch
new file mode 100644
index 000000000..d0c3d8c97
--- /dev/null
+++ b/source/l/mozjs52/patches/xulrunner-24.0-jemalloc-ppc.patch
@@ -0,0 +1,12 @@
+diff -up mozilla-aurora/memory/mozjemalloc/jemalloc.c.jemalloc-ppc.patch mozilla-aurora/memory/mozjemalloc/jemalloc.c
+--- mozilla-aurora/memory/mozjemalloc/jemalloc.c.jemalloc-ppc.patch 2016-11-18 08:56:32.242742746 +0100
++++ mozilla-aurora/memory/mozjemalloc/jemalloc.c 2016-11-18 08:59:51.809071876 +0100
+@@ -1096,7 +1096,7 @@ static const bool config_recycle = false
+ * controlling the malloc behavior are defined as compile-time constants
+ * for best performance and cannot be altered at runtime.
+ */
+-#if !defined(__ia64__) && !defined(__sparc__) && !defined(__mips__) && !defined(__aarch64__)
++#if !defined(__ia64__) && !defined(__sparc__) && !defined(__mips__) && !defined(__aarch64__) && !defined(__powerpc__)
+ #define MALLOC_STATIC_SIZES 1
+ #endif
+
diff --git a/source/l/mozjs52/patches/xulrunner-24.0-s390-inlines.patch b/source/l/mozjs52/patches/xulrunner-24.0-s390-inlines.patch
new file mode 100644
index 000000000..074f8d959
--- /dev/null
+++ b/source/l/mozjs52/patches/xulrunner-24.0-s390-inlines.patch
@@ -0,0 +1,12 @@
+diff -up xulrunner-25.0/mozilla-release/js/src/vm/SPSProfiler.cpp.s390-inlines xulrunner-25.0/mozilla-release/js/src/vm/SPSProfiler.cpp
+--- xulrunner-25.0/mozilla-release/js/src/vm/SPSProfiler.cpp.s390-inlines 2013-10-23 16:04:01.773093979 +0200
++++ xulrunner-25.0/mozilla-release/js/src/vm/SPSProfiler.cpp 2013-10-23 16:04:44.551134551 +0200
+@@ -4,6 +4,8 @@
+ * 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/. */
+
++#include "jscntxtinlines.h"
++
+ #include "vm/SPSProfiler.h"
+
+ #include "mozilla/DebugOnly.h"