From e598312e134a0dca456000b73fadfb45e58e37ef Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Tue, 11 Feb 2020 19:50:58 -0800
Subject: Updated to 73.0

---
 PKGBUILD     | 28 +++++++++++++++-------------
 mozconfig.in |  7 ++++---
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index 10c645b..f75301f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,7 +18,7 @@ _modclang=0
 #_modclang=1 # FIXME
 
 pkgname=firefox
-pkgver=72.0.1
+pkgver=73.0
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org"
 arch=(x86_64 aarch64)
@@ -36,7 +36,9 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
             'jack: Jack support'
             'pulseaudio: PulseAudio support'
             'speech-dispatcher: Text-to-Speech'
-            'hunspell-en_CA: Spell checking, Canadian English')
+            'hunspell-en_CA: Spell checking, Canadian English'
+            'firefox-preferences: Custom vendor.js with security by default'
+            'firefox-preferences-basic: Custom vendor.js with less breaking changes')
 options=(!emptydirs !makeflags)
 conflicts=(firefox-esr)
 source=(
@@ -52,15 +54,15 @@ source=(
         arc4_remove-health-reporting.patch
         arc4_remove-system-addons.patch
         )
-b2sums=('19d07cf6ea7a0b5ae0df4475e3a24ed7c387d2ce1f41eec2c7bf1ba08e379134b6dfa9e9748f15f4281decf34447356e2826192f267ca68b83e7ba484b04c309'
+b2sums=('3c414c0e8f5737e2e50d2f42d7543c85061d289774b9daa73a39458649d8c7b09fc992d45d529c8a3874c0bbdf04ac4533b5522dabcd013f4ceb65e27c8e14eb'
         'SKIP'
         'b4683a33448cf7a891d629e4e1fd290622fcf96cacf593cb733eb4daad2fd66909e125e64e5129096051ba0d2453b831b14c8faf98d345f248f2132e3931355d'
         '51d7eb22cb568f0437ece2433091d8b54012324edd2fe52ec52cc00f1ad0d4bd84a4d549d78b4d77bbd6ae1c1e7d029d9d4dbff61c60f714362ef791f09fba8b'
         '877eda442eb4730600dccf209a6e961ad3122ab456bbfda4ff041e8493ebaaf96224ac218360931259ff4214482f6bf65b3a3052f977ade1a274f38ffd859535'
-        'f5c128d76bbfe59c04118813a1dbf141ca02932b5474741cbd768d151fdb6ad4d9cae23087feeef4072b540905821400aa3daa00e22b1eddfd3719e5321838bf'
+        '535cd9e5f2af64378d7f4130b6f48154eaf671da27a7b61f1ddd222ce03c39cc1120efc210c577c38b32a492e6afb44c51eca3025c7acc45fbe1a93c759864b3'
         'a66abc624721f9d81b2a69624e6aa6bedf01b781d0e0841a22ad467b2e188aae2f4466d7dde8337205f351ce7e44cc74ff42b1548725a955a57c28faf43471dd'
         'cd3014c83dc1789d6ee5d6090a2c0835148fc317a40960dfde0c2272ef5bee0bc7c30e8a0fd93905433737bfba6362b663625ee4c206637638408cbebf35a870'
-        '64e40ca0b69d565aec3d1c9ad8c51040b2c2b093dbd402ae4d0ebf131b6dc39aae6bb0de3b9d218291f4878a638e7f3cb3c1915c3df60d9d5e9ea5be50e1aa71'
+        '1e8cdc2968a78fa395b77b654496dbbf21d37308a7fd560ab5cff8dc092d9b5123c374af8a5a18dec7fd2a053f411a1478ebfd928365208d22042391da444b4b'
         '087ea758132905cab848e3a13a13537b42f70ba3a8bfd1ef4e2933d3e874e94038b50ee583b9e7e0c7b7cc7c2cf570f7f613b661f47121b7bf207f433b939f3d'
         '4c0f100c52721f9d9a840d7de1f1d5310578ef7fbc350c62341d96b2af23d8bcb774a289429693153635964860cbb05074149bf043941dec87a1d86655b4d4b6'
         '635a84c64ea9dccf41fbde33b58a72a8123ecd841995ad045bd329e23855f56ffce05670fe2d69a12c4cef7a7399bc6becfc5f40bfd8cea9a4006074672a634d')
@@ -131,10 +133,10 @@ build() {
 #  CXXFLAGS="${CXXFLAGS/-fno-plt/}"
 
   # Do 3-tier PGO
-  msg2 "Building instrumented browser..."
+  echo "Building instrumented browser..."
   ./mach build
 
-  msg2 "Profiling instrumented browser..."
+  echo "Profiling instrumented browser..."
   ./mach package
   LLVM_PROFDATA=llvm-profdata \
     JARLOG_FILE="$PWD/jarlog" \
@@ -142,19 +144,19 @@ build() {
     ./mach python build/pgo/profileserver.py
 
   if [[ ! -s merged.profdata ]]; then
-    error "No profile data produced."
+    echo "No profile data produced."
     return 1
   fi
 
   if [[ ! -s jarlog ]]; then
-    error "No jar log produced."
+    echo "No jar log produced."
     return 1
   fi
 
-  msg2 "Removing instrumented browser..."
+  echo "Removing instrumented browser..."
   ./mach clobber
 
-  msg2 "Building optimized browser..."
+  echo "Building optimized browser..."
   # Add the custom mozconfig
   cp $srcdir/mozconfig.in.clang $srcdir/${pkgname}-${pkgver}/.mozconfig
   cat >.mozconfig - <<END
@@ -163,11 +165,11 @@ ac_add_options --with-pgo-jarlog=${PWD@Q}/jarlog
 END
   ./mach build
   else
-    msg2 "Building optimized browser..."
+    echo "Building optimized browser..."
     xvfb-run -a -n 97 -s "-screen 0 1600x1200x24" ./mach build
   fi
 
-  msg2 "Building symbol archive..."
+  echo "Building symbol archive..."
   ./mach buildsymbols
 }
 
diff --git a/mozconfig.in b/mozconfig.in
index 2991ba4..a5da920 100644
--- a/mozconfig.in
+++ b/mozconfig.in
@@ -8,7 +8,7 @@ ac_add_options --enable-optimize
 ac_add_options --disable-hardening
 ac_add_options --enable-rust-simd
 ac_add_options --enable-lto
-#ac_add_options --enable-linker=gold
+ac_add_options --enable-linker=gold
 ac_add_options --disable-elf-hack
 #ac_add_options --enable-strip
 #ac_add_options --enable-install-strip
@@ -24,6 +24,9 @@ ac_add_options --enable-official-branding
 ac_add_options --enable-update-channel=release
 ac_add_options --with-distribution-id=org.artixlinux
 ac_add_options --with-unsigned-addon-scopes=app,system
+export MOZILLA_OFFICIAL=1
+export MOZ_REQUIRE_SIGNING=0
+export MOZ_ADDON_SIGNING=0
 
 # System libraries
 ac_add_options --with-system-bz2
@@ -68,7 +71,5 @@ ac_add_options --disable-updater
 ac_add_options --disable-webrtc
 # # Disabling webspeech breaks compiling ff67+
 # ac_add_options --disable-webspeech
-export MOZ_ADDON_SIGNING=0
-export MOZ_REQUIRE_SIGNING=0
 
 mk_add_options MOZ_MAKE_FLAGS="-j4"
-- 
cgit v1.2.1