experimental/firefox: bump to 68.0.1

Includes:
* Depend on nasm; otherwise AV1 support won't be built on x86.
* Add mozconfig option --disable-elf-hack. Otherwise there's a weird
  failure in rootpkg, and according to awilfox we want to disable this
  anyway.
* Strip trailing spaces from the makedepends lines.

1 files changed, 61 insertions, 15 deletions

diff --git a/experimental/firefox/APKBUILD b/experimental/firefox/APKBUILD
index 8d6a24d9b..4a258a2f9 100644
--- a/experimental/firefox/APKBUILD
+++ b/experimental/firefox/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=firefox
-pkgver=66.0.2
+pkgver=68.0.1
 pkgrel=0
 pkgdesc="Firefox Web browser (unstable)"
 url="https://www.mozilla.org/firefox/"
@@ -13,27 +13,40 @@ depends=""
 # system-libs
 # actual deps
 makedepends="
-	autoconf2.13 cargo clang llvm7-dev node ncurses-dev perl rust
-	rust-stdlib cmd:which
+	autoconf2.13 cargo cbindgen clang llvm8-dev node ncurses-dev 
+	perl rust rust-stdlib cmd:which
 
 	ncurses-dev openssl-dev
 
 	alsa-lib-dev bzip2-dev icu-dev libevent-dev libffi-dev libpng-dev
 	libjpeg-turbo-dev nspr-dev nss-dev pulseaudio-dev zlib-dev
 
-	dbus-glib-dev gconf-dev gtk+3.0-dev hunspell-dev libnotify-dev
-	libsm-dev libxcomposite-dev libxdamage-dev libxrender-dev libxt-dev
-	nss-static sqlite-dev startup-notification-dev unzip yasm zip
-	gtk+2.0-dev
+	dbus-glib-dev fts-dev gconf-dev gtk+3.0-dev hunspell-dev
+	libnotify-dev libsm-dev libxcomposite-dev libxdamage-dev
+	libxrender-dev libxt-dev nasm nss-static sqlite-dev
+	startup-notification-dev unzip yasm zip gtk+2.0-dev
 	"
-_py2ver="2.7.15"
+_py2ver="2.7.16"
 source="https://ftp.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz
 	https://www.python.org/ftp/python/$_py2ver/Python-$_py2ver.tar.xz
 	mozconfig
 
+	bad-google-code.patch
+	disable-gecko-profiler.patch
+	fix-mutex-build.patch
+	fix-seccomp-bpf.patch
+	mozilla-build-arm.patch
 	rust-config.patch
+	stackwalk-x86-ppc.patch
+	webrtc-broken.patch
+
+	firefox.desktop
+	firefox-safe.desktop
 	"
 
