diff options
Diffstat (limited to '')
15 files changed, 55 insertions, 299 deletions
diff --git a/source/l/mozjs52/patches/build-icu-big-endian.patch b/source/l/mozjs52/patches/build-icu-big-endian.patch deleted file mode 100644 index 68fbea1a0..000000000 --- a/source/l/mozjs52/patches/build-icu-big-endian.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index b4a62b268..000000000 --- a/source/l/mozjs52/patches/build-missing-xlocale-h.patch +++ /dev/null @@ -1,12 +0,0 @@ -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/disable-mozglue.patch b/source/l/mozjs52/patches/disable-mozglue.patch deleted file mode 100644 index 8355cf4b0..000000000 --- a/source/l/mozjs52/patches/disable-mozglue.patch +++ /dev/null @@ -1,66 +0,0 @@ -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 deleted file mode 100644 index a91107c15..000000000 --- a/source/l/mozjs52/patches/fix-soname.patch +++ /dev/null @@ -1,34 +0,0 @@ -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 deleted file mode 100644 index c24d7b157..000000000 --- a/source/l/mozjs52/patches/include-configure-script.patch +++ /dev/null @@ -1,48 +0,0 @@ -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 deleted file mode 100644 index c9252da5f..000000000 --- a/source/l/mozjs52/patches/mozilla-1253216.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index f51dc16b9..000000000 --- a/source/l/mozjs52/patches/tests-increase-timeout.patch +++ /dev/null @@ -1,16 +0,0 @@ -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 deleted file mode 100644 index 4e65cd913..000000000 --- a/source/l/mozjs52/patches/tests-snans-be.patch +++ /dev/null @@ -1,29 +0,0 @@ -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 deleted file mode 100644 index d0c3d8c97..000000000 --- a/source/l/mozjs52/patches/xulrunner-24.0-jemalloc-ppc.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index 074f8d959..000000000 --- a/source/l/mozjs52/patches/xulrunner-24.0-s390-inlines.patch +++ /dev/null @@ -1,12 +0,0 @@ -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" diff --git a/source/l/mozjs52/autoconf/autoconf-2.13-consolidated_fixes-1.patch b/source/l/mozjs60/autoconf/autoconf-2.13-consolidated_fixes-1.patch index 5e7b23113..5e7b23113 100644 --- a/source/l/mozjs52/autoconf/autoconf-2.13-consolidated_fixes-1.patch +++ b/source/l/mozjs60/autoconf/autoconf-2.13-consolidated_fixes-1.patch diff --git a/source/l/mozjs52/autoconf/autoconf.build b/source/l/mozjs60/autoconf/autoconf.build index 05e53f1a5..05e53f1a5 100755 --- a/source/l/mozjs52/autoconf/autoconf.build +++ b/source/l/mozjs60/autoconf/autoconf.build diff --git a/source/l/mozjs52/mozjs52.SlackBuild b/source/l/mozjs60/mozjs60.SlackBuild index 3f71bb4d2..1c35eb129 100755 --- a/source/l/mozjs52/mozjs52.SlackBuild +++ b/source/l/mozjs60/mozjs60.SlackBuild @@ -3,6 +3,7 @@ # Slackware build script for SpiderMonkey # Copyright 2011, 2018 Robby Workman, Tuscaloosa, Alabama, USA +# Copyright 2019 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,10 +25,10 @@ cd $(dirname $0) ; CWD=$(pwd) -PKGNAM=mozjs52 +PKGNAM=mozjs60 SRCNAME=firefox -VERSION=52.9.0esr -BUILD=${BUILD:-2} +VERSION=60.9.0esr +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: @@ -70,7 +71,7 @@ fi rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf $SRCNAME-$VERSION +rm -rf $SRCNAME-$VERSION ; rm -rf $SRCNAME-$(echo $VERSION | cut -f 1 -d e) # Unpack this in a subdirectory to prevent changing permissions on /tmp: rm -rf firefox-unpack mkdir firefox-unpack @@ -79,7 +80,7 @@ tar xvf $CWD/$SRCNAME-$VERSION.source.tar.?z || exit 1 mv * .. cd .. rm -rf firefox-unpack -cd $SRCNAME-$VERSION || exit 1 +cd $SRCNAME-$(echo $VERSION | cut -f 1 -d e) || cd $SRCNAME-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -91,20 +92,23 @@ find . \ ( cd $CWD/autoconf ; ./autoconf.build ) PATH=$TMP/autoconf-tmp/usr/bin:$PATH -# Patches from Debian: +# Patches from Fedora: 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/tests-snans-be.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/disable-mozglue.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/include-configure-script.patch.gz | patch -p1 --verbose || exit 1 - -# Patches from Fedora: -zcat $CWD/patches/xulrunner-24.0-jemalloc-ppc.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/xulrunner-24.0-s390-inlines.patch.gz | patch -p2 --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 + +# 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/build-missing-xlocale-h.patch.gz | patch -p2 --verbose || exit 1 -zcat $CWD/patches/mozilla-1253216.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 @@ -125,21 +129,17 @@ CXXFLAGS+="$SLKCFLAGS -fno-delete-null-pointer-checks -fno-strict-aliasing -fno- --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ - --disable-debug \ - --disable-debug-symbols \ - --disable-strip \ - --enable-gold \ - --enable-optimize="-O2" \ - --enable-threadsafe \ - --enable-pie \ + --without-system-icu \ --enable-posix-nspr-emulation \ + --with-system-zlib \ + --enable-tests \ + --disable-strip \ + --with-intl-api \ --enable-readline \ - --enable-release \ --enable-shared-js \ - --disable-tests \ - --with-intl-api \ - --with-system-zlib \ - --without-system-icu \ + --disable-optimize \ + --enable-pie \ + --disable-jemalloc \ --build=$ARCH-slackware-linux \ make $NUMJOBS || make || exit 1 @@ -148,6 +148,16 @@ make install DESTDIR=$PKG || exit 1 # No need for the huge static library: rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libjs_static.* +# Don't ship -config: +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 +( 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 +) + mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp ../../README.txt README.html $PKG/usr/doc/$PKGNAM-$VERSION diff --git a/source/l/mozjs52/patches/copy-headers.patch b/source/l/mozjs60/patches/copy-headers.patch index 69b216151..aec3b10a2 100644 --- a/source/l/mozjs52/patches/copy-headers.patch +++ b/source/l/mozjs60/patches/copy-headers.patch @@ -1,7 +1,6 @@ -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 +Subject: build: Copy headers on install instead of symlinking Patch ported forward to mozjs52 by Philip Chimento <philip.chimento@gmail.com>. @@ -10,20 +9,20 @@ Patch ported forward to mozjs52 by Philip Chimento 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 +index dd9020d..6918ef8 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): +@@ -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_symlink(basepath, wild, path) +- install_manifest.add_pattern_link(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_link(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_link(f.full_path, dest) + install_manifest.add_copy(f.full_path, dest) else: install_manifest.add_optional_exists(dest) diff --git a/source/l/mozjs52/slack-desc b/source/l/mozjs60/slack-desc index e576773a6..496f7cfa5 100644 --- a/source/l/mozjs52/slack-desc +++ b/source/l/mozjs60/slack-desc @@ -6,15 +6,15 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -mozjs52: mozjs52 (Mozilla's JavaScript Engine) -mozjs52: -mozjs52: SpiderMonkey is Mozilla's JavaScript engine written in C/C++. It is -mozjs52: used in various Mozilla products (including Firefox) and is available -mozjs52: under MPL/GPL/LGPL tri-license. -mozjs52: -mozjs52: Homepage: -mozjs52: https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey -mozjs52: -mozjs52: -mozjs52: -mozjs52: +mozjs60: mozjs60 (Mozilla's JavaScript Engine) +mozjs60: +mozjs60: SpiderMonkey is Mozilla's JavaScript engine written in C/C++. It is +mozjs60: used in various Mozilla products (including Firefox) and is available +mozjs60: under MPL/GPL/LGPL tri-license. +mozjs60: +mozjs60: Homepage: +mozjs60: https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey +mozjs60: +mozjs60: +mozjs60: +mozjs60: |