community/firefox-esr: upgrade to 52.0.2

1 files changed, 104 insertions, 58 deletions

diff --git a/community/firefox-esr/APKBUILD b/community/firefox-esr/APKBUILD
index 9e50cb6dec..b5d4253d7a 100644
--- a/community/firefox-esr/APKBUILD
+++ b/community/firefox-esr/APKBUILD
@@ -1,14 +1,13 @@
-# Contributor: Sergei Lukin <sergej.lukin@gmail.com>
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=firefox-esr
-pkgver=45.8.0
+pkgver=52.0.2
 _pkgver=$pkgver
 _xulver=$pkgver
-pkgrel=1
-pkgdesc="Firefox web browser"
+pkgrel=0
+pkgdesc="Firefox web browser -  Extended Support Release"
 url="https://www.mozilla.org/en-US/firefox/organizations/faq/"
-arch="all"
+arch="all !aarch64"
 license="GPL LGPL MPL"
 depends=""
 depends_dev="
@@ -16,9 +15,8 @@ depends_dev="
 	bzip2-dev
 	dbus-glib-dev
 	gconf-dev
-	gst-plugins-base1-dev
-	gstreamer1-dev
 	gtk+2.0-dev
+	gtk+3.0-dev
 	hunspell-dev
 	icu-dev
 	libevent-dev
@@ -54,41 +52,37 @@ makedepends="$depends_dev
 install=""
 subpackages="$pkgname-dev"
 source="https://ftp.mozilla.org/pub/firefox/releases/${pkgver}esr/source/firefox-${pkgver}esr.source.tar.xz
-	mozconfig
-	vendor.js
+	stab.h
 
 	0002-Use-C99-math-isfinite.patch
-	fix-arm-atomics-grsec.patch
-	fix-arm-version-detect.patch
+	fix-fortify-inline.patch
+	disable-hunspell_hooks.patch
+	fix-seccomp-bpf.patch
 	fix-toolkit.patch
 	fix-tools.patch
-	fix-seccomp-bpf.patch
-	mozilla-build-arm.patch
-	disable-moz-stackwalk.patch
-	stab.h
+	mallinfo.patch
+	musl-pthread-setname.patch
 
-	rhbz-966424.patch
-	fix-fortify-inline.patch
 	fix-fortify-system-wrappers.patch
-	allow-utf8-fallback.patch
-	libavutil.patch
-	mallinfo.patch
-	gcc6-fix-compilation.patch
+	fix-arm-atomics-grsec.patch
+	fix-arm-version-detect.patch
+	mozilla-build-arm.patch
+	disable-moz-stackwalk.patch
 
 	firefox.desktop
 	firefox-safe.desktop"
 
