From d0f3dbebef986faf86d8a69b714af2d3a1416aad Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Sat, 7 Dec 2019 15:57:20 -0800
Subject: Updated to 68.3.0

---
 PKGBUILD | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

(limited to 'PKGBUILD')

diff --git a/PKGBUILD b/PKGBUILD
index 0d38826..e210912 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,11 +19,11 @@ _modclang=0
 
 _pkgname=firefox
 pkgname=${_pkgname}-esr
-pkgver=68.2.0
+pkgver=68.3.0
 _pkgver=${pkgver}esr
-pkgrel=2
+pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org"
-arch=(x86_64)
+arch=(x86_64 aarch64)
 license=(MPL GPL LGPL)
 url="https://www.mozilla.org/firefox/"
 depends=(gtk3 mozilla-common libxt startup-notification mime-types dbus-glib ffmpeg
@@ -44,6 +44,7 @@ conflicts=(firefox)
 provides=(firefox)
 source=("https://archive.mozilla.org/pub/$_pkgname/releases/$_pkgver/source/$_pkgname-$_pkgver.source.tar.xz"{,.asc}
         no-relinking.patch
+        patch-bindgen-rust1390.patch
         0001-Use-remoting-name-for-GDK-application-names.patch
         $_pkgname.desktop
         distribution.ini
@@ -51,12 +52,13 @@ source=("https://archive.mozilla.org/pub/$_pkgname/releases/$_pkgver/source/$_pk
         mozconfig.in.clang
         mozconfig.in.clang.pgo
         mozconfig.common.override
-        pgo-1.patch
-        moz.configure.diff
-        package-manifest.diff)
-sha256sums=('85f1c2eaf68ebedcbc0b78a342f6d16ef0865dedd426a1bba94b75c85f716f38'
+        arc4_enable-pgo-for-gcc.patch
+        arc4_remove-health-reporting.patch
+        arc4_remove-system-addons.patch)
+sha256sums=('e131149a70e7ae867d9b0ea081e8c081d056500ee51bb9270df247e977badc69'
             'SKIP'
             '2dc9d1aa5eb7798c89f46478f254ae61e4122b4d1956d6044426288627d8a014'
+            'd0c7cc63ce49128e6a53dde7f4116293a51e2144fc329df93dda44b228a8effb'
             'ab07ab26617ff76fce68e07c66b8aa9b96c2d3e5b5517e51a3c3eac2edd88894'
             'a9e5264257041c0b968425b5c97436ba48e8d294e1a0f02c59c35461ea245c33'
             '0ba4d1a619a3a5750a5a48c6bff8c6a69d3aa4be4c303032c5979ab5f68db208'
@@ -65,7 +67,7 @@ sha256sums=('85f1c2eaf68ebedcbc0b78a342f6d16ef0865dedd426a1bba94b75c85f716f38'
             'b9833cf28af757e17a34e5c7f9db89b97d5c56b8f55cb6bccb70fc48275318af'
             'dcf70d24eedab79d811974a75663f0e84c5efca420da61fc444ebe311d0cada9'
             'a8c15c9d54ef8b360c0932f4ccf5e74954f14e9a9c2a1ae924b6c392075b2b8c'
-            'ad8a270e1b2affb098440f82517c3952207b28ebf604fef695dad3e29a5ba30e'
+            '2e3bf18c73ec3e932f8f2a75495b695f854a0fd883fe2065bff5a7b197cd7e54'
             '927e400d6920b98d2fe7db2b6498f195135909a76e0da49441223956364d8227')
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353')  # Mozilla Software Releases
 
@@ -76,12 +78,15 @@ prepare() {
   # Avoid relinking during buildsymbols
   patch -Np1 -i ../no-relinking.patch
 
+  # https://svnweb.freebsd.org/ports/head/www/firefox-esr/files/patch-bindgen-rust1390?revision=516995&view=markup&pathrev=516995
+  patch -Np0 -i ../patch-bindgen-rust1390.patch
+
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052
   patch -Np1 -i ../0001-Use-remoting-name-for-GDK-application-names.patch
 
   if [ "${_modclang}" != "1" ]; then
     # Apply gcc pgo patches
-    patch -p0 $srcdir/${_pkgname}-${pkgver}/security/sandbox/linux/moz.build $srcdir/pgo-1.patch
+    patch -p0 $srcdir/${_pkgname}-${pkgver}/security/sandbox/linux/moz.build $srcdir/arc4_enable-pgo-for-gcc.patch
   fi
 
   if [ "${_modclang}" == "1" ]; then
@@ -101,10 +106,10 @@ prepare() {
   sed -i 's/;1/;0/' $srcdir/${_pkgname}-${pkgver}/toolkit/components/telemetry/components.conf
 
   # Patch out health reporting so that MOZ_DATA_REPORTING=0 can be applied.
-  patch -p0 $srcdir/${_pkgname}-${pkgver}/browser/moz.configure $srcdir/moz.configure.diff
+  patch -p0 $srcdir/${_pkgname}-${pkgver}/browser/moz.configure $srcdir/arc4_remove-health-reporting.patch
 
   # Remove @RESPATH@/browser/features/* to prevent system addons from being part of the output package.
-  patch -p0 $srcdir/${_pkgname}-${pkgver}/browser/installer/package-manifest.in $srcdir/package-manifest.diff
+  patch -p0 $srcdir/${_pkgname}-${pkgver}/browser/installer/package-manifest.in $srcdir/arc4_remove-system-addons.patch
 
   # Hide mobile promo
   echo ".fxaMobilePromo {  display: none !important; }" >> browser/themes/shared/incontentprefs/preferences.inc.css
@@ -146,7 +151,7 @@ build() {
     xvfb-run -a -n 92 -s "-screen 0 1600x1200x24" \
     ./mach python build/pgo/profileserver.py
 
-  if ! compgen -G '*.profraw' >&2; then
+  if [[ ! -s merged.profdata ]]; then
     error "No profile data produced."
     return 1
   fi
@@ -163,7 +168,7 @@ build() {
   # Add the custom mozconfig
   cp $srcdir/mozconfig.in.clang $srcdir/${_pkgname}-${pkgver}/.mozconfig
   cat >.mozconfig - <<END
-ac_add_options --with-pgo-profile-path=${PWD@Q}
+ac_add_options --with-pgo-profile-path=${PWD@Q}/merged.profdata
 ac_add_options --with-pgo-jarlog=${PWD@Q}/jarlog
 END
   ./mach build
-- 
cgit v1.2.1