+_mozappdir=/usr/lib/firefox
+ldpath="$_mozappdir"
+
 unpack() {
 	default_unpack
 	[ -z $SKIP_PYTHON ] || return 0
@@ -41,14 +54,24 @@ unpack() {
 	msg "Killing all remaining hope for humanity and building Python 2..."
 	cd "$srcdir/Python-$_py2ver"
 	[ -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"
+
+	sed -e 's/é/e/g' /etc/os-release > "$srcdir"/os-release
+	export UNIXCONFDIR="$srcdir"
+
+	./configure --prefix="$srcdir/python" --with-ensurepip=install
 	make -j $JOBS
 	# 6 tests failed:
 	#    test__locale test_os test_posix test_re test_strptime test_time
 	# make test
 	make -j $JOBS install
+
+	# firefox's bundled pipenv and pip aren't new enough to support
+	# configurable UNIXCONFDIR
+	export PATH="$srcdir/python/bin:$PATH"
+	pip2 install virtualenv pipenv
 }
 
 prepare() {
@@ -59,9 +82,21 @@ prepare() {
 	echo "ac_add_options --host=\"$CHOST\"" >> "$builddir"/mozconfig
 	echo "ac_add_options --target=\"$CTARGET\"" >> "$builddir"/mozconfig
 	# too much memory
-	if [ -z "$JOBS" ] || [ $JOBS -gt 16 ]; then
-		echo "mk_add_options MOZ_MAKE_FLAGS=\"-j16\"" >> "$builddir"/mozconfig
+	if [ -z "$JOBS" ] || [ $JOBS -ge 32 ]; then
+		JOBS=32
 	fi
+	echo "mk_add_options MOZ_MAKE_FLAGS=\"-j$JOBS\"" >> "$builddir"/mozconfig
+
+	case "$CARCH" in
+		pmmx|x86_64)
+			echo "ac_add_options --disable-elf-hack" >> "$builddir"/mozconfig
+			;;
+	esac
+
+	rm "$builddir"/third_party/python/virtualenv/virtualenv_support/pip*.whl
+	rm "$builddir"/third_party/python/virtualenv/virtualenv_support/setuptools*.whl
+	cp "$srcdir/Python-$_py2ver"/Lib/ensurepip/_bundled/*.whl \
+		"$builddir/third_party/python/virtualenv/virtualenv_support"
 }
 
 build() {
@@ -77,6 +112,8 @@ build() {
 	# set rpath so linker finds the libs
 	export LDFLAGS="$LDFLAGS -Wl,-rpath,${_mozappdir}"
 
+	export UNIXCONFDIR="$srcdir"
+
 	local extra_flags=""
 	[ "$CARCH" = "s390x" ] && extra_flags="--disable-startupcache"
 
@@ -129,7 +166,16 @@ package() {
 	EOF
 }
 
-sha512sums="2246f3aed4e8a1d557a2383204e926c45d63d7977032512982b3698da4d6260b67fa91507f1a103af0af77198b7ffb34d6609159729aa7bf1c7c16cf2f7efc5b  firefox-66.0.2.source.tar.xz
-27ea43eb45fc68f3d2469d5f07636e10801dee11635a430ec8ec922ed790bb426b072da94df885e4dfa1ea8b7a24f2f56dd92f9b0f51e162330f161216bd6de6  Python-2.7.15.tar.xz
-dde70694cd3b3abfcac8d0737bf6031a96918a1b0a1846e5aa7b246511621417e2710acc2f783f77edc3f0043e67b0822ef9bdd4d6034729c432f9752d8f1f6d  mozconfig
-fd3b165e26ab931dd7eaf220d578c30b8772eab0a870710d59403c9823c2233ef941cd7eb25d1625d705de9e8a7138d0e8c4e227a185e9b687553132da96d81a  rust-config.patch"
+sha512sums="96b45135cf0b2368013afccb8c375de54d591a4e11016e8b65fc83904cedc362096dd15814cd02be23f6e52e392c605817b86a59ee2300d3e7a754d345399c81  firefox-68.0.1.source.tar.xz
+16e814e8dcffc707b595ca2919bd2fa3db0d15794c63d977364652c4a5b92e90e72b8c9e1cc83b5020398bd90a1b397dbdd7cb931c49f1aa4af6ef95414b43e0  Python-2.7.16.tar.xz
+1b84e737ce9931872e0eba11d2dd1c9e66ee28f03a4d881ab8df2f7c41b6bcfc74d3dfc7dd03c0b000718ecd71492392538b8615a773e9aca62d52ceff756cbc  mozconfig
+ace7492f4fb0523c7340fdc09c831906f74fddad93822aff367135538dacd3f56288b907f5a04f53f94c76e722ba0bab73e28d83ec12d3e672554712e6b08613  bad-google-code.patch
+9c14041f0295682b8dbeb6d5b58a2f9dc0a2dc8bef995a0f7e30fa0b17c51aa0f6748f80fb8584169db7687e2eeb404dff68a09158ae56a5f24eef30685dd2b3  disable-gecko-profiler.patch
+c0b2bf43206c2a5154e560ef30189a1062ae856861b39f52ce69002390ff9972d43e387bfd2bf8d2ab3cac621987bc042c8c0a8b4cf90ae05717ca7705271880  fix-mutex-build.patch
+70863b985427b9653ce5e28d6064f078fb6d4ccf43dd1b68e72f97f44868fc0ce063161c39a4e77a0a1a207b7365d5dc7a7ca5e68c726825eba814f2b93e2f5d  fix-seccomp-bpf.patch
+e61664bc93eadce5016a06a4d0684b34a05074f1815e88ef2613380d7b369c6fd305fb34f83b5eb18b9e3138273ea8ddcfdcb1084fdcaa922a1e5b30146a3b18  mozilla-build-arm.patch
+45613d476e85fe333ef8091acce4806803953c1a99de4f03ff577cf20c5a1a3d635d0589e1490da104ef80721f4f1b1d35045af3c6892c1a468fa84095f27ad8  rust-config.patch
+452b47b825294779f98ed46bc1065dad76b79ff453521ef049934a120f349c84a1c863b16af1828fe053059823da9690ec917c055ae02dcc5c80c54cad732448  stackwalk-x86-ppc.patch
+be68f1387aa6677875a67106e2d6a9db470c934c943056d3b53391a63034235108e41945c53957db427d9cdc59f0aa2f9e6f2f8cd862e090e512a3ab9cbcc9a8  webrtc-broken.patch
+f3b7c3e804ce04731012a46cb9e9a6b0769e3772aef9c0a4a8c7520b030fdf6cd703d5e9ff49275f14b7d738fe82a0a4fde3bc3219dff7225d5db0e274987454  firefox.desktop
+5dcb6288d0444a8a471d669bbaf61cdb1433663eff38b72ee5e980843f5fc07d0d60c91627a2c1159215d0ad77ae3f115dcc5fdfe87e64ca704b641aceaa44ed  firefox-safe.desktop"