Updayed to 68.5.0

2 files changed, 28 insertions, 24 deletions

diff --git a/PKGBUILD b/PKGBUILD
index f7e5ebb..0da0fff 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,9 +19,9 @@ _modclang=0
 
 _pkgname=firefox
 pkgname=${_pkgname}-esr
-pkgver=68.4.1
+pkgver=68.5.0
 _pkgver=${pkgver}esr
-pkgrel=1.2
+pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org"
 arch=(x86_64 aarch64)
 license=(MPL GPL LGPL)
@@ -44,7 +44,8 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
 options=(!emptydirs !makeflags)
 conflicts=(firefox)
 provides=(firefox)
-source=("https://archive.mozilla.org/pub/$_pkgname/releases/$_pkgver/source/$_pkgname-$_pkgver.source.tar.xz"{,.asc}
+source=(
+        "https://archive.mozilla.org/pub/$_pkgname/releases/$_pkgver/source/$_pkgname-$_pkgver.source.tar.xz"{,.asc}
         no-relinking.patch
         0001-Use-remoting-name-for-GDK-application-names.patch
         $_pkgname.desktop
@@ -55,14 +56,15 @@ source=("https://archive.mozilla.org/pub/$_pkgname/releases/$_pkgver/source/$_pk
         mozconfig.common.override
         arc4_enable-pgo-for-gcc.patch
         arc4_remove-health-reporting.patch
-        arc4_remove-system-addons.patch)
-b2sums=('918814864e4041b2f04549506ee27b118ab6f5cfb23562b6d1bd3275d1a8836b073f6b42376d6507e5aa7879eb0028d69bdcd4c67615afd07d03279434e38518'
+        arc4_remove-system-addons.patch
+        )
+b2sums=('2fba739b475f2d2b0ee5c66657730164055acb47c61a030376d41f037e5a4bf49d2bda46a5fcaef6355848c29827e0a10c3eaedbae5567c16b88e881173641ad'
         'SKIP'
         '30e0eb38e6e5b25c47475ff45c908acbaa14ba6e0a29891767b4ea07bf707ac19f63a3f31e399b155749bd3102d1cfa0a5b8146032a476ede388f05b2eaffbda'
         '08c821bece2e71483668eedc0ab3211b1fa5057b7b99fdc9104a1dbab4707d74463f3cbcdce353a1ec4777e479b3ac27a585dd35115339fccb81c83bc0ef763b'
         '51d7eb22cb568f0437ece2433091d8b54012324edd2fe52ec52cc00f1ad0d4bd84a4d549d78b4d77bbd6ae1c1e7d029d9d4dbff61c60f714362ef791f09fba8b'
         '877eda442eb4730600dccf209a6e961ad3122ab456bbfda4ff041e8493ebaaf96224ac218360931259ff4214482f6bf65b3a3052f977ade1a274f38ffd859535'
-        'e7c85eb608f7e72513927afca268d6acc9443aebc654942d6e98bb72d6b7411cc004ff3cf851c2df7bc4d34b1cfccacfdb6a83463d976c6b655bb5837bffff9d'
+        '7319a3d915b2c16a0779344303267f0fb9072610bfcd11cb53b0a860c0037d090451d71f50212bfcde53f2b2ee90afedfb1b3f5f20af79df5ef841deb3490ced'
         'a66abc624721f9d81b2a69624e6aa6bedf01b781d0e0841a22ad467b2e188aae2f4466d7dde8337205f351ce7e44cc74ff42b1548725a955a57c28faf43471dd'
         'cd3014c83dc1789d6ee5d6090a2c0835148fc317a40960dfde0c2272ef5bee0bc7c30e8a0fd93905433737bfba6362b663625ee4c206637638408cbebf35a870'
         '2579551298fc7670f4c8a3e3c496e2c92c39614d0960e87c30fa7cf581cd4ebc9d30d86ef69dd000294bafe618fa2087fbd9fd772d9ce2b1613ed8e540469206'
@@ -108,6 +110,7 @@ prepare() {
   # 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/arc4_remove-system-addons.patch
 
+
   # Hide mobile promo
   echo ".fxaMobilePromo {  display: none !important; }" >> browser/themes/shared/incontentprefs/preferences.inc.css
   # Hide plugindeprecation-notice
@@ -138,30 +141,30 @@ 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" \
-    xvfb-run -a -n 92 -s "-screen 0 1600x1200x24" \
+    xvfb-run -s "-screen 0 1920x1080x24 -nolisten local" \
     ./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
@@ -170,11 +173,11 @@ ac_add_options --with-pgo-jarlog=${PWD@Q}/jarlog
 END
   ./mach build
   else
-    msg2 "Building optimized browser..."
-    xvfb-run -a -n 96 -s "-screen 0 1600x1200x24" ./mach build
+    echo "Building optimized browser..."
+    xvfb-run -s "-screen 0 1920x1080x24 -nolisten local" ./mach build
   fi
 
-  msg2 "Building symbol archive..."
+  echo "Building symbol archive..."
   ./mach buildsymbols
 }
 
@@ -195,16 +198,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
diff --git a/mozconfig.in b/mozconfig.in
index b2e41e7..e3fa84f 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
@@ -67,7 +70,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"