From 5a1d18a67bc9a03c503b2f91afefe1643377b723 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Tue, 17 Oct 2017 20:25:44 +0200 Subject: [PATCH] mozjs38: remove package, not used anymore no package links against mozjs38 and with mozjs52 there's an up to date replacement. --- srcpkgs/mozjs38-devel | 1 - srcpkgs/mozjs38/patches/copy-headers.patch | 20 --- srcpkgs/mozjs38/patches/fix-icu-check.patch | 16 --- srcpkgs/mozjs38/patches/gcc-alignment.patch | 122 ------------------ srcpkgs/mozjs38/patches/js-version.patch | 65 ---------- .../mozjs38/patches/pkg-config-version.patch | 22 ---- srcpkgs/mozjs38/template | 48 ------- srcpkgs/mozjs38/update | 1 - 8 files changed, 295 deletions(-) delete mode 120000 srcpkgs/mozjs38-devel delete mode 100644 srcpkgs/mozjs38/patches/copy-headers.patch delete mode 100644 srcpkgs/mozjs38/patches/fix-icu-check.patch delete mode 100644 srcpkgs/mozjs38/patches/gcc-alignment.patch delete mode 100644 srcpkgs/mozjs38/patches/js-version.patch delete mode 100644 srcpkgs/mozjs38/patches/pkg-config-version.patch delete mode 100644 srcpkgs/mozjs38/template delete mode 100644 srcpkgs/mozjs38/update diff --git a/srcpkgs/mozjs38-devel b/srcpkgs/mozjs38-devel deleted file mode 120000 index 31c380552da..00000000000 --- a/srcpkgs/mozjs38-devel +++ /dev/null @@ -1 +0,0 @@ -mozjs38 \ No newline at end of file diff --git a/srcpkgs/mozjs38/patches/copy-headers.patch b/srcpkgs/mozjs38/patches/copy-headers.patch deleted file mode 100644 index 7f352a795c8..00000000000 --- a/srcpkgs/mozjs38/patches/copy-headers.patch +++ /dev/null @@ -1,20 +0,0 @@ -Description: Copy headers on install instead of symlinking -Author: Rico Tzschichholz -Forwarded: no -Last-Update: 2014-10-29 - ---- - -Index: b/python/mozbuild/mozbuild/backend/recursivemake.py -=================================================================== ---- a/python/mozbuild/mozbuild/backend/recursivemake.py -+++ b/python/mozbuild/mozbuild/backend/recursivemake.py -@@ -796,7 +796,7 @@ - return - - for source, dest, _ in self._walk_hierarchy(obj, exports): -- self._install_manifests['dist_include'].add_symlink(source, dest) -+ self._install_manifests['dist_include'].add_copy(source, dest) - - if not os.path.exists(source): - raise Exception('File listed in EXPORTS does not exist: %s' % source) diff --git a/srcpkgs/mozjs38/patches/fix-icu-check.patch b/srcpkgs/mozjs38/patches/fix-icu-check.patch deleted file mode 100644 index 873697d18f2..00000000000 --- a/srcpkgs/mozjs38/patches/fix-icu-check.patch +++ /dev/null @@ -1,16 +0,0 @@ -Add bracket for sed 4.3 compliance - -Based on upstream fix by Daniel Stenberg in 09 jan 2017 -See: https://hg.mozilla.org/mozilla-central/rev/ebcbf47a83e7 - ---- a/js/src/configure 2017-02-21 16:56:42.350105741 -0300 -+++ b/js/src/configure 2017-02-21 17:33:13.183493978 -0300 -@@ -15231,7 +15231,7 @@ - fi - fi - -- version=`sed -n 's/^[:space:]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"` -+ version=`sed -n 's/^[[:space:]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"` - if test x"$version" = x; then - { echo "configure: error: cannot determine icu version number from uvernum.h header file $lineno" 1>&2; echo "configure: error: cannot determine icu version number from uvernum.h header file $lineno" 1>&5; exit 1; } - fi diff --git a/srcpkgs/mozjs38/patches/gcc-alignment.patch b/srcpkgs/mozjs38/patches/gcc-alignment.patch deleted file mode 100644 index a3a57d54479..00000000000 --- a/srcpkgs/mozjs38/patches/gcc-alignment.patch +++ /dev/null @@ -1,122 +0,0 @@ ---- a/js/src/jit/RegisterSets.h 2017-02-10 17:33:06.210702431 -0800 -+++ b/js/src/jit/RegisterSets.h 2017-02-10 17:43:52.877514146 -0800 -@@ -7,7 +7,6 @@ - #ifndef jit_RegisterSets_h - #define jit_RegisterSets_h - --#include "mozilla/Alignment.h" - #include "mozilla/MathAlgorithms.h" - - #include "jit/JitAllocPolicy.h" -@@ -26,8 +25,8 @@ - Code code_; - - public: -- AnyRegister() -- { } -+ AnyRegister() = default; -+ - explicit AnyRegister(Register gpr) { - code_ = gpr.code(); - } -@@ -156,7 +155,7 @@ - } - #endif - -- ValueOperand() {} -+ ValueOperand() = default; - }; - - // Registers to hold either either a typed or untyped value. -@@ -165,46 +164,25 @@ - // Type of value being stored. - MIRType type_; - -- // Space to hold either an AnyRegister or a ValueOperand. - union U { -- mozilla::AlignedStorage2 typed; -- mozilla::AlignedStorage2 value; -+ AnyRegister typed; -+ ValueOperand value; - } data; - -- AnyRegister& dataTyped() { -- MOZ_ASSERT(hasTyped()); -- return *data.typed.addr(); -- } -- ValueOperand& dataValue() { -- MOZ_ASSERT(hasValue()); -- return *data.value.addr(); -- } -- -- AnyRegister dataTyped() const { -- MOZ_ASSERT(hasTyped()); -- return *data.typed.addr(); -- } -- const ValueOperand& dataValue() const { -- MOZ_ASSERT(hasValue()); -- return *data.value.addr(); -- } -- - public: - -- TypedOrValueRegister() -- : type_(MIRType_None) -- {} -+ TypedOrValueRegister() = default; - - TypedOrValueRegister(MIRType type, AnyRegister reg) - : type_(type) - { -- dataTyped() = reg; -+ data.typed = reg; - } - - MOZ_IMPLICIT TypedOrValueRegister(ValueOperand value) - : type_(MIRType_Value) - { -- dataValue() = value; -+ data.value = value; - } - - MIRType type() const { -@@ -220,11 +198,13 @@ - } - - AnyRegister typedReg() const { -- return dataTyped(); -+ MOZ_ASSERT(hasTyped()); -+ return data.typed; - } - - ValueOperand valueReg() const { -- return dataValue(); -+ MOZ_ASSERT(hasValue()); -+ return data.value; - } - - AnyRegister scratchReg() { -@@ -240,19 +220,18 @@ - // Whether a constant value is being stored. - bool constant_; - -- // Space to hold either a Value or a TypedOrValueRegister. - union U { -- mozilla::AlignedStorage2 constant; -- mozilla::AlignedStorage2 reg; -+ Value constant; -+ TypedOrValueRegister reg; - } data; - - Value& dataValue() { - MOZ_ASSERT(constant()); -- return *data.constant.addr(); -+ return data.constant; - } - TypedOrValueRegister& dataReg() { - MOZ_ASSERT(!constant()); -- return *data.reg.addr(); -+ return data.reg; - } - - public: diff --git a/srcpkgs/mozjs38/patches/js-version.patch b/srcpkgs/mozjs38/patches/js-version.patch deleted file mode 100644 index cc6b3d35b32..00000000000 --- a/srcpkgs/mozjs38/patches/js-version.patch +++ /dev/null @@ -1,65 +0,0 @@ -# HG changeset patch -# Parent 4732a0e5d22bc7e5c1f1ace7a182d537d9cc2c6a -Add major version to shell and js-config filenames. -Author: Rico Tzschichholz -Forwarded: no -Last-Update: 2014-10-29 - ---- -diff --git a/js/src/configure b/js/src/configure ---- a/js/src/configure -+++ b/js/src/configure -@@ -1696,8 +1696,13 @@ - MOZJS_PATCH_VERSION=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.[0-9]*[^0-9]*||"` - IS_ALPHA=`echo $MOZILLA_VERSION | grep '[ab]'` - -+if test -n "$JS_STANDALONE"; then -+JS_SHELL_NAME=js$MOZJS_MAJOR_VERSION -+JS_CONFIG_NAME=js$MOZJS_MAJOR_VERSION-config -+else - JS_SHELL_NAME=js - JS_CONFIG_NAME=js-config -+fi - - - if test -n "$IS_ALPHA"; then - -diff --git a/js/src/configure.in b/js/src/configure.in ---- a/js/src/configure.in -+++ b/js/src/configure.in -@@ -234,16 +234,13 @@ MOZJS_MINOR_VERSION=`echo $MOZILLA_VERSI - MOZJS_PATCH_VERSION=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.[0-9]*[^0-9]*||"` - IS_ALPHA=`echo $MOZILLA_VERSION | grep '[ab]'` - --dnl XXX in a temporary bid to avoid developer anger at renaming files --dnl XXX before "js" symlinks exist, don't change names. --dnl --dnl if test -n "$JS_STANDALONE"; then --dnl JS_SHELL_NAME=js$MOZJS_MAJOR_VERSION --dnl JS_CONFIG_NAME=js$MOZJS_MAJOR_VERSION-config --dnl else -+if test -n "$JS_STANDALONE"; then -+JS_SHELL_NAME=js$MOZJS_MAJOR_VERSION -+JS_CONFIG_NAME=js$MOZJS_MAJOR_VERSION-config -+else - JS_SHELL_NAME=js - JS_CONFIG_NAME=js-config --dnl fi -+fi - - changequote([,]) - if test -n "$IS_ALPHA"; then - -diff -r 80a9e64d75f5 js/src/Makefile.in ---- a/js/src/Makefile.in Wed Jun 25 15:11:42 2014 +0200 -+++ b/js/src/Makefile.in Sat Jul 05 14:08:38 2014 +0200 -@@ -273,6 +273,9 @@ - SCRIPTS = $(JS_CONFIG_NAME) - SDK_BINARY = $(JS_CONFIG_NAME) - -+$(JS_CONFIG_NAME): js-config -+ cp $^ $@ -+ - $(LIBRARY_NAME).pc: js.pc - cp $^ $@ - diff --git a/srcpkgs/mozjs38/patches/pkg-config-version.patch b/srcpkgs/mozjs38/patches/pkg-config-version.patch deleted file mode 100644 index 34a43d1f6df..00000000000 --- a/srcpkgs/mozjs38/patches/pkg-config-version.patch +++ /dev/null @@ -1,22 +0,0 @@ -Add major version to pkg-config filename. -Author: Rico Tzschichholz -Forwarded: no -Last-Update: 2015-05-04 - -Index: b/js/src/Makefile.in -=================================================================== ---- a/js/src/Makefile.in -+++ b/js/src/Makefile.in -@@ -214,10 +214,10 @@ - $(JS_CONFIG_NAME): js-config - cp $^ $@ - --$(LIBRARY_NAME).pc: js.pc -+$(JS_LIBRARY_NAME).pc: js.pc - cp $^ $@ - --install:: $(LIBRARY_NAME).pc -+install:: $(JS_LIBRARY_NAME).pc - $(SYSINSTALL) $^ $(DESTDIR)$(libdir)/pkgconfig - - install:: js-config.h diff --git a/srcpkgs/mozjs38/template b/srcpkgs/mozjs38/template deleted file mode 100644 index 9d1815812c1..00000000000 --- a/srcpkgs/mozjs38/template +++ /dev/null @@ -1,48 +0,0 @@ -# Template file for 'mozjs38' -pkgname=mozjs38 -version=38.8.0 -revision=5 -wrksrc="mozilla-esr${version%.*.*}" -build_wrksrc="js/src" -build_style=gnu-configure -hostmakedepends="perl python pkg-config" -makedepends="icu-devel libffi-devel nspr-devel zlib-devel" -short_desc="Mozilla JavaScript interpreter and library (38.x series)" -homepage="http://www.mozilla.org/js/" -license="MPL-1.1, GPL-2, LGPL-2.1" -maintainer="Juan RP " -distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.bz2" -checksum=9475adcee29d590383c4885bc5f958093791d1db4302d694a5d2766698f59982 -patch_args="-Np1" -nopie=yes - -# Flags for gcc6.3 conceived by Arch Linux developers -CFLAGS="-fpermissive -fno-delete-null-pointer-checks -fno-tree-vrp -fno-strict-aliasing" -CXXFLAGS="-fpermissive -fno-delete-null-pointer-checks -fno-tree-vrp -fno-strict-aliasing" -# Use BFD linker to avoid erroneous detection of llvm pr8927 with *-musl -LDFLAGS="-fuse-ld=bfd" - -do_configure() { - local _args - - if [ "$CROSS_BUILD" ]; then - export HOST_CFLAGS="-Os" - export HOST_CXXFLAGS="-Os" - _args+=" --target=$XBPS_CROSS_TRIPLET" - fi - - SHELL=/bin/bash PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ - --enable-threadsafe --enable-system-ffi --with-system-zlib \ - --with-system-icu --with-system-nspr ${_args} -} - -mozjs38-devel_package() { - depends="nspr-devel ${sourcepkg}>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/bin/js38-config - vmove "usr/lib/*.so" - vmove usr/include - vmove usr/lib/pkgconfig - } -} diff --git a/srcpkgs/mozjs38/update b/srcpkgs/mozjs38/update deleted file mode 100644 index a1c3f7e43b0..00000000000 --- a/srcpkgs/mozjs38/update +++ /dev/null @@ -1 +0,0 @@ -pkgname="mozjs"