user/firefox-esr: bump to 68.0.1

1 files changed, 98 insertions, 166 deletions

diff --git a/user/firefox-esr/APKBUILD b/user/firefox-esr/APKBUILD
index b9d51af8c..5970b5c94 100644
--- a/user/firefox-esr/APKBUILD
+++ b/user/firefox-esr/APKBUILD
@@ -1,104 +1,104 @@
-# Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
-pkgname=firefox-esr
-pkgver=52.9.0
-_pkgver=$pkgver
-_xulver=$pkgver
-pkgrel=4
-pkgdesc="Firefox web browser"
-url="https://www.mozilla.org/en-US/firefox/organizations/faq/"
+pkgname=firefox
+pkgver=68.0.1
+pkgrel=0
+pkgdesc="Firefox Web browser (unstable)"
+url="https://www.mozilla.org/firefox/"
 arch="all"
 options="!check"  # Tests disabled
-license="GPL LGPL MPL"
+license="MPL-2.0"
 depends=""
-depends_dev="alsa-lib-dev bzip2-dev dbus-glib-dev gconf-dev gtk+2.0-dev
-	gtk+3.0-dev hunspell-dev icu-dev libevent-dev libidl-dev
-	libjpeg-turbo-dev libnotify-dev libogg-dev libtheora-dev libvorbis-dev
-	libxt-dev libxcomposite-dev mesa-dev nspr-dev nss-dev
-	pulseaudio-dev sqlite-dev startup-notification-dev wireless-tools-dev"
-makedepends="$depends_dev autoconf2.13 automake libtool
-	bsd-compat-headers cmd:which nss-static openssl-dev sed yasm zip"
-subpackages="$pkgname-dev"
-source="https://ftp.mozilla.org/pub/firefox/releases/${pkgver}esr/source/firefox-${pkgver}esr.source.tar.xz
-	stab.h
-
-	0002-Use-C99-math-isfinite.patch
-	fix-fortify-inline.patch
-	disable-hunspell_hooks.patch
+# moz build system stuff
+# python deps
+# system-libs
+# actual deps
+makedepends="
+	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 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.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
-	fix-toolkit.patch
-	fix-tools.patch
-	mallinfo.patch
-	musl-pthread-setname.patch
-
-	fix-fortify-system-wrappers.patch
-	fix-arm-atomics-grsec.patch
-	fix-arm-version-detect.patch
 	mozilla-build-arm.patch
-	disable-moz-stackwalk.patch
-	missing-header-s390x.patch
-	ffmpeg4.patch
+	rust-config.patch
 	shut-up-warning.patch
+	stackwalk-x86-ppc.patch
+	webrtc-broken.patch
+	yuv-be.patch
 
 	firefox.desktop
-	firefox-safe.desktop"
+	firefox-safe.desktop
+	"
 
-builddir="${srcdir}/firefox-${pkgver}esr"/objdir
-_mozappdir=/usr/lib/firefox-${pkgver}
-_mozappdirdev=/usr/lib/firefox-devel-${pkgver}
-
-# help our shared-object scanner to find the libs
+_mozappdir=/usr/lib/firefox
 ldpath="$_mozappdir"
 
