diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2023-02-01 05:29:53 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2023-02-01 07:39:17 +0100 |
commit | 45d1307faeb72d3fefce6446c314c4b0d0d3a98a (patch) | |
tree | 1b34931315f4be5579bd08f1ff4191ede08cec57 /source/l/mozjs78 | |
parent | 6fa6b077d5cf04e14b46bc2c0520bea74a08986b (diff) | |
download | current-45d1307faeb72d3fefce6446c314c4b0d0d3a98a.tar.gz current-45d1307faeb72d3fefce6446c314c4b0d0d3a98a.tar.xz |
Wed Feb 1 05:29:53 UTC 202320230201052953
d/perl-5.36.0-x86_64-3.txz: Rebuilt.
Upgraded: IO-Socket-SSL-2.081, Moo-2.005005, Path-Tiny-0.144,
Sub-Quote-2.006008, Template-Toolkit-3.101, URI-5.17.
Added: JSON-4.10 (needed to build Samba with --bundled-libraries=heimdal).
kde/kstars-3.6.3-x86_64-1.txz: Upgraded.
l/gjs-1.74.1-x86_64-1.txz: Upgraded.
Compiled against mozjs102-102.7.0esr.
l/mozjs102-102.7.0esr-x86_64-1.txz: Added.
This is required by gjs-1.74.1 and polkit-122.
l/mozjs78-78.15.0esr-x86_64-1.txz: Removed.
l/polkit-122-x86_64-1.txz: Upgraded.
Compiled against mozjs102-102.7.0esr.
Diffstat (limited to 'source/l/mozjs78')
15 files changed, 0 insertions, 1327 deletions
diff --git a/source/l/mozjs78/autoconf/autoconf-2.13-consolidated_fixes-1.patch b/source/l/mozjs78/autoconf/autoconf-2.13-consolidated_fixes-1.patch deleted file mode 100644 index 5e7b23113..000000000 --- a/source/l/mozjs78/autoconf/autoconf-2.13-consolidated_fixes-1.patch +++ /dev/null @@ -1,504 +0,0 @@ -Submitted By: Ken Moffat <ken at linuxfromscratch dot org> -Date: 2016-06-11 -Initial Package Version: 2.13 -Upstream Status: Version is historic and unmaintained. -Origin: Found at fedora, plus fixes for LFS. -Description: All of the patches currently used by fedora, except for -the patch which ensures gawk is used in preference to mawk (we do not -install mawk). For LFS: we put mktemp in /usr/bin not /bin, remove -the install-info target because that will overwrite standards.info -with an old version (fedora always use a DESTDIR), and change the -man and info dirs to ${datadir}/ i.e. /usr/share (an empty /usr/info -will otherwise be created). - -diff -Naur a/acgeneral.m4 b/acgeneral.m4 ---- a/acgeneral.m4 1999-01-05 13:27:37.000000000 +0000 -+++ b/acgeneral.m4 2016-06-11 00:18:24.429043947 +0100 -@@ -1817,10 +1817,6 @@ - [cat > conftest.$ac_ext <<EOF - [#]line __oline__ "configure" - #include "confdefs.h" --ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus --extern "C" void exit(int); --#endif --])dnl - [$1] - EOF - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -@@ -1988,12 +1984,12 @@ - AC_MSG_CHECKING(size of $1) - AC_CACHE_VAL(AC_CV_NAME, - [AC_TRY_RUN([#include <stdio.h> --main() -+int main() - { - FILE *f=fopen("conftestval", "w"); -- if (!f) exit(1); -+ if (!f) return(1); - fprintf(f, "%d\n", sizeof($1)); -- exit(0); -+ return(0); - }], AC_CV_NAME=`cat conftestval`, AC_CV_NAME=0, ifelse([$2], , , AC_CV_NAME=$2))])dnl - AC_MSG_RESULT($AC_CV_NAME) - AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME) -@@ -2160,20 +2156,38 @@ - dnl AC_OUTPUT_MAKE_DEFS() - define(AC_OUTPUT_MAKE_DEFS, - [# Transform confdefs.h into DEFS. --dnl Using a here document instead of a string reduces the quoting nightmare. - # Protect against shell expansion while executing Makefile rules. - # Protect against Makefile macro expansion. --cat > conftest.defs <<\EOF -+# -+# If the first sed substitution is executed (which looks for macros that -+# take arguments), then we branch to the quote section. Otherwise, -+# look for a macro that doesn't take arguments. -+cat >confdef2opt.sed <<\_ACEOF - changequote(<<, >>)dnl --s%<<#define>> \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g --s%[ `~<<#>>$^&*(){}\\|;'"<>?]%\\&%g --s%\[%\\&%g --s%\]%\\&%g --s%\$%$$%g -+t clear -+: clear -+s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g -+t quote -+s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g -+t quote -+d -+: quote -+s,[ `~#$^&*(){}\\|;'"<>?],\\&,g -+s,\[,\\&,g -+s,\],\\&,g -+s,\$,$$,g -+p - changequote([, ])dnl --EOF --DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` --rm -f conftest.defs -+_ACEOF -+# We use echo to avoid assuming a particular line-breaking character. -+# The extra dot is to prevent the shell from consuming trailing -+# line-breaks from the sub-command output. A line-break within -+# single-quotes doesn't work because, if this script is created in a -+# platform that uses two characters for line-breaks (e.g., DOS), tr -+# would break. -+ac_LF_and_DOT=`echo; echo .` -+DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` -+rm -f confdef2opt.sed - ]) - - dnl Do the variable substitutions to create the Makefiles or whatever. -diff -Naur a/acspecific.m4 b/acspecific.m4 ---- a/acspecific.m4 1999-01-05 13:27:52.000000000 +0000 -+++ b/acspecific.m4 2016-06-11 00:18:17.533078644 +0100 -@@ -152,8 +152,41 @@ - CXXFLAGS= - fi - fi -+ -+AC_PROG_CXX_EXIT_DECLARATION - ]) - -+ -+# AC_PROG_CXX_EXIT_DECLARATION -+# ----------------------------- -+# Find a valid prototype for exit and declare it in confdefs.h. -+AC_DEFUN(AC_PROG_CXX_EXIT_DECLARATION, -+[for ac_declaration in \ -+ ''\ -+ '#include <stdlib.h>' \ -+ 'extern "C" void std::exit (int) throw (); using std::exit;' \ -+ 'extern "C" void std::exit (int); using std::exit;' \ -+ 'extern "C" void exit (int) throw ();' \ -+ 'extern "C" void exit (int);' \ -+ 'void exit (int);' -+do -+ AC_TRY_COMPILE([#include <stdlib.h> -+$ac_declaration], -+ [exit (42);], -+ [], -+ [continue]) -+ AC_TRY_COMPILE([$ac_declaration], -+ [exit (42);], -+ [break]) -+done -+if test -n "$ac_declaration"; then -+ echo '#ifdef __cplusplus' >>confdefs.h -+ echo $ac_declaration >>confdefs.h -+ echo '#endif' >>confdefs.h -+fi -+])# AC_PROG_CXX_EXIT_DECLARATION -+ -+ - dnl Determine a Fortran 77 compiler to use. If `F77' is not already set - dnl in the environment, check for `g77', `f77' and `f2c', in that order. - dnl Set the output variable `F77' to the name of the compiler found. -@@ -1010,7 +1043,7 @@ - ]) - - AC_DEFUN(AC_FUNC_MMAP, --[AC_CHECK_HEADERS(unistd.h) -+[AC_CHECK_HEADERS(stdlib.h unistd.h sys/stat.h sys/types.h) - AC_CHECK_FUNCS(getpagesize) - AC_CACHE_CHECK(for working mmap, ac_cv_func_mmap_fixed_mapped, - [AC_TRY_RUN([ -@@ -1039,11 +1072,24 @@ - #include <fcntl.h> - #include <sys/mman.h> - -+#if HAVE_SYS_TYPES_H -+# include <sys/types.h> -+#endif -+ -+#if HAVE_STDLIB_H -+# include <stdlib.h> -+#endif -+ -+#if HAVE_SYS_STAT_H -+# include <sys/stat.h> -+#endif -+ -+#if HAVE_UNISTD_H -+# include <unistd.h> -+#endif -+ - /* This mess was copied from the GNU getpagesize.h. */ - #ifndef HAVE_GETPAGESIZE --# ifdef HAVE_UNISTD_H --# include <unistd.h> --# endif - - /* Assume that all systems that can run configure have sys/param.h. */ - # ifndef HAVE_SYS_PARAM_H -@@ -1373,6 +1419,8 @@ - r.ru_majflt = r.ru_minflt = 0; - switch (fork()) { - case 0: /* Child. */ -+ /* Unless we actually _do_ something, the kernel sometimes doesn't chalk up any system time to this process. */ -+ if(fork()) { i = 123; wait(NULL); } else { i = 234; exit(0); } - sleep(1); /* Give up the CPU. */ - _exit(0); - case -1: _exit(0); /* What can we do? */ -diff -Naur a/autoconf.sh b/autoconf.sh ---- a/autoconf.sh 1999-01-05 13:27:53.000000000 +0000 -+++ b/autoconf.sh 2016-06-11 00:22:17.351872133 +0100 -@@ -45,20 +45,20 @@ - esac - - : ${TMPDIR=/tmp} --tmpout=${TMPDIR}/acout.$$ -+tmpout=`/usr/bin/mktemp ${TMPDIR}/acout.XXXXXX` - localdir= - show_version=no - - while test $# -gt 0 ; do - case "${1}" in - -h | --help | --h* ) -- echo "${usage}" 1>&2; exit 0 ;; -+ echo "${usage}" 1>&2; rm -f $tmpout ; exit 0 ;; - --localdir=* | --l*=* ) - localdir="`echo \"${1}\" | sed -e 's/^[^=]*=//'`" - shift ;; - -l | --localdir | --l*) - shift -- test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; } -+ test $# -eq 0 && { echo "${usage}" 1>&2; rm -f $tmpout; exit 1; } - localdir="${1}" - shift ;; - --macrodir=* | --m*=* ) -@@ -66,7 +66,7 @@ - shift ;; - -m | --macrodir | --m* ) - shift -- test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; } -+ test $# -eq 0 && { echo "${usage}" 1>&2; rm -f $tmpout; exit 1; } - AC_MACRODIR="${1}" - shift ;; - --version | --v* ) -@@ -76,7 +76,7 @@ - - ) # Use stdin as input. - break ;; - -* ) -- echo "${usage}" 1>&2; exit 1 ;; -+ echo "${usage}" 1>&2; rm -f $tmpout; exit 1 ;; - * ) - break ;; - esac -@@ -86,23 +86,25 @@ - version=`sed -n 's/define.AC_ACVERSION.[ ]*\([0-9.]*\).*/\1/p' \ - $AC_MACRODIR/acgeneral.m4` - echo "Autoconf version $version" -+ rm -f $tmpout - exit 0 - fi - - case $# in - 0) infile=configure.in ;; - 1) infile="$1" ;; -- *) echo "$usage" >&2; exit 1 ;; -+ *) echo "$usage" >&2; rm -f $tmpout; exit 1 ;; - esac - - trap 'rm -f $tmpin $tmpout; exit 1' 1 2 15 - --tmpin=${TMPDIR}/acin.$$ # Always set this, to avoid bogus errors from some rm's. -+tmpin=`/usr/bin/mktemp ${TMPDIR}/acin.XXXXXX` -+# Always set this, to avoid bogus errors from some rm's. - if test z$infile = z-; then - infile=$tmpin -- cat > $infile - elif test ! -r "$infile"; then - echo "autoconf: ${infile}: No such file or directory" >&2 -+ rm -f $tmpin $tmpout - exit 1 - fi - -@@ -111,6 +113,8 @@ - else - use_localdir= - fi -+# Make sure we don't leave those around - they are annoying -+trap 'rm -f $tmpin $tmpout' 0 - - # Use the frozen version of Autoconf if available. - r= f= -@@ -118,7 +122,7 @@ - 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 ;; -+*) echo Autoconf requires GNU m4 1.1 or later >&2; rm -f $tmpin $tmpout; exit 1 ;; - esac - - $M4 -I$AC_MACRODIR $use_localdir $r autoconf.m4$f $infile > $tmpout || -@@ -154,6 +158,6 @@ - /__oline__/s/^\([0-9][0-9]*\):\(.*\)__oline__/\2\1/ - ' >&4 - --rm -f $tmpout -+rm -f $tmpout $tmpin - - exit $status -diff -Naur a/autoconf.texi b/autoconf.texi ---- a/autoconf.texi 1999-01-05 13:28:37.000000000 +0000 -+++ b/autoconf.texi 2016-06-11 00:18:46.360933604 +0100 -@@ -1,7 +1,7 @@ - \input texinfo @c -*-texinfo-*- - @c %**start of header --@setfilename autoconf.info --@settitle Autoconf -+@setfilename autoconf.info -+@settitle Autoconf - @c For double-sided printing, uncomment: - @c @setchapternewpage odd - @c %**end of header -@@ -17,7 +17,8 @@ - @ifinfo - @format - START-INFO-DIR-ENTRY --* Autoconf: (autoconf). Create source code configuration scripts. -+* Autoconf: (autoconf). Create source code configuration scripts. -+ This is a legacy version of autoconf. - END-INFO-DIR-ENTRY - @end format - -diff -Naur a/autoheader.sh b/autoheader.sh ---- a/autoheader.sh 1999-01-05 13:28:39.000000000 +0000 -+++ b/autoheader.sh 2016-06-11 00:22:17.351872133 +0100 -@@ -194,9 +194,9 @@ - # Some fgrep's have limits on the number of lines that can be in the - # pattern on the command line, so use a temporary file containing the - # pattern. -- (fgrep_tmp=${TMPDIR-/tmp}/autoh$$ -+ (fgrep_tmp=`/usr/bin/mktemp ${TMPDIR-/tmp}/autoh$$.XXXXXX` - trap "rm -f $fgrep_tmp; exit 1" 1 2 15 -- cat > $fgrep_tmp <<EOF -+ cat >> $fgrep_tmp <<EOF - $syms - EOF - fgrep -f $fgrep_tmp -diff -Naur a/autoupdate.sh b/autoupdate.sh ---- a/autoupdate.sh 1999-01-05 13:28:42.000000000 +0000 -+++ b/autoupdate.sh 2016-06-11 00:23:19.151561252 +0100 -@@ -26,7 +26,7 @@ - Usage: autoupdate [-h] [--help] [-m dir] [--macrodir=dir] - [--version] [template-file]" - --sedtmp=/tmp/acups.$$ -+sedtmp=`/usr/bin/mktemp /tmp/acups.XXXXXX` - # For debugging. - #sedtmp=/tmp/acups - show_version=no -@@ -35,13 +35,13 @@ - while test $# -gt 0 ; do - case "${1}" in - -h | --help | --h* ) -- echo "${usage}" 1>&2; exit 0 ;; -+ echo "${usage}" 1>&2; rm -f $sedtmp; exit 0 ;; - --macrodir=* | --m*=* ) - AC_MACRODIR="`echo \"${1}\" | sed -e 's/^[^=]*=//'`" - shift ;; - -m | --macrodir | --m* ) - shift -- test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; } -+ test $# -eq 0 && { echo "${usage}" 1>&2; rm -f $sedtmp; exit 1; } - AC_MACRODIR="${1}" - shift ;; - --version | --versio | --versi | --vers) -@@ -51,7 +51,7 @@ - - ) # Use stdin as input. - break ;; - -* ) -- echo "${usage}" 1>&2; exit 1 ;; -+ echo "${usage}" 1>&2; rm -f $sedtmp; exit 1 ;; - * ) - break ;; - esac -@@ -61,6 +61,7 @@ - version=`sed -n 's/define.AC_ACVERSION.[ ]*\([0-9.]*\).*/\1/p' \ - $AC_MACRODIR/acgeneral.m4` - echo "Autoconf version $version" -+ rm -f $sedtmp - exit 0 - fi - -@@ -68,6 +69,7 @@ - - tmpout=acupo.$$ - trap 'rm -f $sedtmp $tmpout; exit 1' 1 2 15 -+trap 'rm -f $sedtmp' 0 - case $# in - 0) infile=configure.in; out="> $tmpout" - # Make sure $infile can be read, and $tmpout has the same permissions. -diff -Naur a/configure b/configure ---- a/configure 1999-01-05 13:28:57.000000000 +0000 -+++ b/configure 2016-06-11 00:50:57.771231914 +0100 -@@ -43,8 +43,8 @@ - libdir='${exec_prefix}/lib' - includedir='${prefix}/include' - oldincludedir='/usr/include' --infodir='${prefix}/info' --mandir='${prefix}/man' -+infodir='${datadir}/info' -+mandir='${datadir}/man' - - # Initialize some other variables. - subdirs= -diff -Naur a/Makefile.in b/Makefile.in ---- a/Makefile.in 1999-01-05 13:27:16.000000000 +0000 -+++ b/Makefile.in 2016-06-11 00:29:34.005678107 +0100 -@@ -49,7 +49,7 @@ - - # Directory in which to install library files. - datadir = @datadir@ --acdatadir = $(datadir)/autoconf -+acdatadir = $(datadir)/autoconf-2.13 - - # Directory in which to install documentation info files. - infodir = @infodir@ -@@ -68,8 +68,8 @@ - DISTFILES = AUTHORS COPYING ChangeLog ChangeLog.1 INSTALL \ - Makefile.in NEWS README TODO $(M4FILES) \ - acconfig.h acfunctions acheaders acidentifiers \ -- acmakevars acprograms autoconf.info* \ -- autoconf.sh autoconf.texi install.texi \ -+ acmakevars acprograms autoconf.info* \ -+ autoconf.sh autoconf.texi install.texi \ - autoheader.sh autoscan.pl autoreconf.sh autoupdate.sh ifnames.sh \ - config.guess config.sub configure configure.in \ - install-sh mkinstalldirs texinfo.tex \ -@@ -106,11 +106,11 @@ - autoconf.m4f: autoconf.m4 acgeneral.m4 acspecific.m4 acoldnames.m4 - autoheader.m4f: autoheader.m4 acgeneral.m4 acspecific.m4 acoldnames.m4 - --info: autoconf.info @standards_info@ INSTALL -+info: autoconf.info @standards_info@ INSTALL - - # Use --no-split to avoid creating filenames > 14 chars. --autoconf.info: autoconf.texi install.texi -- $(MAKEINFO) -I$(srcdir) $(srcdir)/autoconf.texi --no-split --output=$@ -+autoconf.info: autoconf.texi install.texi -+ $(MAKEINFO) -I$(srcdir) $(srcdir)/autoconf.texi --no-split --output=$@ - - INSTALL: install.texi - $(MAKEINFO) -I$(srcdir) $(srcdir)/install.texi --output=$@ \ -@@ -121,8 +121,8 @@ - - dvi: autoconf.dvi @standards_dvi@ - --autoconf.dvi: autoconf.texi -- $(TEXI2DVI) $(srcdir)/autoconf.texi -+autoconf.dvi: autoconf.texi -+ $(TEXI2DVI) $(srcdir)/autoconf.texi - - standards.dvi: standards.texi make-stds.texi - $(TEXI2DVI) $(srcdir)/standards.texi -@@ -137,35 +137,35 @@ - cd testsuite && ${MAKE} AUTOCONF=${bindir}/autoconf $@ - - installdirs: -- $(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(infodir) $(acdatadir) -+ $(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)/$(bindir) $(DESTDIR)/$(infodir) $(DESTDIR)/$(acdatadir) - --install: all $(M4FILES) acconfig.h installdirs install-info -+install: all $(M4FILES) acconfig.h installdirs - for p in $(ASCRIPTS); do \ -- $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \ -+ $(INSTALL_PROGRAM) $$p $(DESTDIR)/$(bindir)/`echo $$p|sed '$(transform)'`; \ - done - for i in $(M4FROZEN); do \ -- $(INSTALL_DATA) $$i $(acdatadir)/$$i; \ -+ $(INSTALL_DATA) $$i $(DESTDIR)/$(acdatadir)/$$i; \ - done - for i in $(M4FILES) acconfig.h; do \ -- $(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \ -+ $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)/$(acdatadir)/$$i; \ - done - -if test -f autoscan; then \ -- $(INSTALL_PROGRAM) autoscan $(bindir)/`echo autoscan|sed '$(transform)'`; \ -+ $(INSTALL_PROGRAM) autoscan $(DESTDIR)/$(bindir)/`echo autoscan|sed '$(transform)'`; \ - for i in acfunctions acheaders acidentifiers acprograms \ - acmakevars; do \ -- $(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \ -+ $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)/$(acdatadir)/$$i; \ - done; \ - else :; fi - - # Don't cd, to avoid breaking install-sh references. - install-info: info installdirs -- if test -f autoconf.info; then \ -+ if test -f autoconf.info; then \ - for i in *.info*; do \ -- $(INSTALL_DATA) $$i $(infodir)/$$i; \ -+ $(INSTALL_DATA) $$i $(DESTDIR)/$(infodir)/$$i; \ - done; \ - else \ - for i in $(srcdir)/*.info*; do \ -- $(INSTALL_DATA) $$i $(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \ -+ $(INSTALL_DATA) $$i $(DESTDIR)/$(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \ - done; \ - fi - -@@ -174,7 +174,7 @@ - rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \ - done - rm -fr $(acdatadir) -- cd $(infodir) && rm -f autoconf.info* -+ cd $(infodir) && rm -f autoconf.info* - if test -f standards.info || test -f $(srcdir)/standards.info; \ - then cd $(infodir) && rm -f standards.info*; fi - -diff -Naur a/testsuite/autoconf.s/syntax.exp b/testsuite/autoconf.s/syntax.exp ---- a/testsuite/autoconf.s/syntax.exp 1999-01-05 13:29:54.000000000 +0000 -+++ b/testsuite/autoconf.s/syntax.exp 2016-06-11 00:18:51.996905247 +0100 -@@ -2,7 +2,7 @@ - - send_user "Checking for syntax errors in the specific tests...\n" - set script {s/^AC_DEFUN(\([^,]*\).*/\1/p} --set macros [exec sed -n $script $srcdir/../acspecific.m4] -+set macros [exec sed -n $script $srcdir/../acspecific.m4 | grep -v -e AC_FUNC_GETLOADAVG -e F77] - - foreach mac $macros { - send_user "$mac\n" diff --git a/source/l/mozjs78/autoconf/autoconf.build b/source/l/mozjs78/autoconf/autoconf.build deleted file mode 100755 index 05e53f1a5..000000000 --- a/source/l/mozjs78/autoconf/autoconf.build +++ /dev/null @@ -1,81 +0,0 @@ -#!/bin/sh - -# Copyright 2005-2016 Patrick J. Volkerding, Sebeka, Minnesota, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -PKGNAM=autoconf -VERSION=2.13 -BUILD=${BUILD:-1} - -NUMJOBS=${NUMJOBS:-" -j7 "} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-autoconf - -rm -rf $PKG -mkdir -p $TMP $PKG - -cd $TMP -rm -rf autoconf-$VERSION -tar xvf $CWD/autoconf-$VERSION.tar.xz || exit 1 -cd autoconf-$VERSION - -zcat $CWD/autoconf-2.13-consolidated_fixes-1.patch.gz | patch -p1 --verbose || exit 1 - -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# Build a temporary copy of autoconf-2.13 only to be used to compile -# js52, since it somewhat inexplicably requires this ancient version: - -rm -rf $TMP/autoconf-tmp -mkdir -p $TMP/autoconf-tmp -# This will be at the beginning of the $PATH, so protect against nonsense -# happening in /tmp: -chmod 700 $TMP/autoconf-tmp -rm -rf $TMP/autoconf-tmp/* -mkdir -p $TMP/autoconf-tmp/usr - -./configure \ - --prefix=$TMP/autoconf-tmp/usr \ - --program-suffix=-2.13 \ - --infodir=$TMP/autoconf-tmp/usr/info \ - --mandir=$TMP/autoconf-tmp/usr/man \ - --build=$ARCH-slackware-linux || exit 1 - -make $NUMJOBS || make || exit 1 -make install || exit 1 - diff --git a/source/l/mozjs78/mozjs78.SlackBuild b/source/l/mozjs78/mozjs78.SlackBuild deleted file mode 100755 index 9c0bdc5df..000000000 --- a/source/l/mozjs78/mozjs78.SlackBuild +++ /dev/null @@ -1,170 +0,0 @@ -#!/bin/bash - -# Slackware build script for SpiderMonkey - -# Copyright 2011, 2018 Robby Workman, Tuscaloosa, Alabama, USA -# Copyright 2019, 2020 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PKGNAM=mozjs78 -SRCNAME=firefox -VERSION=$(basename $(ls $SRCNAME-*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev) .source) -BUILD=${BUILD:-1} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" - exit 0 -fi - -NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} - -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -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 -cd firefox-unpack -tar xvf $CWD/$SRCNAME-$VERSION.source.tar.?z || exit 1 -mv * .. -cd .. -rm -rf firefox-unpack -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 \) \ - -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \+ - -# We need to use the incredibly ancient autoconf-2.13 for this :/ -( cd $CWD/autoconf ; ./autoconf.build ) -PATH=$TMP/autoconf-tmp/usr/bin:$PATH - -# 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/icu_sources_data.py-Decouple-from-Mozilla-build-system.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/icu_sources_data-Write-command-output-to-our-stderr.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/emitter.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/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/encies.armv7_disable_WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS.patch.gz | patch -p1 --verbose || exit 1 - -# Patch to allow building with Python 3.10: -zcat $CWD/patches/Fixup-compatibility-of-mozbuild-with-Python-3.10.patch.gz | patch -p1 --verbose || exit 1 - -# Remove bundled zlib directory and use system version: -rm -rf modules/zlib - -cd js/src - -# We need to do this because patches above touch configure.in: -autoconf-2.13 - -CFLAGS+="$SLKCFLAGS -fno-delete-null-pointer-checks -fno-strict-aliasing -fno-tree-vrp " \ -CXXFLAGS+="$SLKCFLAGS -fno-delete-null-pointer-checks -fno-strict-aliasing -fno-tree-vrp " \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --without-system-icu \ - --with-system-zlib \ - --enable-tests \ - --disable-strip \ - --with-intl-api \ - --enable-readline \ - --enable-shared-js \ - --disable-optimize \ - --enable-pie \ - --disable-jemalloc \ - --build=$ARCH-slackware-linux \ - -make $NUMJOBS || make || exit 1 -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-78.so $PKG/usr/lib${LIBDIRSUFFIX}/libmozjs-78.so.0.0.0 -( cd $PKG/usr/lib${LIBDIRSUFFIX} - ln -sf libmozjs-78.so.0.0.0 libmozjs-78.so.0 - ln -sf libmozjs-78.so.0 libmozjs-78.so -) - -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp ../../README.txt README.html $PKG/usr/doc/$PKGNAM-$VERSION - -# If there's a ChangeLog, installing at least part of the recent history -# is useful, but don't let it get totally out of control: -if [ -r ChangeLog ]; then - DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) - cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog - touch -r ChangeLog $DOCSDIR/ChangeLog -fi - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/mozjs78/patches/Fixup-compatibility-of-mozbuild-with-Python-3.10.patch b/source/l/mozjs78/patches/Fixup-compatibility-of-mozbuild-with-Python-3.10.patch deleted file mode 100644 index 6a27d5bcf..000000000 --- a/source/l/mozjs78/patches/Fixup-compatibility-of-mozbuild-with-Python-3.10.patch +++ /dev/null @@ -1,297 +0,0 @@ -From a88d0c8e27b48344942187c2611bb121bde9332d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com> -Date: Tue, 13 Jul 2021 11:46:20 +0200 -Subject: [PATCH] Fixup compatibility of mozbuild with Python 3.10 - ---- - python/mach/mach/config.py | 4 ++-- - python/mach/mach/decorators.py | 2 +- - python/mozbuild/mozbuild/backend/configenvironment.py | 3 ++- - python/mozbuild/mozbuild/makeutil.py | 2 +- - python/mozbuild/mozbuild/util.py | 2 +- - testing/marionette/client/marionette_driver/wait.py | 2 +- - testing/mozbase/manifestparser/manifestparser/filters.py | 3 ++- - testing/mozbase/versioninfo.py | 2 +- - testing/web-platform/tests/tools/manifest/vcs.py | 2 +- - .../web-platform/tests/tools/third_party/h2/h2/settings.py | 2 +- - .../tests/tools/third_party/html5lib/html5lib/_trie/_base.py | 2 +- - .../tools/third_party/html5lib/html5lib/treebuilders/dom.py | 2 +- - .../tests/tools/third_party/hyper/hyper/common/headers.py | 2 +- - .../tests/tools/third_party/hyper/hyper/h2/settings.py | 2 +- - .../tests/tools/third_party/hyper/hyper/http11/connection.py | 4 ++-- - .../third_party/hyper/hyper/packages/hyperframe/flags.py | 2 +- - .../tests/tools/third_party/hyperframe/hyperframe/flags.py | 2 +- - testing/web-platform/tests/tools/wptserve/wptserve/config.py | 3 ++- - testing/web-platform/tests/webdriver/tests/support/sync.py | 2 +- - 19 files changed, 24 insertions(+), 21 deletions(-) - -diff --git a/python/mach/mach/config.py b/python/mach/mach/config.py -index 7210eca82..edb4d2e93 100644 ---- a/python/mach/mach/config.py -+++ b/python/mach/mach/config.py -@@ -144,7 +144,7 @@ def reraise_attribute_error(func): - return _ - - --class ConfigSettings(collections.Mapping): -+class ConfigSettings(collections.abc.Mapping): - """Interface for configuration settings. - - This is the main interface to the configuration. -@@ -190,7 +190,7 @@ class ConfigSettings(collections.Mapping): - will result in exceptions being raised. - """ - -- class ConfigSection(collections.MutableMapping, object): -+ class ConfigSection(collections.abc.MutableMapping, object): - """Represents an individual config section.""" - def __init__(self, config, name, settings): - object.__setattr__(self, '_config', config) -diff --git a/python/mach/mach/decorators.py b/python/mach/mach/decorators.py -index 27f7f34a6..5f63271a3 100644 ---- a/python/mach/mach/decorators.py -+++ b/python/mach/mach/decorators.py -@@ -140,7 +140,7 @@ def CommandProvider(cls): - 'Conditions argument must take a list ' + \ - 'of functions. Found %s instead.' - -- if not isinstance(command.conditions, collections.Iterable): -+ if not isinstance(command.conditions, collections.abc.Iterable): - msg = msg % (command.name, type(command.conditions)) - raise MachError(msg) - -diff --git a/python/mozbuild/mozbuild/backend/configenvironment.py b/python/mozbuild/mozbuild/backend/configenvironment.py -index 20d1a9fa6..8747958bd 100644 ---- a/python/mozbuild/mozbuild/backend/configenvironment.py -+++ b/python/mozbuild/mozbuild/backend/configenvironment.py -@@ -9,7 +9,8 @@ import six - import sys - import json - --from collections import Iterable, OrderedDict -+from collections import OrderedDict -+from collections.abc import Iterable - from types import ModuleType - - import mozpack.path as mozpath -diff --git a/python/mozbuild/mozbuild/makeutil.py b/python/mozbuild/mozbuild/makeutil.py -index 4da1a3b26..4ce56848c 100644 ---- a/python/mozbuild/mozbuild/makeutil.py -+++ b/python/mozbuild/mozbuild/makeutil.py -@@ -7,7 +7,7 @@ from __future__ import absolute_import, print_function, unicode_literals - import os - import re - import six --from collections import Iterable -+from collections.abc import Iterable - - - class Makefile(object): -diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py -index 044cf645c..98ed3ef52 100644 ---- a/python/mozbuild/mozbuild/util.py -+++ b/python/mozbuild/mozbuild/util.py -@@ -782,7 +782,7 @@ class HierarchicalStringList(object): - self._strings = StrictOrderingOnAppendList() - self._children = {} - -- class StringListAdaptor(collections.Sequence): -+ class StringListAdaptor(collections.abc.Sequence): - def __init__(self, hsl): - self._hsl = hsl - -diff --git a/testing/marionette/client/marionette_driver/wait.py b/testing/marionette/client/marionette_driver/wait.py -index eeaa1e23d..c147f463f 100644 ---- a/testing/marionette/client/marionette_driver/wait.py -+++ b/testing/marionette/client/marionette_driver/wait.py -@@ -82,7 +82,7 @@ class Wait(object): - - exceptions = [] - if ignored_exceptions is not None: -- if isinstance(ignored_exceptions, collections.Iterable): -+ if isinstance(ignored_exceptions, collections.abc.Iterable): - exceptions.extend(iter(ignored_exceptions)) - else: - exceptions.append(ignored_exceptions) -diff --git a/testing/mozbase/manifestparser/manifestparser/filters.py b/testing/mozbase/manifestparser/manifestparser/filters.py -index 287ee033b..b1d608003 100644 ---- a/testing/mozbase/manifestparser/manifestparser/filters.py -+++ b/testing/mozbase/manifestparser/manifestparser/filters.py -@@ -12,7 +12,8 @@ from __future__ import absolute_import - - import itertools - import os --from collections import defaultdict, MutableSequence -+from collections import defaultdict -+from collections.abc import MutableSequence - - import six - from six import string_types -diff --git a/testing/mozbase/versioninfo.py b/testing/mozbase/versioninfo.py -index 91d1a0473..8c1680069 100755 ---- a/testing/mozbase/versioninfo.py -+++ b/testing/mozbase/versioninfo.py -@@ -11,7 +11,7 @@ from commit messages. - - from __future__ import absolute_import, print_function - --from collections import Iterable -+from collections.abc import Iterable - from distutils.version import StrictVersion - import argparse - import os -diff --git a/testing/web-platform/tests/tools/manifest/vcs.py b/testing/web-platform/tests/tools/manifest/vcs.py -index 7c0feeb81..05ee19c7c 100644 ---- a/testing/web-platform/tests/tools/manifest/vcs.py -+++ b/testing/web-platform/tests/tools/manifest/vcs.py -@@ -3,7 +3,7 @@ import json - import os - import stat - from collections import deque --from collections import MutableMapping -+from collections.abc import MutableMapping - - from six import with_metaclass, PY2 - -diff --git a/testing/web-platform/tests/tools/third_party/h2/h2/settings.py b/testing/web-platform/tests/tools/third_party/h2/h2/settings.py -index 3da720329..e097630e9 100644 ---- a/testing/web-platform/tests/tools/third_party/h2/h2/settings.py -+++ b/testing/web-platform/tests/tools/third_party/h2/h2/settings.py -@@ -88,7 +88,7 @@ class ChangedSetting: - ) - - --class Settings(collections.MutableMapping): -+class Settings(collections.abc.MutableMapping): - """ - An object that encapsulates HTTP/2 settings state. - -diff --git a/testing/web-platform/tests/tools/third_party/html5lib/html5lib/_trie/_base.py b/testing/web-platform/tests/tools/third_party/html5lib/html5lib/_trie/_base.py -index a1158bbbf..a9295a2ba 100644 ---- a/testing/web-platform/tests/tools/third_party/html5lib/html5lib/_trie/_base.py -+++ b/testing/web-platform/tests/tools/third_party/html5lib/html5lib/_trie/_base.py -@@ -1,6 +1,6 @@ - from __future__ import absolute_import, division, unicode_literals - --from collections import Mapping -+from collections.abc import Mapping - - - class Trie(Mapping): -diff --git a/testing/web-platform/tests/tools/third_party/html5lib/html5lib/treebuilders/dom.py b/testing/web-platform/tests/tools/third_party/html5lib/html5lib/treebuilders/dom.py -index dcfac220b..818a33433 100644 ---- a/testing/web-platform/tests/tools/third_party/html5lib/html5lib/treebuilders/dom.py -+++ b/testing/web-platform/tests/tools/third_party/html5lib/html5lib/treebuilders/dom.py -@@ -1,7 +1,7 @@ - from __future__ import absolute_import, division, unicode_literals - - --from collections import MutableMapping -+from collections.abc import MutableMapping - from xml.dom import minidom, Node - import weakref - -diff --git a/testing/web-platform/tests/tools/third_party/hyper/hyper/common/headers.py b/testing/web-platform/tests/tools/third_party/hyper/hyper/common/headers.py -index 655a591ac..6454f550a 100644 ---- a/testing/web-platform/tests/tools/third_party/hyper/hyper/common/headers.py -+++ b/testing/web-platform/tests/tools/third_party/hyper/hyper/common/headers.py -@@ -10,7 +10,7 @@ import collections - from hyper.common.util import to_bytestring, to_bytestring_tuple - - --class HTTPHeaderMap(collections.MutableMapping): -+class HTTPHeaderMap(collections.abc.MutableMapping): - """ - A structure that contains HTTP headers. - -diff --git a/testing/web-platform/tests/tools/third_party/hyper/hyper/h2/settings.py b/testing/web-platform/tests/tools/third_party/hyper/hyper/h2/settings.py -index fedc5e3c4..040afea92 100755 ---- a/testing/web-platform/tests/tools/third_party/hyper/hyper/h2/settings.py -+++ b/testing/web-platform/tests/tools/third_party/hyper/hyper/h2/settings.py -@@ -151,7 +151,7 @@ class ChangedSetting: - ) - - --class Settings(collections.MutableMapping): -+class Settings(collections.abc.MutableMapping): - """ - An object that encapsulates HTTP/2 settings state. - -diff --git a/testing/web-platform/tests/tools/third_party/hyper/hyper/http11/connection.py b/testing/web-platform/tests/tools/third_party/hyper/hyper/http11/connection.py -index 61361c358..a214311d2 100644 ---- a/testing/web-platform/tests/tools/third_party/hyper/hyper/http11/connection.py -+++ b/testing/web-platform/tests/tools/third_party/hyper/hyper/http11/connection.py -@@ -10,7 +10,7 @@ import os - import socket - import base64 - --from collections import Iterable, Mapping -+from collections.abc import Iterable, Mapping - - import collections - from hyperframe.frame import SettingsFrame -@@ -295,7 +295,7 @@ class HTTP11Connection(object): - return - - # Iterables that set a specific content length. -- elif isinstance(body, collections.Iterable): -+ elif isinstance(body, collections.abc.Iterable): - for item in body: - try: - self._sock.send(item) -diff --git a/testing/web-platform/tests/tools/third_party/hyper/hyper/packages/hyperframe/flags.py b/testing/web-platform/tests/tools/third_party/hyper/hyper/packages/hyperframe/flags.py -index e8f630056..8f2ea689b 100644 ---- a/testing/web-platform/tests/tools/third_party/hyper/hyper/packages/hyperframe/flags.py -+++ b/testing/web-platform/tests/tools/third_party/hyper/hyper/packages/hyperframe/flags.py -@@ -11,7 +11,7 @@ import collections - Flag = collections.namedtuple("Flag", ["name", "bit"]) - - --class Flags(collections.MutableSet): -+class Flags(collections.abc.MutableSet): - """ - A simple MutableSet implementation that will only accept known flags as elements. - -diff --git a/testing/web-platform/tests/tools/third_party/hyperframe/hyperframe/flags.py b/testing/web-platform/tests/tools/third_party/hyperframe/hyperframe/flags.py -index 05b35017e..14c352e10 100644 ---- a/testing/web-platform/tests/tools/third_party/hyperframe/hyperframe/flags.py -+++ b/testing/web-platform/tests/tools/third_party/hyperframe/hyperframe/flags.py -@@ -11,7 +11,7 @@ import collections - Flag = collections.namedtuple("Flag", ["name", "bit"]) - - --class Flags(collections.MutableSet): -+class Flags(collections.abc.MutableSet): - """ - A simple MutableSet implementation that will only accept known flags as - elements. -diff --git a/testing/web-platform/tests/tools/wptserve/wptserve/config.py b/testing/web-platform/tests/tools/wptserve/wptserve/config.py -index 7766565fe..3c1c36d6f 100644 ---- a/testing/web-platform/tests/tools/wptserve/wptserve/config.py -+++ b/testing/web-platform/tests/tools/wptserve/wptserve/config.py -@@ -2,7 +2,8 @@ import copy - import logging - import os - --from collections import defaultdict, Mapping -+from collections import defaultdict -+from collections.abc import Mapping - from six import integer_types, iteritems, itervalues, string_types - - from . import sslutils -diff --git a/testing/web-platform/tests/webdriver/tests/support/sync.py b/testing/web-platform/tests/webdriver/tests/support/sync.py -index 3fc77131c..8e8f6b819 100644 ---- a/testing/web-platform/tests/webdriver/tests/support/sync.py -+++ b/testing/web-platform/tests/webdriver/tests/support/sync.py -@@ -81,7 +81,7 @@ class Poll(object): - - exceptions = [] - if ignored_exceptions is not None: -- if isinstance(ignored_exceptions, collections.Iterable): -+ if isinstance(ignored_exceptions, collections.abc.Iterable): - exceptions.extend(iter(ignored_exceptions)) - else: - exceptions.append(ignored_exceptions) --- -2.31.1 - diff --git a/source/l/mozjs78/patches/armv7_disable_WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS.patch b/source/l/mozjs78/patches/armv7_disable_WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS.patch deleted file mode 100644 index 0cb26ac76..000000000 --- a/source/l/mozjs78/patches/armv7_disable_WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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/mozjs78/patches/copy-headers.patch b/source/l/mozjs78/patches/copy-headers.patch deleted file mode 100644 index dfa1fdbee..000000000 --- a/source/l/mozjs78/patches/copy-headers.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 3b3c8e37cca418e07bdeceaf3a601805df28d925 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com> -Date: Wed, 15 Jul 2020 08:27:39 +0200 -Subject: [PATCH] build: Copy headers on install instead of symlinking - -Patch by Philip Chimento ported forward to mozjs78 ---- - python/mozbuild/mozbuild/backend/recursivemake.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py -index e3fc8fe..bed5ae9 100644 ---- a/python/mozbuild/mozbuild/backend/recursivemake.py -+++ b/python/mozbuild/mozbuild/backend/recursivemake.py -@@ -1457,9 +1457,9 @@ class RecursiveMakeBackend(MakeBackend): - raise Exception("Wildcards are only supported in the filename part" - " of srcdir-relative or absolute paths.") - -- install_manifest.add_pattern_link(basepath, wild, path) -+ install_manifest.add_pattern_copy(basepath, wild, path) - else: -- install_manifest.add_pattern_link(f.srcdir, f, path) -+ install_manifest.add_pattern_copy(f.srcdir, f, path) - elif isinstance(f, AbsolutePath): - if not f.full_path.lower().endswith(('.dll', '.pdb', '.so')): - raise Exception("Absolute paths installed to FINAL_TARGET_FILES must" -@@ -1468,7 +1468,7 @@ class RecursiveMakeBackend(MakeBackend): - install_manifest.add_optional_exists(dest) - absolute_files.append(f.full_path) - else: -- install_manifest.add_link(f.full_path, dest) -+ install_manifest.add_copy(f.full_path, dest) - else: - install_manifest.add_optional_exists(dest) - objdir_files.append(self._pretty_path(f, backend_file)) --- -2.26.2 - diff --git a/source/l/mozjs78/patches/emitter.patch b/source/l/mozjs78/patches/emitter.patch deleted file mode 100644 index 15e752ba7..000000000 --- a/source/l/mozjs78/patches/emitter.patch +++ /dev/null @@ -1,61 +0,0 @@ -From d1d785c169345b81c76213f6dd9be32b4db60294 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com> -Date: Wed, 15 Jul 2020 08:39:47 +0200 -Subject: [PATCH] Build: allow LOCAL_INCLUDES paths with topsrcdir or topobjdir - ---- - python/mozbuild/mozbuild/frontend/emitter.py | 6 ------ - .../mozbuild/test/frontend/test_emitter.py | 20 ------------------- - 2 files changed, 26 deletions(-) - -diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py -index 8d5ab8e..65c43ff 100644 ---- a/python/mozbuild/mozbuild/frontend/emitter.py -+++ b/python/mozbuild/mozbuild/frontend/emitter.py -@@ -1239,12 +1239,6 @@ class TreeMetadataEmitter(LoggingMixin): - 'is a filename, but a directory is required: %s ' - '(resolved to %s)' % (local_include, full_path), - context) -- if (full_path == context.config.topsrcdir or -- full_path == context.config.topobjdir): -- raise SandboxValidationError( -- 'Path specified in LOCAL_INCLUDES ' -- '(%s) resolves to the topsrcdir or topobjdir (%s), which is ' -- 'not allowed' % (local_include, full_path), context) - include_obj = LocalInclude(context, local_include) - local_includes.append(include_obj.path.full_path) - yield include_obj -diff --git a/python/mozbuild/mozbuild/test/frontend/test_emitter.py b/python/mozbuild/mozbuild/test/frontend/test_emitter.py -index e8cbd81..d45ccee 100644 ---- a/python/mozbuild/mozbuild/test/frontend/test_emitter.py -+++ b/python/mozbuild/mozbuild/test/frontend/test_emitter.py -@@ -1040,26 +1040,6 @@ class TestEmitterBasic(unittest.TestCase): - - self.assertEqual(local_includes, expected) - -- def test_local_includes_invalid(self): -- """Test that invalid LOCAL_INCLUDES are properly detected.""" -- reader = self.reader('local_includes-invalid/srcdir') -- -- with six.assertRaisesRegex( -- self, -- SandboxValidationError, -- 'Path specified in LOCAL_INCLUDES.*resolves to the ' -- 'topsrcdir or topobjdir'): -- self.read_topsrcdir(reader) -- -- reader = self.reader('local_includes-invalid/objdir') -- -- with six.assertRaisesRegex( -- self, -- SandboxValidationError, -- 'Path specified in LOCAL_INCLUDES.*resolves to the ' -- 'topsrcdir or topobjdir'): -- self.read_topsrcdir(reader) -- - def test_local_includes_file(self): - """Test that a filename can't be used in LOCAL_INCLUDES.""" - reader = self.reader('local_includes-filename') --- -2.26.2 - diff --git a/source/l/mozjs78/patches/fix-soname.patch b/source/l/mozjs78/patches/fix-soname.patch deleted file mode 100644 index 30894e44d..000000000 --- a/source/l/mozjs78/patches/fix-soname.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d21c7cb9343d8c495d987e71be0f35887574c820 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com> -Date: Wed, 15 Jul 2020 08:21:47 +0200 -Subject: [PATCH] Add soname switch to linker, regardless of Operating System - -Fix backported from Debian: http://bugs.debian.org/746705 ---- - config/rules.mk | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/config/rules.mk b/config/rules.mk -index 3965c88..3f92f83 100644 ---- a/config/rules.mk -+++ b/config/rules.mk -@@ -320,6 +320,8 @@ ifeq ($(OS_ARCH),GNU) - OS_CPPFLAGS += -DPATH_MAX=1024 -DMAXPATHLEN=1024 - endif - -+EXTRA_DSO_LDOPTS += -Wl,-soname,lib$(JS_LIBRARY_NAME).so.0 -+ - # - # MINGW32 - # --- -2.26.2 - diff --git a/source/l/mozjs78/patches/icu_sources_data-Write-command-output-to-our-stderr.patch b/source/l/mozjs78/patches/icu_sources_data-Write-command-output-to-our-stderr.patch deleted file mode 100644 index e2ed48454..000000000 --- a/source/l/mozjs78/patches/icu_sources_data-Write-command-output-to-our-stderr.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: Simon McVittie <smcv@debian.org> -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 | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - -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 -@@ -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) - 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) - return False - else: -- os.unlink(f.name) - return True diff --git a/source/l/mozjs78/patches/icu_sources_data.py-Decouple-from-Mozilla-build-system.patch b/source/l/mozjs78/patches/icu_sources_data.py-Decouple-from-Mozilla-build-system.patch deleted file mode 100644 index a853a16d1..000000000 --- a/source/l/mozjs78/patches/icu_sources_data.py-Decouple-from-Mozilla-build-system.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Simon McVittie <smcv@debian.org> -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 98c0ccb..8cf9290 100644 ---- a/intl/icu_sources_data.py -+++ b/intl/icu_sources_data.py -@@ -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 - - # 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/mozjs78/patches/init_patch.patch b/source/l/mozjs78/patches/init_patch.patch deleted file mode 100644 index fd09eb797..000000000 --- a/source/l/mozjs78/patches/init_patch.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- 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/mozjs78/patches/spidermonkey_checks_disable.patch b/source/l/mozjs78/patches/spidermonkey_checks_disable.patch deleted file mode 100644 index 14ba0ad71..000000000 --- a/source/l/mozjs78/patches/spidermonkey_checks_disable.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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/mozjs78/patches/spidermonkey_style_check_disable_s390x.patch b/source/l/mozjs78/patches/spidermonkey_style_check_disable_s390x.patch deleted file mode 100644 index 690c1c57d..000000000 --- a/source/l/mozjs78/patches/spidermonkey_style_check_disable_s390x.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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/mozjs78/patches/tests-increase-timeout.patch b/source/l/mozjs78/patches/tests-increase-timeout.patch deleted file mode 100644 index c86cca403..000000000 --- a/source/l/mozjs78/patches/tests-increase-timeout.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 9be85b155c6df0454c5faef9e850f572c99e3615 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com> -Date: Wed, 15 Jul 2020 08:32:44 +0200 -Subject: [PATCH] Increase the test timeout for slower buildds - -Ported forward from Debian: https://bugs.debian.org/878284 ---- - js/src/Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/js/src/Makefile.in b/js/src/Makefile.in -index b86aeed..d68655a 100644 ---- a/js/src/Makefile.in -+++ b/js/src/Makefile.in -@@ -53,7 +53,7 @@ check:: check-js-msg - - check-jstests: - $(wildcard $(RUN_TEST_PROGRAM)) $(PYTHON3) -u $(srcdir)/tests/jstests.py \ -- --no-progress --format=automation --timeout 300 \ -+ --no-progress --format=automation --timeout 600 \ - $(JSTESTS_EXTRA_ARGS) \ - $(DIST)/bin/$(JS_SHELL_NAME)$(BIN_SUFFIX) - --- -2.26.2 - diff --git a/source/l/mozjs78/slack-desc b/source/l/mozjs78/slack-desc deleted file mode 100644 index 94125293d..000000000 --- a/source/l/mozjs78/slack-desc +++ /dev/null @@ -1,20 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -mozjs78: mozjs78 (Mozilla's JavaScript Engine) -mozjs78: -mozjs78: SpiderMonkey is Mozilla's JavaScript engine written in C/C++. It is -mozjs78: used in various Mozilla products (including Firefox) and is available -mozjs78: under MPL/GPL/LGPL tri-license. -mozjs78: -mozjs78: Homepage: -mozjs78: https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey -mozjs78: -mozjs78: -mozjs78: -mozjs78: |