From 737e1983c9ca1b0c9a48e370da44b5fa52e093e8 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Mon, 19 Mar 2018 21:14:43 +0100 Subject: [PATCH] Revert "mozjs24: remove package, not used anymore" This reverts commit b29b1dc8c03af864d82a1b1fc356cda5c7605091. Used for polkit. --- common/shlibs | 1 + srcpkgs/mozjs24-devel | 1 + srcpkgs/mozjs24/patches/aarch64.patch | 12 ++++++ srcpkgs/mozjs24/patches/char_ptr_nul.patch | 11 ++++++ srcpkgs/mozjs24/patches/perl522.patch | 11 ++++++ srcpkgs/mozjs24/template | 43 ++++++++++++++++++++++ srcpkgs/mozjs24/update | 1 + 7 files changed, 80 insertions(+) create mode 120000 srcpkgs/mozjs24-devel create mode 100644 srcpkgs/mozjs24/patches/aarch64.patch create mode 100644 srcpkgs/mozjs24/patches/char_ptr_nul.patch create mode 100644 srcpkgs/mozjs24/patches/perl522.patch create mode 100644 srcpkgs/mozjs24/template create mode 100644 srcpkgs/mozjs24/update diff --git a/common/shlibs b/common/shlibs index 937eb278f8..a453bf714c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1494,6 +1494,7 @@ libwx_gtk2u_media-3.0.so.0 wxWidgets-3.0.1_1 libwx_gtk2u_webview-3.0.so.0 wxWidgets-3.0.2_3 libmspack.so.0 libmspack-0.4alpha_1 libslim.so.1.3.6 slim-1.3.6_1 +libmozjs-24.so mozjs24-24.2.0_1 libmozjs-38.so mozjs38-38.8.0_1 libmediaart-2.0.so.0 libmediaart-1.9.1_1 libinput.so.10 libinput-1.2.0_1 diff --git a/srcpkgs/mozjs24-devel b/srcpkgs/mozjs24-devel new file mode 120000 index 0000000000..48af50a971 --- /dev/null +++ b/srcpkgs/mozjs24-devel @@ -0,0 +1 @@ +mozjs24 \ No newline at end of file diff --git a/srcpkgs/mozjs24/patches/aarch64.patch b/srcpkgs/mozjs24/patches/aarch64.patch new file mode 100644 index 0000000000..f98022b5ef --- /dev/null +++ b/srcpkgs/mozjs24/patches/aarch64.patch @@ -0,0 +1,12 @@ +--- mfbt/double-conversion/utils.h ++++ mfbt/double-conversion/utils.h +@@ -58,7 +58,8 @@ + defined(__mips__) || defined(__powerpc__) || \ + defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ + defined(__SH4__) || defined(__alpha__) || \ +- defined(_MIPS_ARCH_MIPS32R2) ++ defined(_MIPS_ARCH_MIPS32R2) || \ ++ defined(__AARCH64EL__) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 + #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) + #if defined(_WIN32) diff --git a/srcpkgs/mozjs24/patches/char_ptr_nul.patch b/srcpkgs/mozjs24/patches/char_ptr_nul.patch new file mode 100644 index 0000000000..7f0bcd227d --- /dev/null +++ b/srcpkgs/mozjs24/patches/char_ptr_nul.patch @@ -0,0 +1,11 @@ +--- js/src/shell/jsoptparse.cpp 2013-10-29 21:40:20.000000000 +0100 ++++ js/src/shell/jsoptparse.cpp 2017-06-14 13:00:24.076799935 +0200 +@@ -253,7 +253,7 @@ + char *eq = strchr(argv[*i], '='); + if (eq) { + *value = eq + 1; +- if (value[0] == '\0') ++ if (*value[0] == '\0') + return error("A value is required for option %.*s", eq - argv[*i], argv[*i]); + return Okay; + } diff --git a/srcpkgs/mozjs24/patches/perl522.patch b/srcpkgs/mozjs24/patches/perl522.patch new file mode 100644 index 0000000000..d383d98a77 --- /dev/null +++ b/srcpkgs/mozjs24/patches/perl522.patch @@ -0,0 +1,11 @@ +--- js/src/config/milestone.pl.orig ++++ js/src/config/milestone.pl +@@ -56,7 +56,7 @@ + # + my $milestone = Moz::Milestone::getOfficialMilestone($MILESTONE_FILE); + +-if (defined(@TEMPLATE_FILE)) { ++if (@TEMPLATE_FILE) { + my $TFILE; + + foreach $TFILE (@TEMPLATE_FILE) { diff --git a/srcpkgs/mozjs24/template b/srcpkgs/mozjs24/template new file mode 100644 index 0000000000..2da11fa2be --- /dev/null +++ b/srcpkgs/mozjs24/template @@ -0,0 +1,43 @@ +# Template file for 'mozjs24' +pkgname=mozjs24 +version=24.2.0 +revision=8 +wrksrc="mozjs-${version}" +build_wrksrc="js/src" +build_style=gnu-configure +hostmakedepends="zip python perl nspr-devel" +makedepends="zlib-devel nspr-devel libedit-devel libffi-devel" +short_desc="Mozilla JavaScript interpreter and library (24.x series)" +homepage="http://www.mozilla.org/js/" +license="MPL-1.1, GPL-2, LGPL-2.1" +maintainer="Juan RP " +distfiles="${MOZILLA_SITE}/js/mozjs-${version}.tar.bz2" +checksum=e62f3f331ddd90df1e238c09d61a505c516fe9fd8c5c95336611d191d18437d8 + +# 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" + +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 ./configure --prefix=/usr --with-system-nspr \ + --enable-threadsafe ${_args} +} + +mozjs24-devel_package() { + depends="nspr-devel ${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/bin/js24-config + vmove usr/include + vmove "usr/lib/*.a" + vmove usr/lib/pkgconfig + } +} diff --git a/srcpkgs/mozjs24/update b/srcpkgs/mozjs24/update new file mode 100644 index 0000000000..a1c3f7e43b --- /dev/null +++ b/srcpkgs/mozjs24/update @@ -0,0 +1 @@ +pkgname="mozjs"