snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Activity

mozjs68: remove package.

This commit is contained in:
Érico Rolim 2021-01-24 18:48:05 -03:00 committed by Érico Nogueira Rolim
parent 80fc90767d
commit 13ce3a0bea
14 changed files with 1 additions and 316 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/shlibs
View File

@ -3520,7 +3520,6 @@ libmysqlpp.so.3 mysql++-3.2.5_1
libKF5Syndication.so.5 syndication-5.50.0_1 libKF5Syndication.so.5 syndication-5.50.0_1
liblqr-1.so.0 liblqr-0.4.2_1 liblqr-1.so.0 liblqr-0.4.2_1
libmozjs-60.so.0 mozjs60-60.0.2_1 libmozjs-60.so.0 mozjs60-60.0.2_1
libmozjs-68.so.0 mozjs68-68.8.0_1
libmozjs-78.so.0 mozjs78-78.1.0_1 libmozjs-78.so.0 mozjs78-78.1.0_1
libebur128.so.1 libebur128-1.2.4_1 libebur128.so.1 libebur128-1.2.4_1
libgtksourceview-4.so.0 gtksourceview4-4.0.2_1 libgtksourceview-4.so.0 gtksourceview4-4.0.2_1

1
srcpkgs/mozjs68-devel
View File

@ -1 +0,0 @@
mozjs68

27
srcpkgs/mozjs68/patches/001-silence-sandbox-violations.patch
View File

@ -1,27 +0,0 @@
"Carried over from mozjs60"
Upstream: no
From 9ad10569e11a2fb96377188f895bc66abcc9511d Mon Sep 17 00:00:00 2001
From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Date: Wed, 5 Sep 2018 15:05:24 +0200
Subject: [PATCH] silence sandbox violations
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
---
python/mozbuild/mozbuild/frontend/emitter.py | 5 -----
1 file changed, 5 deletions(-)
--- a/python/mozbuild/mozbuild/frontend/emitter.py
+++ b/python/mozbuild/mozbuild/frontend/emitter.py
@@ -1195,11 +1195,6 @@
raise SandboxValidationError('Path specified in LOCAL_INCLUDES '
'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

22
srcpkgs/mozjs68/patches/002-fix-soname.patch
View File

@ -1,22 +0,0 @@
"Carried over from mozjs60"
--- a/js/src/build/Makefile.in
+++ b/js/src/build/Makefile.in
@@ -78,6 +78,8 @@
endif
ifneq (,$(SHARED_LIBRARY))
$(SYSINSTALL) $(SHARED_LIBRARY) $(DESTDIR)$(libdir)
+ mv -f $(DESTDIR)$(libdir)/$(SHARED_LIBRARY) $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).0
+ ln -s $(SHARED_LIBRARY).0 $(DESTDIR)$(libdir)/$(SHARED_LIBRARY)
ifeq ($(OS_ARCH),Darwin)
install_name_tool -id $(abspath $(libdir)/$(SHARED_LIBRARY)) $(DESTDIR)$(libdir)/$(SHARED_LIBRARY)
endif
--- a/js/src/build/moz.build
+++ b/js/src/build/moz.build
@@ -25,6 +25,7 @@
if CONFIG['JS_SHARED_LIBRARY']:
GeckoSharedLibrary('js', linkage=None)
SHARED_LIBRARY_NAME = CONFIG['JS_LIBRARY_NAME']
+ LDFLAGS += ['-Wl,-soname,lib{}.so.0'.format(SHARED_LIBRARY_NAME)]
# Ensure symbol versions of shared library on Linux do not conflict
# with those in libxul.

16
srcpkgs/mozjs68/patches/003-fix-wasm-arm.patch
View File

@ -1,16 +0,0 @@
"Taken from firefox-esr"
--- a/js/src/wasm/WasmSignalHandlers.cpp
+++ b/js/src/wasm/WasmSignalHandlers.cpp
@@ -243,9 +243,9 @@
// If you run into compile problems on a tier-3 platform, you can disable the
// emulation here.
-#if defined(__linux__) && defined(__arm__)
-# define WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
-#endif
+// #if defined(__linux__) && defined(__arm__)
+// # define WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
+// #endif
#ifdef WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
# include <sys/user.h>

17
srcpkgs/mozjs68/patches/004-fix-musl-build.patch
View File

@ -1,17 +0,0 @@
"Carried over from mozjs60"
Upstream: No
Reason: mozjs68 miscompiles on musl if built with HAVE_THREAD_TLS_KEYWORD:
https://github.com/void-linux/void-packages/issues/2598
diff --git a/js/src/old-configure.in b/js/src/old-configure.in
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -1272,6 +1272,9 @@
*-android*|*-linuxandroid*)
:
;;
+ *-musl*)
+ :
+ ;;
*)
AC_DEFINE(HAVE_THREAD_TLS_KEYWORD)
;;

12
srcpkgs/mozjs68/patches/005-spidermonkey-checks-disable.patch
View File

