user/mozjs: bump to 60.5.2

1 files changed, 40 insertions, 24 deletions

diff --git a/user/mozjs/APKBUILD b/user/mozjs/APKBUILD
index e9b3958ac..78d4ea352 100644
--- a/user/mozjs/APKBUILD
+++ b/user/mozjs/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=mozjs
-pkgver=52.4.0
-pkgrel=2
+pkgver=60.5.2
+pkgrel=0
 pkgdesc="Standalone JavaScript interpreter from Mozilla"
 url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
 arch="all"
@@ -10,52 +10,70 @@ license="NPL-1.1"
 depends=""
 depends_dev="$pkgname=$pkgver-r$pkgrel"
 makedepends="autoconf2.13 icu-dev libffi-dev nspr-dev python3 cmd:which
-	zlib-dev"
+	zlib-dev
+	ncurses-dev openssl-dev"
 subpackages="$pkgname-dev"
 source="https://distfiles.adelielinux.org/source/mozilla/mozjs-$pkgver.tar.bz2
+	https://www.python.org/ftp/python/2.7.15/Python-2.7.15.tar.xz
 	0003-build-Fix-library-install-name-on-macOS.patch
-	0004-build-Copy-headers-on-install-instead-of-symlinking.patch
-	0006-Disable-MOZ_GLUE_IN_PROGRAM-in-stand-alone-builds-on.patch
-	0008-tests-Skip-on-all-64-bit-archs.patch
 	0009-build-Include-configure-script-be-nicer-about-option.patch
-	arm64.patch
-	baseconfig.patch
-	dont-fail-tests-without-ion.patch
-	python3.patch
+	1002_drop_build_id.patch
+	1004_fix_pie_detection.patch
+	6006_musl_pthread_setname.patch
+	endian.patch
 	"
 builddir="$srcdir/mozjs-$pkgver"
 
