Updated to 64.0 | Commented out system addon removal until the workaround can be fixed | Updated vendor.js for 64

1 files changed, 32 insertions, 24 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 125f484..f0f6c36 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,9 +12,9 @@
 # Arch version doesn't support alsa
 
 pkgname=firefox
-pkgver=63.0.3
+pkgver=64.0
 bz2ver=$(echo $pkgver | sed 's/\./_/g')
-pkgrel=2
+pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org"
 arch=(x86_64)
 license=(MPL GPL LGPL)
@@ -22,8 +22,8 @@ url="https://www.mozilla.org/firefox/"
 depends=(gtk3 mozilla-common libxt startup-notification mime-types dbus-glib
          ffmpeg nss ttf-font alsa-lib sqlite libvpx icu)
 makedepends=(unzip zip diffutils python2-setuptools yasm mesa imake inetutils
-            xorg-server-xvfb autoconf2.13 rust mercurial clang llvm gtk2
-            python python2-psutil cbindgen)
+            xorg-server-xvfb autoconf2.13 rust clang llvm gtk2
+            python nodejs python2-psutil cbindgen)
 optdepends=('networkmanager: Location detection via available WiFi networks'
             'libnotify: Notification integration'
             'speech-dispatcher: Text-to-Speech'
@@ -31,13 +31,11 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
 options=(!emptydirs !makeflags)
 source=(firefox-$pkgver.tar.bz2::https://hg.mozilla.org/releases/mozilla-release/archive/FIREFOX_${bz2ver}_RELEASE.tar.bz2
         $pkgname.desktop firefox-symbolic.svg
-        vendor.js
-        package-manifest.diff)
-sha256sums=('8bd500c8e4eaa259252e09e5189f9817da971054904236c72be843b57a2bdc7a'
+        vendor.js)
+sha256sums=('5f249e8edcced5531b86a330bf90938bfe414d21a03c25a035b52aeab987870c'
             '677e1bde4c6b3cff114345c211805c7c43085038ca0505718a11e96432e9811a'
             '9a1a572dc88014882d54ba2d3079a1cf5b28fa03c5976ed2cb763c93dabbd797'
-            '39267045ad9cfca95a0d1d9d480e67b27b798cd8524328c5be30e83bd6c2d7c0'
-            '28e5db73f04ce8794f68822deda5512c64f832e542ad58fb7e40cad9e4785664')
+            '98b5560aa855fe25f5127adb1eea3fb88681fd19507a062371429bd2bd735e93')
 
 prepare() {
   mkdir mozbuild
@@ -51,14 +49,22 @@ ac_add_options --enable-release
 ac_add_options --enable-hardening
 ac_add_options --enable-optimize
 ac_add_options --enable-rust-simd
+ac_add_options --enable-lto
+export MOZ_PGO=1
+export CC=clang
+export CXX=clang++
+export AR=llvm-ar
+export NM=llvm-nm
+export RANLIB=llvm-ranlib
 
 # Branding
-ac_add_options --disable-official-branding
+ac_add_options --enable-official-branding
 ac_add_options --enable-update-channel=release
 ac_add_options --with-distribution-id=org.artixlinux
 export MOZ_TELEMETRY_REPORTING=0
 export MOZ_ADDON_SIGNING=0
 export MOZ_REQUIRE_SIGNING=0
+export MOZ_DATA_REPORTING=0
 
 # System libraries
 ac_add_options --enable-system-ffi
@@ -78,45 +84,47 @@ ac_add_options --enable-startup-notification
 ac_add_options --disable-crashreporter
 ac_add_options --disable-eme
 ac_add_options --disable-gconf
-ac_add_options --disable-nodejs
 ac_add_options --disable-tests
 ac_add_options --disable-updater
 ac_add_options --disable-webrtc
 
-mk_add_options MOZ_MAKE_FLAGS="-j2"
+mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 END
 
   # Disable various components at the source level
-  sed -i 's|[;]1|;0|' $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/toolkit/components/telemetry/TelemetryStartup.manifest
-#  sed -i 's|[;]1|;0|' $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/experiments/Experiments.manifest
-  sed -i '/pocket/d' $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/extensions/moz.build
-  sed -i '/activity-stream/d' $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/extensions/moz.build
-  sed -i '/aushelper/d' $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/extensions/moz.build
-  sed -i '/followonsearch/d' $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/extensions/moz.build
-  sed -i '/formautofill/d' $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/extensions/moz.build
-  sed -i '/onboarding/d' $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/extensions/moz.build
-  sed -i '/screenshots/d' $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/extensions/moz.build
-  sed -i '/webcompat/d' $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/extensions/moz.build
+#   sed -i 's|[;]1|;0|' $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/toolkit/components/telemetry/TelemetryStartup.manifest
+#   sed -i 's|[;]1|;0|' $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/experiments/Experiments.manifest
+#   sed -i '/pocket/d' $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/extensions/moz.build
+#   sed -i '/activity-stream/d' $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/extensions/moz.build
+#   sed -i '/aushelper/d' $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/extensions/moz.build
+#   sed -i '/followonsearch/d' $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/extensions/moz.build
+#   sed -i '/formautofill/d' $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/extensions/moz.build
+#   sed -i '/onboarding/d' $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/extensions/moz.build
+#   sed -i '/screenshots/d' $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/extensions/moz.build
+#   sed -i '/webcompat/d' $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/extensions/moz.build
 
 
 }
 
 build() {
   cd mozilla-release-FIREFOX_${bz2ver}_RELEASE
-  mkdir --parents $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/obj-x86_64-pc-linux-gnu/dist/bin/browser/features
+#   mkdir --parents $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/obj-x86_64-pc-linux-gnu/dist/bin/browser/features
+#   mkdir --parents $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/extensions/webcompat-reporter/locales
 
 #  export MOZ_SOURCE_REPO="$_repo"
   export MOZ_NOSPAM=1
   export MOZBUILD_STATE_PATH="$srcdir/mozbuild"
+  # LTO needs more open files
+  ulimit -n 4096
 
+#   patch -p0 $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/installer/package-manifest.in $srcdir/package-manifest.diff
   ./mach build
   ./mach buildsymbols
 }
 
 package() {
   cd mozilla-release-FIREFOX_${bz2ver}_RELEASE
-  patch -p0 $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/installer/package-manifest.in $srcdir/package-manifest.diff
   DESTDIR="$pkgdir" ./mach install
   # find . -name '*crashreporter-symbols-full.zip' -exec cp -fvt "$startdir" {} +