@ -1,12 +0,0 @@
Source:Fedora
Reason: Checks failed(Todo: Figure out why)
+++ 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")

10
srcpkgs/mozjs68/patches/006-mozjs68.pc-honor-sysroot.patch
View File

@ -1,10 +0,0 @@
"Carried over from mozjs60"
Reason: Fix the '-include' directive, otherwise it tries to use the host's header
--- a/js/src/build/js.pc.in
+++ b/js/src/build/js.pc.in
@@ -11,4 +11,4 @@
# Use -isystem for includes rather than -I, to mark them as "system headers"
# that don't generate warning diagnostics. For justification, see
# https://bugzilla.mozilla.org/show_bug.cgi?id=1539036
-Cflags: -include ${includedir}/@JS_LIBRARY_NAME@/js/RequiredDefines.h -isystem ${includedir}/@JS_LIBRARY_NAME@
+Cflags: -include ${pc_sysrootdir}${includedir}/@JS_LIBRARY_NAME@/js/RequiredDefines.h -isystem ${includedir}/@JS_LIBRARY_NAME@

74
srcpkgs/mozjs68/patches/007-Remove-unused-LLVM-and-Rust-build-dependencies.patch
View File

@ -1,74 +0,0 @@
Source: openSUSE
Upstream: No
Description: Remove unused LLVM and Rust build dependencies
Since the Javascript engine is normally part of Firefox, its build
system has dependencies on the LLVM and Rust toolchains. This limits
the number of architectures which mozjs68 can be built on.
.
It turns out, however, that neither LLVM nor Rust are used when mozjs68
is being built and these build dependencies are therefore not necessary.
.
This patch removes them and allows mozjs68 to be built on any architecture.
.
Author: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=959144
Forwarded: no
Last-Update: 2020-04-30
Index: js/moz.configure
===================================================================
--- a/js/moz.configure
+++ a/js/moz.configure
@@ -18,11 +18,6 @@ def building_js(build_project):
option(env='JS_STANDALONE', default=building_js,
help='Reserved for internal use')
-include('../build/moz.configure/rust.configure',
- when='--enable-compile-environment')
-include('../build/moz.configure/bindgen.configure',
- when='--enable-compile-environment')
-
@depends('JS_STANDALONE')
def js_standalone(value):
if value:
Index: moz.configure
===================================================================
--- a/moz.configure
+++ b/moz.configure
@@ -598,36 +598,6 @@ set_config('MAKENSISU_FLAGS', nsis_flags
check_prog('7Z', ('7z', '7za'), allow_missing=True, when=target_is_windows)
-
-@depends(host_c_compiler, c_compiler, bindgen_config_paths)
-def llvm_objdump(host_c_compiler, c_compiler, bindgen_config_paths):
- clang = None
- for compiler in (host_c_compiler, c_compiler):
- if compiler and compiler.type == 'clang':
- clang = compiler.compiler
- break
- elif compiler and compiler.type == 'clang-cl':
- clang = os.path.join(os.path.dirname(compiler.compiler), 'clang')
- break
-
- if not clang and bindgen_config_paths:
- clang = bindgen_config_paths.clang_path
- llvm_objdump = 'llvm-objdump'
- if clang:
- out = check_cmd_output(clang, '--print-prog-name=llvm-objdump',
- onerror=lambda: None)
- if out:
- llvm_objdump = out.rstrip()
- return (llvm_objdump,)
-
-
-llvm_objdump = check_prog('LLVM_OBJDUMP', llvm_objdump, what='llvm-objdump',
- when='--enable-compile-environment',
- paths=toolchain_search_path)
-
-add_old_configure_assignment('LLVM_OBJDUMP', llvm_objdump)
-
-
# Please do not add configure checks from here on.
# Fallthrough to autoconf-based configure

53
srcpkgs/mozjs68/patches/008-fix-mips32-inl.patch
View File

@ -1,53 +0,0 @@
From: qiaopengcheng <qiaopengcheng-hf@loongson.cn>
Date: Sun, 2 Jun 2019 07:28:24 +0900
Subject: Bug 1556197 - amend Bug-1544631 for fixing mips32.
---
js/src/jit/mips32/MacroAssembler-mips32-inl.h | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/js/src/jit/mips32/MacroAssembler-mips32-inl.h b/js/src/jit/mips32/MacroAssembler-mips32-inl.h
index 1f7f4d1cf31..06d8773e92a 100644
--- a/js/src/jit/mips32/MacroAssembler-mips32-inl.h
+++ b/js/src/jit/mips32/MacroAssembler-mips32-inl.h
@@ -69,6 +69,15 @@
}
// ===============================================================
+// Load instructions
+
+void MacroAssembler::load32SignExtendToPtr(const Address& src, Register dest) {
+ loadPtr(src, dest);
+}
+
+// ===============================================================
+
+// ===============================================================
// Logical instructions
void MacroAssembler::andPtr(Register src, Register dest) { ma_and(dest, src); }
@@ -820,19 +820,21 @@ void MacroAssembler::branchTestSymbol(Condition cond, const ValueOperand& value,
void MacroAssembler::branchTestBigInt(Condition cond, Register tag,
Label* label) {
- branchTestBigIntImpl(cond, tag, label);
+ MOZ_ASSERT(cond == Equal || cond == NotEqual);
+ ma_b(tag, ImmTag(JSVAL_TAG_BIGINT), label, cond);
}
void MacroAssembler::branchTestBigInt(Condition cond, const BaseIndex& address,
Label* label) {
SecondScratchRegisterScope scratch2(*this);
- splitTag(value, scratch2);
+ computeEffectiveAddress(address, scratch2);
branchTestBigInt(cond, scratch2, label);
}
void MacroAssembler::branchTestBigInt(Condition cond, const ValueOperand& value,
Label* label) {
- branchTestBigInt(cond, value.typeReg(), label);
+ SecondScratchRegisterScope scratch2(*this);
+ branchTestBigInt(cond, scratch2, label);
}
void MacroAssembler::branchTestBigIntTruthy(bool b, const ValueOperand& value,

11
srcpkgs/mozjs68/patches/009-fix-mips-sgidefs_h.patch
View File

@ -1,11 +0,0 @@
--- a/mfbt/RandomNum.cpp 2020-04-29 23:49:40.000000000 +0200
+++ b/mfbt/RandomNum.cpp 2020-08-04 19:29:36.127471301 +0200
@@ -52,7 +52,7 @@
# elif defined(__s390__)
# define GETRANDOM_NR 349
# elif defined(__mips__)
-# include <sgidefs.h>
+# include <asm/sgidefs.h>
# if _MIPS_SIM == _MIPS_SIM_ABI32
# define GETRANDOM_NR 4353
# elif _MIPS_SIM == _MIPS_SIM_ABI64

71
srcpkgs/mozjs68/template
View File

@ -1,71 +0,0 @@
# Template file for 'mozjs68'
pkgname=mozjs68
version=68.11.0
revision=1
wrksrc="firefox-${version}"
build_wrksrc=js/src
build_style=gnu-configure
hostmakedepends="perl python pkg-config automake autoconf213 autoconf-archive
which python3"
makedepends="icu-devel libffi-devel nspr-devel python-devel readline-devel zlib-devel
python3-devel"
depends="nspr>=4.19"
short_desc="Mozilla JavaScript interpreter and library (68.x series)"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MPL-2.0"
homepage="https://www.mozilla.org/js/"
distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
checksum=91c1f7caaf1ba785b74799865227456bf784ba614d17cf5f0f41a5f25d6d2160
patch_args="-Np1"
CXXFLAGS="-Wno-class-memaccess"
LDFLAGS+=" -Wl,-z,stack-size=1048576"
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
LDFLAGS+=" -latomic"
fi
do_configure() {
local _args
if [ "$CROSS_BUILD" ]; then
export HOST_CC=cc
export TARGET_CC="${CC}"
export HOST_CFLAGS="-Os"
export HOST_CXXFLAGS="-Os"
_args+=" --target=$XBPS_CROSS_TRIPLET --enable-linker=bfd"
fi
autoconf-2.13 old-configure.in > old-configure
touch ${wrksrc}/js/src/configure
touch ${wrksrc}/js/src/old-configure
SHELL=/bin/bash PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
--disable-jemalloc --disable-optimize --enable-ctypes \
--enable-readline --enable-shared-js --enable-system-ffi \
--enable-tests --with-intl-api --with-system-icu --with-system-nspr \
--enable-unaligned-private-values --enable-hardening \
--enable-release --with-system-zlib --target=${XBPS_TRIPLET} \
--host=${XBPS_TRIPLET} \
${_args}
}
do_check() {
dist/bin/jsapi-tests --format=none --exclude-random basic
}
post_install() {
# Remove unneeded static library
rm -f "${DESTDIR}"/usr/lib/*.ajs
}
mozjs68-devel_package() {
depends="nspr-devel ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/bin/js68-config
vmove usr/include
vmove "usr/lib/*.so"
vmove usr/lib/pkgconfig
}
}

1
srcpkgs/mozjs68/update
View File

@ -1 +0,0 @@
pkgname='mozjs'

1
srcpkgs/removed-packages/template
View File

@ -149,6 +149,7 @@ replaces="
mirrorbits<=0.5.1_1 mirrorbits<=0.5.1_1
mongroup<=0.4.1_2 mongroup<=0.4.1_2
mozjs52<=52.9.0_7 mozjs52<=52.9.0_7
mozjs68<=68.11.0_1
phonon-backend-gstreamer<=4.9.0_2 phonon-backend-gstreamer<=4.9.0_2
phonon-backend-vlc<=0.9.1_3 phonon-backend-vlc<=0.9.1_3
polkit-qt<=0.112.0_5 polkit-qt<=0.112.0_5