-_builddir="${srcdir}/firefox-${pkgver}esr"
-_mozappdir=/usr/lib/firefox-$pkgver
-_mozappdirdev=/usr/lib/firefox-devel-$pkgver
+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
 ldpath="$_mozappdir"
 
 prepare() {
 	local i
-
-	cd "$_builddir" || return 1
+	mkdir -p "$builddir"
+	cd "$builddir"/..
 
 	for i in $source; do
 		case $i in
@@ -96,43 +90,88 @@ prepare() {
 		esac
 	done
 	cp "$srcdir"/stab.h toolkit/crashreporter/google-breakpad/src/
-
-	cp "${srcdir}/mozconfig" .mozconfig
 }
 
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 
-	# mozilla's buildsystem is on drugs
-	export CFLAGS="$(echo $CFLAGS | sed -e 's/-Wall//' -e 's/-fexceptions/-fno-exceptions/g')"
-	export CXXFLAGS="$CFLAGS -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
 	export SHELL=/bin/sh
+	export BUILD_OFFICIAL=1
+	export MOZILLA_OFFICIAL=1
+	export USE_SHORT_LIBNAME=1
+	# gcc 6
+	export CXXFLAGS="-fno-delete-null-pointer-checks -fno-schedule-insns2"
 
 	# set rpath so linker finds the libs
 	export LDFLAGS="$LDFLAGS -Wl,-rpath,${_mozappdir}"
-	make -f client.mk build \
-		STRIP="/bin/true" \
+
+	../configure \
+		--prefix=/usr \
+		\
+		--disable-crashreporter \
+		--disable-elf-hack \
+		--disable-install-strip \
+		--disable-jemalloc \
+		--disable-profiling \
+		--disable-pulseaudio \
+		--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-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-libvpx \
+		--with-system-nspr \
+		--with-system-nss \
+		--with-system-pixman \
+		--with-system-png \
+		--with-system-zlib \
 		|| return 1
+	make || return 1
+
+	# paxmark outside fakeroot
+	paxmark -msp dist/bin/xpcshell || return 1
 
-	# we need set paxmark outside fakeroot
-	paxmark -msp */dist/bin/xpcshell || return 1
 }
 
 package() {
-	cd "$_builddir"
+	cd "$builddir"
 
 	# only used for startupcache creation.
 	local paxflags="-msp"
-	paxmark "$paxflags" */dist/bin/xpcshell || return 1
+	paxmark "$paxflags" dist/bin/xpcshell || return 1
 
-	make -j1 -f client.mk install \
+	make install \
 		DESTDIR="$pkgdir" \
 		MOZ_MAKE_FLAGS="$MAKEOPTS" \
 		|| return 1
 
 	install -m755 -d ${pkgdir}/usr/share/applications
 	install -m755 -d ${pkgdir}/usr/share/pixmaps
-	install -m644 "$_builddir"/browser/branding/official/default48.png \
+
+	local png
+	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 || return 1
+	done
+
+	install -m644 "$builddir"/../browser/branding/official/default48.png \
 		${pkgdir}/usr/share/pixmaps/firefox.png || return 1
 	install -m644 ${srcdir}/firefox.desktop ${pkgdir}/usr/share/applications/firefox.desktop
 	install -m644 ${srcdir}/firefox-safe.desktop ${pkgdir}/usr/share/applications/firefox-safe.desktop
@@ -160,10 +199,21 @@ __EOF__
 
 	# install our vendor prefs
 	install -d "$pkgdir"/$_mozappdir/browser/defaults/preferences
-	cat "$srcdir"/vendor.js >> "$pkgdir"/$_mozappdir/browser/defaults/preferences/firefox-branding.js
+
+	cat >> "$pkgdir"/$_mozappdir/browser/defaults/preferences/firefox-branding.js <<- EOF
+	// Use LANG environment variable to choose locale
+	pref("intl.locale.matchOS", true);
+
+	// Disable default browser checking.
+	pref("browser.shell.checkDefaultBrowser", false);
+
+	// Don't disable our bundled extensions in the application directory
+	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/libmozjs.so
 	rm -f "$pkgdir"/${_mozappdirdev}/sdk/lib/libmozalloc.so
 	rm -f "$pkgdir"/${_mozappdirdev}/sdk/lib/libxul.so
 }
@@ -175,24 +225,20 @@ dev() {
 	default_dev
 }
 
-sha512sums="f7b5e0c659b2e824cee7f3784e2d72c562915af91c7e316ec1519305755d2126d91b74c47f96c8b4fc7377710f295545c58b2f989c65c268fc23677ef8cf5c85  firefox-45.8.0esr.source.tar.xz
-e14b4a646230f7a752ef864b0e6a074fdac74d6c4abde2c31656eb10ac6f002a5c664d257bf3f4bd22544f10103e38d5fae49f84fcaae402b81940e72bcfe0e5  mozconfig
-cc10dba32d9c7faf1d99b8fdebc71bf0200ad10b976105edb45df696bf64a668b2b7aa8c3892a8056eb71fb071b0e0ae51c3ce2fb75acfb7e7035104c0e4fce3  vendor.js
-7e123144bc2b1efed149dfb41b255c447d43ea93a63ebe114d01945e6a6d69edc2f2a3c36980a93279106c1842355851b8b6c1d96679ee6be7b9b30513e0b1a8  0002-Use-C99-math-isfinite.patch
-4311464ae52b6d2e2b02c789c6d5fca9b3c211888a983aa609a62c2f2554516fea735ea90673387c69b38a30aa8453ed79faa44b5163df4293880d40df676b2d  fix-arm-atomics-grsec.patch
-015e1ff6dbf920033982b5df95d869a0b7bf56c6964e45e50649ddf46d1ce09563458e45240c3ecb92808662b1300b67507f7af272ba184835d91068a9e7d5b0  fix-arm-version-detect.patch
-d3f2ec8684aa485e1d08df325281629adb120f2e79c0065b96e14b99ca2968a3c701d18dda1fd1cab482aec2bc4ee8f294b9fda970ae159f8dab655f2c91aca9  fix-toolkit.patch
-6322912a8b496332c593ee5c2069d346552299781148d6c829321a10be7f6550a6f7aab3d0cfeb08e1c4ecca2a79272ea7a6f31f1d2eb430c1b0041e3699c06c  fix-tools.patch
-70863b985427b9653ce5e28d6064f078fb6d4ccf43dd1b68e72f97f44868fc0ce063161c39a4e77a0a1a207b7365d5dc7a7ca5e68c726825eba814f2b93e2f5d  fix-seccomp-bpf.patch
-e61664bc93eadce5016a06a4d0684b34a05074f1815e88ef2613380d7b369c6fd305fb34f83b5eb18b9e3138273ea8ddcfdcb1084fdcaa922a1e5b30146a3b18  mozilla-build-arm.patch
-c69cdb2d6c66180d6a67c386b862a5ed953aab4db434b054c9e1e6702bcc56ba219a4cb22747d9c891040a286388168e0cf5ca28a503389cd9708012fddf6c2b  disable-moz-stackwalk.patch
+sha512sums="a0f31479e5265c7f40d3013c3dc8368c6bdf03f21f1c9054fb2ae5557065584da433b288b493680d6147a3b11155f41bd33ad2a5d53c6eaa507258c7e00d7335  firefox-52.0.2esr.source.tar.xz
 0b3f1e4b9fdc868e4738b5c81fd6c6128ce8885b260affcb9a65ff9d164d7232626ce1291aaea70132b3e3124f5e13fef4d39326b8e7173e362a823722a85127  stab.h