+unpack() {
+	default_unpack
+	[ -z $SKIP_PYTHON ] || return 0
+
+	msg "Killing all remaining hope for humanity and building Python 2..."
+	cd "$srcdir/Python-2.7.15"
+	[ -d ../python ] && rm -r ../python
+	# 19:39 <+solar> just make the firefox build process build its own py2 copy
+	# 20:03 <calvin> TheWilfox: there's always violence
+	./configure --prefix="$srcdir/python"
+	make -j $JOBS
+	# 6 tests failed:
+	#    test__locale test_os test_posix test_re test_strptime test_time
+	# make test
+	make -j $JOBS install
+}
+
 prepare() {
 	cd "$builddir"
 	default_prepare
 	cd "$builddir"/js/src
+	export PATH="$srcdir/python/bin:$PATH"
 	autoconf-2.13 old-configure.in >/dev/null
 	autoconf-2.13
 }
 
 build() {
-	cd "$builddir"/js/src
-	./configure \
+	cd "$builddir"/js/src/build
+	export PATH="$srcdir/python/bin:$PATH"
+	../configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--disable-jemalloc \
 		--disable-optimize \
-		--enable-ion \
 		--enable-tests \
 		--with-intl-api \
 		--with-system-icu \
-		--with-system-nspr
+		--with-system-nspr \
+		--with-system-zlib
 	MOZ_MAKE_FLAGS="$MAKEFLAGS" make
 }
 
 check() {
-	cd "$builddir"/js/src
+	cd "$builddir"/js/src/build
 	dist/bin/jsapi-tests
 }
 
 package() {
-	cd "$builddir"/js/src
+	cd "$builddir"/js/src/build
 	make DESTDIR="$pkgdir" install
 
 	# no real point for 400 MB monster.
@@ -63,13 +81,11 @@ package() {
 	rm "$pkgdir"/usr/lib/libjs_static.ajs
 }
 
-sha512sums="80e006ed7550b64dad7cf78335dd9f2d34f50ad486439887f0088eb3817242d24cf7c1d9325e2dcd4a01fd5c5f54d710873113b97fd914ccd961fa46a71653fa  mozjs-52.4.0.tar.bz2
+sha512sums="5fb73330e7803bdd524fbe7cfdf4e6b72e85d4b22b0c827400317b5d052d1088d36e558ceac376393089e9d03e658b24e69262851fc04a66bbcda47135423dc0  mozjs-60.5.2.tar.bz2
+27ea43eb45fc68f3d2469d5f07636e10801dee11635a430ec8ec922ed790bb426b072da94df885e4dfa1ea8b7a24f2f56dd92f9b0f51e162330f161216bd6de6  Python-2.7.15.tar.xz
 8563264274c8b47c41fcce0b23d8d31467c60b4f1e6b37e14a390950f0d4c84be08919e0cf3578367ca1c76633201fc7d182c98a1efb57b17ce176a3e1ed5b0d  0003-build-Fix-library-install-name-on-macOS.patch
-edbec26bff4fb91911b1dafc566d4cf37635e9039a1cbd527543d74765d1c96bcfae71fe4f9a66c6555750f402377db4963e2afe0d6b061f48dbab78717bd177  0004-build-Copy-headers-on-install-instead-of-symlinking.patch
-d9acf4570a073a2151e19ad854e72ff927d050b532f04367bf49fb0c98f8eb544e9f6c455b1411d09a8a3034a2be62e23b7f9080fac9249e4132e85f2245d474  0006-Disable-MOZ_GLUE_IN_PROGRAM-in-stand-alone-builds-on.patch
-a95e91ffa3693ac2ac81eddee2e490b4acfb5ae0381a291b1916afc0d91fb00b95457fde0efe62905025fe425c18d5363c5e6ad1bb121645b29a14f6c76c0489  0008-tests-Skip-on-all-64-bit-archs.patch
 2556f3322c5bc39c1efbbbd19b6843cf69b63a0255e8e3617f58b229e75ac221b6cb57fce15452cd1f25498c66f29f588f38c10c175b82c6fe163faaa7e3e2b0  0009-build-Include-configure-script-be-nicer-about-option.patch
-63806e54fe7530703420fd070a8ef38b46cd185991a6d66dc2c1ec588f2b271883120b8e16d1a898eb6ddb41569d719f857e71f9e16e839962527cee1f47c41e  arm64.patch
-22870d6ee8a0a0b4359d78173aef0ade49063bfad495fd40815852684a1cdf17f9f50585e0d693eb712c2a2225ea43c4387cf454f3b9bd39e01899f3936775f1  baseconfig.patch
-6ebaf6fd24f1987020ad0da82cd2ff878e5c27997ac45a571899f492b435d12e32274eac35e2d571775b6f6bdce24f8e7a968088da61329e2cd36dfc762a0156  dont-fail-tests-without-ion.patch
-66a894b4878797438ac1361b892df4df45fe0c990e9540235336116a2dbfcc5d787a3076dca323b8252fb8cb6e39a61819fc0d4ce1491fb9e4d07c912fdf9e4d  python3.patch"
+0882664005d65d491d4b3d0cd73a2163637730eff41a2ad3ae1ea4e855e8728b83d1bc42632901d717f947a11e6c1c42a33f5286b0adedda3111068ae1425259  1002_drop_build_id.patch
+11cef339e8ba5d446d9fbb3947c6526294a3577025f21323cfd959707cbcc36f24535d5b68ea286220891de584ae6deef9408e838fc720af453062a179f22f42  1004_fix_pie_detection.patch
+00cc3ea149ea8527393fa3995fcb6fa7af41fc79488c38df2bcd3326dbf43bcc83db509b6dbf2c9c8d68998ce2c1ab1f18c1c46584d9aeb63ddd2cf05b1ca1ce  6006_musl_pthread_setname.patch
+363f1df1a78799783b4e9f887dc85d83ec83c6ec392aeacbd98dc89e543d0cd3b9d1964ce274142b44847a03c47f845cbf6fa7fa17a04b25bbaa37fc5d714730  endian.patch"