Updated to 72.0.1

1 files changed, 31 insertions, 41 deletions

diff --git a/PKGBUILD b/PKGBUILD
index b67fd4c..10c645b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,8 +18,8 @@ _modclang=0
 #_modclang=1 # FIXME
 
 pkgname=firefox
-pkgver=70.0.1
-pkgrel=3
+pkgver=72.0.1
+pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org"
 arch=(x86_64 aarch64)
 license=(MPL GPL LGPL)
@@ -39,10 +39,8 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
             'hunspell-en_CA: Spell checking, Canadian English')
 options=(!emptydirs !makeflags)
 conflicts=(firefox-esr)
-source=("https://archive.mozilla.org/pub/$pkgname/releases/$pkgver/source/$pkgname-$pkgver.source.tar.xz"{,.asc}
-        no-relinking.patch
-        0001-Update-bindgen.patch
-        0002-Bug-1212502-Switch-mozinfo-to-using-the-distro-packa.patch
+source=(
+        "https://archive.mozilla.org/pub/$pkgname/releases/$pkgver/source/$pkgname-$pkgver.source.tar.xz"{,.asc}
         0001-Use-remoting-name-for-GDK-application-names.patch
         $pkgname.desktop
         distribution.ini
@@ -50,43 +48,34 @@ source=("https://archive.mozilla.org/pub/$pkgname/releases/$pkgver/source/$pkgna
         mozconfig.in.clang
         mozconfig.in.clang.pgo
         mozconfig.common.override
-        pgo-1.patch
-        moz.configure.diff
-        package-manifest.diff)
-sha256sums=('f2e9bb26af7682b31e82fdfc3a4b3e04fd1caa8b004469ea608185d33e35691b'
-            'SKIP'
-            '2dc9d1aa5eb7798c89f46478f254ae61e4122b4d1956d6044426288627d8a014'
-            '832d895c90d346fe4acf25b8b8ba9a62bea595fe5fcdeaf545c8e952393993fc'
-            '58890388e02af41055e1ec9797b7c094dee499a5219dc9c532c6cfccf2cce972'
-            'ab07ab26617ff76fce68e07c66b8aa9b96c2d3e5b5517e51a3c3eac2edd88894'
-            'a9e5264257041c0b968425b5c97436ba48e8d294e1a0f02c59c35461ea245c33'
-            '0ba4d1a619a3a5750a5a48c6bff8c6a69d3aa4be4c303032c5979ab5f68db208'
-            '1cc0730e0f0285f45f30feeeee6d7757931b25263b35b041abd71c2e0486210d'
-            '6bf4638134915758466a912dc909fbad165e76cc3807e9eedc659f8f346575fa'
-            'b9833cf28af757e17a34e5c7f9db89b97d5c56b8f55cb6bccb70fc48275318af'
-            'dcf70d24eedab79d811974a75663f0e84c5efca420da61fc444ebe311d0cada9'
-            'a8c15c9d54ef8b360c0932f4ccf5e74954f14e9a9c2a1ae924b6c392075b2b8c'
-            'ad8a270e1b2affb098440f82517c3952207b28ebf604fef695dad3e29a5ba30e'
-            '927e400d6920b98d2fe7db2b6498f195135909a76e0da49441223956364d8227')
+        arc4_enable-pgo-for-gcc.patch
+        arc4_remove-health-reporting.patch
+        arc4_remove-system-addons.patch
+        )
+b2sums=('19d07cf6ea7a0b5ae0df4475e3a24ed7c387d2ce1f41eec2c7bf1ba08e379134b6dfa9e9748f15f4281decf34447356e2826192f267ca68b83e7ba484b04c309'
+        'SKIP'
+        'b4683a33448cf7a891d629e4e1fd290622fcf96cacf593cb733eb4daad2fd66909e125e64e5129096051ba0d2453b831b14c8faf98d345f248f2132e3931355d'
+        '51d7eb22cb568f0437ece2433091d8b54012324edd2fe52ec52cc00f1ad0d4bd84a4d549d78b4d77bbd6ae1c1e7d029d9d4dbff61c60f714362ef791f09fba8b'
+        '877eda442eb4730600dccf209a6e961ad3122ab456bbfda4ff041e8493ebaaf96224ac218360931259ff4214482f6bf65b3a3052f977ade1a274f38ffd859535'
+        'f5c128d76bbfe59c04118813a1dbf141ca02932b5474741cbd768d151fdb6ad4d9cae23087feeef4072b540905821400aa3daa00e22b1eddfd3719e5321838bf'
+        'a66abc624721f9d81b2a69624e6aa6bedf01b781d0e0841a22ad467b2e188aae2f4466d7dde8337205f351ce7e44cc74ff42b1548725a955a57c28faf43471dd'
+        'cd3014c83dc1789d6ee5d6090a2c0835148fc317a40960dfde0c2272ef5bee0bc7c30e8a0fd93905433737bfba6362b663625ee4c206637638408cbebf35a870'
+        '64e40ca0b69d565aec3d1c9ad8c51040b2c2b093dbd402ae4d0ebf131b6dc39aae6bb0de3b9d218291f4878a638e7f3cb3c1915c3df60d9d5e9ea5be50e1aa71'
+        '087ea758132905cab848e3a13a13537b42f70ba3a8bfd1ef4e2933d3e874e94038b50ee583b9e7e0c7b7cc7c2cf570f7f613b661f47121b7bf207f433b939f3d'
+        '4c0f100c52721f9d9a840d7de1f1d5310578ef7fbc350c62341d96b2af23d8bcb774a289429693153635964860cbb05074149bf043941dec87a1d86655b4d4b6'
+        '635a84c64ea9dccf41fbde33b58a72a8123ecd841995ad045bd329e23855f56ffce05670fe2d69a12c4cef7a7399bc6becfc5f40bfd8cea9a4006074672a634d')
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353')  # Mozilla Software Releases
 
 prepare() {
 #   mkdir mozbuild
   cd ${pkgname}-${pkgver}
 
-  # Avoid relinking during buildsymbols
-  patch -Np1 -i ../no-relinking.patch
-  
-  # Make it compile with Rust 1.39 and Python 3.8
-  patch -Np1 -i ../0001-Update-bindgen.patch
-  patch -Np1 -i ../0002-Bug-1212502-Switch-mozinfo-to-using-the-distro-packa.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
@@ -106,10 +95,11 @@ 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
@@ -151,7 +141,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
@@ -168,7 +158,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
@@ -198,16 +188,16 @@ package() {
 
 
   # icons
-  local i
+  local i theme=official
   for i in 16 22 24 32 48 64 128 256; do
-    install -Dvm644 browser/branding/official/default$i.png \
+    install -Dvm644 browser/branding/$theme/default$i.png \
       "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$pkgname.png"
   done
-  install -Dvm644 browser/branding/official/content/about-logo.png \
+  install -Dvm644 browser/branding/$theme/content/about-logo.png \
     "$pkgdir/usr/share/icons/hicolor/192x192/apps/$pkgname.png"
-  install -Dvm644 browser/branding/official/content/about-logo@2x.png \
+  install -Dvm644 browser/branding/$theme/content/about-logo@2x.png \
     "$pkgdir/usr/share/icons/hicolor/384x384/apps/$pkgname.png"
-  install -Dvm644 browser/branding/official/content/identity-icons-brand.svg \
+  install -Dvm644 browser/branding/$theme/content/identity-icons-brand.svg \
     "$pkgdir/usr/share/icons/hicolor/symbolic/apps/$pkgname-symbolic.svg"
 
   # install desktop file