-06ededcd196af98b77991dcba3b710b0dfc061404adb4676fcc380be80410a2621f64d67257b0aefdf36f566e0ea1294b5405b7b4db43e83281a1c64d02da579  rhbz-966424.patch
+7e123144bc2b1efed149dfb41b255c447d43ea93a63ebe114d01945e6a6d69edc2f2a3c36980a93279106c1842355851b8b6c1d96679ee6be7b9b30513e0b1a8  0002-Use-C99-math-isfinite.patch
 09bc32cf9ee81b9cc6bb58ddbc66e6cc5c344badff8de3435cde5848e5a451e0172153231db85c2385ff05b5d9c20760cb18e4138dfc99060a9e960de2befbd5  fix-fortify-inline.patch
-2a967e4619fd89a046bd40be7fdcef646fcb1eba5e47afc96aa1d59c25bcc8747cb07baee6c11f3b803db0981aced181534b806778e4d21e74958f5f4d74c784  fix-fortify-system-wrappers.patch
-ebbc2b1336197c289e9b7c073d196fb5734e1dad0109fe70538f8089b1873e4b55305cd39cefcf95cd4eb36715be6dff298856c496616e935ff5579452e62b09  allow-utf8-fallback.patch
-2213dbd7eb36f954add09977c0bb979aea79376164bc98d7e8957ecf584776bc11cc88b6d8235f9e04ac69d5975a47c2f52fd9aff9076326f15997657af8c9f3  libavutil.patch
+0fcc647af53a3ce21c2bc36e5631eb0935e7243ebb3ab59b5719542cc54a6ac023a4a857b43b75756efb9ed80c0aecaa94dc5679a3b3792f82e87bf2c1af82e1  disable-hunspell_hooks.patch
+70863b985427b9653ce5e28d6064f078fb6d4ccf43dd1b68e72f97f44868fc0ce063161c39a4e77a0a1a207b7365d5dc7a7ca5e68c726825eba814f2b93e2f5d  fix-seccomp-bpf.patch
+a2925045154f4fd34e5fc056656f4f9da100341529e5d4104d249154db0c7863384083f421ce6e47e0f20566a8b20787fa35444c7933c03cd03f96f06dcd4532  fix-toolkit.patch
+7d7531a0dbb1b3c2f4cbf155168e750f274dbf19cd767d6395d479ef1626a651e714b41e353465d9d58239dc15256d83eeb1bf06c6adf47c521a0db5ee88bb50  fix-tools.patch
 bdcd1b402d2ec94957ba5d08cbad7b1a7f59c251c311be9095208491a05abb05a956c79f27908e1f26b54a3679387b2f33a51e945b650671ad85c0a2d59a5a29  mallinfo.patch
-09288e3c9b94e7bfb4f764c506d98315ab3a44926cca59183dd22a84184c1de44f5dbe973367ec0ee0200d438c028e1dbe9fce4d9ce92f0e1367be50a9a72671  gcc6-fix-compilation.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
 f3b7c3e804ce04731012a46cb9e9a6b0769e3772aef9c0a4a8c7520b030fdf6cd703d5e9ff49275f14b7d738fe82a0a4fde3bc3219dff7225d5db0e274987454  firefox.desktop
 5dcb6288d0444a8a471d669bbaf61cdb1433663eff38b72ee5e980843f5fc07d0d60c91627a2c1159215d0ad77ae3f115dcc5fdfe87e64ca704b641aceaa44ed  firefox-safe.desktop"