-# secfixes:
-#   52.6.0-r0:
-#     - CVE-2018-5089
-#     - CVE-2018-5091
-#     - CVE-2018-5095
-#     - CVE-2018-5096
-#     - CVE-2018-5097
-#     - CVE-2018-5098
-#     - CVE-2018-5099
-#     - CVE-2018-5102
-#     - CVE-2018-5103
-#     - CVE-2018-5104
-#     - CVE-2018-5117
-#   52.5.2-r0:
-#     - CVE-2017-7843
-#     - CVE-2017-7843
-
 unpack() {
 	default_unpack
 	[ -z $SKIP_PYTHON ] || return 0
+
 	msg "Killing all remaining hope for humanity and building Python 2..."
-	cd "$srcdir"
-	[ -d python ] && rm -r python
-	mkdir python
-	cd python
+	cd "$srcdir/Python-$_py2ver"
+	[ -d ../python ] && rm -r ../python
+
 	# 19:39 <+solar> just make the firefox build process build its own py2 copy
-	curl -O https://www.python.org/ftp/python/2.7.15/Python-2.7.15.tar.xz
-	tar xJf Python-2.7.15.tar.xz
-	cd Python-2.7.15
 	# 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() {
-	local i
-	mkdir -p "$builddir"
-	cd "$builddir"/..
-
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-	cp "$srcdir"/stab.h toolkit/crashreporter/google-breakpad/src/
+	cd "$builddir"
+	default_prepare
+	cp "$srcdir"/mozconfig "$builddir"/mozconfig
+	echo "ac_add_options --enable-optimize=\"$CFLAGS\"" >> "$builddir"/mozconfig
+	echo "ac_add_options --host=\"$CHOST\"" >> "$builddir"/mozconfig
+	echo "ac_add_options --target=\"$CTARGET\"" >> "$builddir"/mozconfig
+	# too much memory
+	if [ -z "$JOBS" ] || [ $JOBS -ge 16 ]; then
+		JOBS=16
+	fi
+	echo "mk_add_options MOZ_MAKE_FLAGS=\"-j$JOBS\"" >> "$builddir"/mozconfig
+
+	case "$CARCH" in
+		pmmx|x86*)
+			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() {
@@ -114,96 +114,44 @@ 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"
 
 	export PATH="$srcdir/python/bin:$PATH"
-	../configure \
-		--host=$CHOST \
-		--target=$CTARGET \
-		--prefix=/usr \
-		\
-		--disable-crashreporter \
-		--disable-elf-hack \
-		--disable-install-strip \
-		--disable-jemalloc \
-		--disable-profiling \
-		--disable-strip \
-		--disable-tests \
-		--disable-updater \
-		\
-		--enable-alsa \
-		--enable-default-toolkit=cairo-gtk3 \
-		--enable-gio \
-		--enable-gold=no \
-		--enable-official-branding \
-		--enable-optimize="$CFLAGS" \
-		--enable-pie \
-		--enable-pulseaudio \
-		--enable-startup-notification \
-		--enable-system-ffi \
-		--enable-system-hunspell \
-		--enable-system-sqlite \
-		\
-		--with-pthreads \
-		--with-system-bz2 \
-		--with-system-icu \
-		--with-system-jpeg \
-		--with-system-libevent \
-		--with-system-nspr \
-		--with-system-nss \
-		--with-system-pixman \
-		--with-system-png \
-		--with-system-zlib \
-		$extra_flags
-	# too memory hungry
-	if [ -z "$JOBS" ] || [ $JOBS -gt 16 ]; then
-		make -j16
-	else
-		make
-	fi
+	./mach build
+}
+
+run() {
+	cd "$builddir"/obj-$CHOST/dist/bin
+	export LD_LIBRARY_PATH=.
+	./firefox -no-remote -profile "$builddir"/obj-$CHOST/tmp/profile-default
 }
 
 package() {
 	cd "$builddir"
-
 	export PATH="$srcdir/python/bin:$PATH"
-	make install \
-		DESTDIR="$pkgdir" \
-		MOZ_MAKE_FLAGS="$MAKEOPTS"
+	DESTDIR="$pkgdir" ./mach install
 
 	install -m755 -d ${pkgdir}/usr/share/applications
 	install -m755 -d ${pkgdir}/usr/share/pixmaps
 
 	local png
-	for png in ../browser/branding/official/default*.png; do
+	for png in browser/branding/official/default*.png; do
 		local i="${_png%.png}"
 		i=${i##*/default}
 		install -D -m644 "$png" \
 			"$pkgdir"/usr/share/icons/hicolor/${i}x${i}/apps/firefox.png
 	done
 
-	install -m644 "$builddir"/../browser/branding/official/default48.png \
+	install -m644 "$builddir"/browser/branding/official/default48.png \
 		${pkgdir}/usr/share/pixmaps/firefox.png
 	install -m644 ${startdir}/firefox.desktop \
 		${pkgdir}/usr/share/applications/firefox.desktop
 	install -m644 ${startdir}/firefox-safe.desktop \
 		${pkgdir}/usr/share/applications/firefox-safe.desktop
 
-	# xulrunner stub launcher has changed to using a symlink overlay...
-	# go figure
-	ln -sf /usr/lib/xulrunner-${_xulver} ${pkgdir}/$_mozappdir/xulrunner
-
-	# launcher as symlink is broken from firefox-7.0
-	rm "$pkgdir"/usr/bin/firefox
-	libgl=$(scanelf -qF '#F%S' /usr/lib/libGL.so)
-	cat > "$pkgdir"/usr/bin/firefox << __EOF__
-#!/bin/sh
-
-exec $_mozappdir/firefox "\$@"
-__EOF__
-	chmod 755 "$pkgdir"/usr/bin/firefox
-
 	# install our vendor prefs
 	install -d "$pkgdir"/$_mozappdir/browser/defaults/preferences
 
@@ -218,36 +166,20 @@ __EOF__
 	pref("extensions.autoDisableScopes", 11);
 	pref("extensions.shownSelectionUI", true);
 	EOF
-
-	# remove copied, huge, libraries
-	rm -f "$pkgdir"/${_mozappdirdev}/sdk/lib/libmozjs.so
-	rm -f "$pkgdir"/${_mozappdirdev}/sdk/lib/libmozalloc.so
-	rm -f "$pkgdir"/${_mozappdirdev}/sdk/lib/libxul.so
-}
-
-dev() {
-	mkdir -p "$subpkgdir"/${_mozappdirdev%/*}
-	mv "$pkgdir"/${_mozappdirdev} "$subpkgdir"/${_mozappdirdev%/*}
-	default_dev
 }
 
-sha512sums="bfca42668ca78a12a9fb56368f4aae5334b1f7a71966fbba4c32b9c5e6597aac79a6e340ac3966779d2d5563eb47c054ab33cc40bfb7306172138ccbd3adb2b9  firefox-52.9.0esr.source.tar.xz
-0b3f1e4b9fdc868e4738b5c81fd6c6128ce8885b260affcb9a65ff9d164d7232626ce1291aaea70132b3e3124f5e13fef4d39326b8e7173e362a823722a85127  stab.h
-7e123144bc2b1efed149dfb41b255c447d43ea93a63ebe114d01945e6a6d69edc2f2a3c36980a93279106c1842355851b8b6c1d96679ee6be7b9b30513e0b1a8  0002-Use-C99-math-isfinite.patch
-09bc32cf9ee81b9cc6bb58ddbc66e6cc5c344badff8de3435cde5848e5a451e0172153231db85c2385ff05b5d9c20760cb18e4138dfc99060a9e960de2befbd5  fix-fortify-inline.patch
-0fcc647af53a3ce21c2bc36e5631eb0935e7243ebb3ab59b5719542cc54a6ac023a4a857b43b75756efb9ed80c0aecaa94dc5679a3b3792f82e87bf2c1af82e1  disable-hunspell_hooks.patch
+sha512sums="96b45135cf0b2368013afccb8c375de54d591a4e11016e8b65fc83904cedc362096dd15814cd02be23f6e52e392c605817b86a59ee2300d3e7a754d345399c81  firefox-68.0.1.source.tar.xz
+16e814e8dcffc707b595ca2919bd2fa3db0d15794c63d977364652c4a5b92e90e72b8c9e1cc83b5020398bd90a1b397dbdd7cb931c49f1aa4af6ef95414b43e0  Python-2.7.16.tar.xz
+8748e7541fd94c83bb87ff1840f6fd012c989c66af555679bf4a40b1b343a3d2191d324ad4ca1a28b450fbf6418299b89ca9617cd769b0e1512837860c8111aa  mozconfig
+ace7492f4fb0523c7340fdc09c831906f74fddad93822aff367135538dacd3f56288b907f5a04f53f94c76e722ba0bab73e28d83ec12d3e672554712e6b08613  bad-google-code.patch
+9c14041f0295682b8dbeb6d5b58a2f9dc0a2dc8bef995a0f7e30fa0b17c51aa0f6748f80fb8584169db7687e2eeb404dff68a09158ae56a5f24eef30685dd2b3  disable-gecko-profiler.patch
+c0b2bf43206c2a5154e560ef30189a1062ae856861b39f52ce69002390ff9972d43e387bfd2bf8d2ab3cac621987bc042c8c0a8b4cf90ae05717ca7705271880  fix-mutex-build.patch
 70863b985427b9653ce5e28d6064f078fb6d4ccf43dd1b68e72f97f44868fc0ce063161c39a4e77a0a1a207b7365d5dc7a7ca5e68c726825eba814f2b93e2f5d  fix-seccomp-bpf.patch
-a2925045154f4fd34e5fc056656f4f9da100341529e5d4104d249154db0c7863384083f421ce6e47e0f20566a8b20787fa35444c7933c03cd03f96f06dcd4532  fix-toolkit.patch
-7d7531a0dbb1b3c2f4cbf155168e750f274dbf19cd767d6395d479ef1626a651e714b41e353465d9d58239dc15256d83eeb1bf06c6adf47c521a0db5ee88bb50  fix-tools.patch
-bdcd1b402d2ec94957ba5d08cbad7b1a7f59c251c311be9095208491a05abb05a956c79f27908e1f26b54a3679387b2f33a51e945b650671ad85c0a2d59a5a29  mallinfo.patch
-3f535b1e4e9a5a0506ef6f6d9427a84fae1efa3c8e8d6b25b21046d2d04c132bde1a7a98e415067e5c542f699d89249b8cc3d925e0be4e96db498037429691ef  musl-pthread-setname.patch
-2a967e4619fd89a046bd40be7fdcef646fcb1eba5e47afc96aa1d59c25bcc8747cb07baee6c11f3b803db0981aced181534b806778e4d21e74958f5f4d74c784  fix-fortify-system-wrappers.patch
-ed0d344c66fc8e1cc83a11e9858b32c42e841cbeedd9eb9438811e9fcc3593dc824a8336d00058d55836cedc970aeadd6a82c6dcd7bc0fb746e564d8b478cc6c  fix-arm-atomics-grsec.patch
-015e1ff6dbf920033982b5df95d869a0b7bf56c6964e45e50649ddf46d1ce09563458e45240c3ecb92808662b1300b67507f7af272ba184835d91068a9e7d5b0  fix-arm-version-detect.patch
 e61664bc93eadce5016a06a4d0684b34a05074f1815e88ef2613380d7b369c6fd305fb34f83b5eb18b9e3138273ea8ddcfdcb1084fdcaa922a1e5b30146a3b18  mozilla-build-arm.patch
-4797d2d89ac63a57abb826b8ea9f751314ce66946194033deb9d78c2ff377b88106fd2c7bc5034dc13ad03dd5085b1893c3ccae1a9e63fde35655bb0921f7188  disable-moz-stackwalk.patch
-6beba471b6a7fc229a9c105d58137f80cec07219e52bb9a666c787b37ca88635d6ec2eba651eccb5096429c2965709c9475c89839c255c3545f8c96c5d40f403  missing-header-s390x.patch
-1e2d0321afb0fc3bb0f6e1f1d7c0621f574414fa3d2696ec30c0e4ebf7738aa4f74a15017f18fae3561f1bc72932ccfb7e5be0e608b878fca5558fb265c16860  ffmpeg4.patch
-21100340ff03f4257fa6a4b59e206d4d1b71c074ebae392ba616f9e6e6d4988a22eec69b40534221f9453ec3a58397fa4ab99b87abdcb7d22fabb13f9cc577d2  shut-up-warning.patch
+45613d476e85fe333ef8091acce4806803953c1a99de4f03ff577cf20c5a1a3d635d0589e1490da104ef80721f4f1b1d35045af3c6892c1a468fa84095f27ad8  rust-config.patch
+39ddb15d1453a8412275c36fc8db3befc69dffd4a362e932d280fb7fd1190db595a2af9b468ee49e0714f5e9df6e48eb5794122a64fa9f30d689de8693acbb15  shut-up-warning.patch
+452b47b825294779f98ed46bc1065dad76b79ff453521ef049934a120f349c84a1c863b16af1828fe053059823da9690ec917c055ae02dcc5c80c54cad732448  stackwalk-x86-ppc.patch
+be68f1387aa6677875a67106e2d6a9db470c934c943056d3b53391a63034235108e41945c53957db427d9cdc59f0aa2f9e6f2f8cd862e090e512a3ab9cbcc9a8  webrtc-broken.patch
+2dfb986089c9afcd6a895302c8a5a1d299cffa4cc3c73fce784c29d348f362c1e7570109c4f09d328275d8549a96531736dd976411c15956b385d7fb211b8af2  yuv-be.patch
 f3b7c3e804ce04731012a46cb9e9a6b0769e3772aef9c0a4a8c7520b030fdf6cd703d5e9ff49275f14b7d738fe82a0a4fde3bc3219dff7225d5db0e274987454  firefox.desktop
 5dcb6288d0444a8a471d669bbaf61cdb1433663eff38b72ee5e980843f5fc07d0d60c91627a2c1159215d0ad77ae3f115dcc5fdfe87e64ca704b641aceaa44ed  firefox-safe.desktop"