extra/firefox to 67.0.4-1

extra/firefox/PKGBUILD

@@ -4,14 +4,13 @@
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
 #  - mozconfig changes for ARM
-#  - use tarball source
 #  - revert change for clang that breaks gcc build on ARM
 
 buildarch=12
 highmem=1
 
 pkgname=firefox
-pkgver=67.0.3
+pkgver=67.0.4
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org"
 arch=(x86_64)
@@ -20,7 +19,7 @@ url="https://www.mozilla.org/firefox/"
 depends=(gtk3 mozilla-common libxt startup-notification mime-types dbus-glib
          ffmpeg nss ttf-font libpulse)
 makedepends=(unzip zip diffutils python2-setuptools yasm mesa imake inetutils
-             xorg-server-xvfb autoconf2.13 rust mercurial clang llvm jack gtk2
+             xorg-server-xvfb autoconf2.13 rust clang llvm jack gtk2
              python nodejs python2-psutil cbindgen nasm distcc-clang)
 optdepends=('networkmanager: Location detection via available WiFi networks'
             'libnotify: Notification integration'
@@ -28,17 +27,19 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
             'speech-dispatcher: Text-to-Speech'
             'hunspell-en_US: Spell checking, American English')
 options=(!emptydirs !makeflags)
-source=("https://hg.mozilla.org/releases/mozilla-release/archive/FIREFOX_${pkgver//./_}_RELEASE.tar.gz"
+source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc}
         0001-bz-1521249.patch
         arm.patch
         build-arm-libopus.patch
         $pkgname.desktop firefox-symbolic.svg)
-sha256sums=('3f072d8c555d18f117af8755196643ad38b9b0c3ab0363f8be9470cd69655744'
+sha256sums=('b2fb2d3e64a6947ef4f8212b72649acf2aa2cd4c8f70548abb636dd581fd6dc5'
+            'SKIP'
             'd0673786a6a1f1b9f6f66a3a1356afa33f1f18f59dabd92bd193c88c52a1d04c'
             'bc00516032330760444939c516a60c78f868631e1b37f075f0fe71a53737b966'
             '2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9'
             '4a783dca1f88e003c72f32d22719a0915f3fa576adbc492240e7cc250246ce10'
             '9a1a572dc88014882d54ba2d3079a1cf5b28fa03c5976ed2cb763c93dabbd797')
+validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release@mozilla.com>
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
 # Note: These are for Arch Linux use ONLY. For your own distribution, please
@@ -53,9 +54,29 @@ _google_api_key=AIzaSyDwr302FpOSkGRpLlUpPThNTDPbXcIn_FM
 # more information.
 _mozilla_api_key=16674381-f021-49de-8622-3021c5942aff
 
+# For telemetry and crash dump analysis to work correctly, we need to tell the
+# build system which Mercurial changeset is our source. Should not be needed
+# anymore once 69 is released:
+# https://bugzilla.mozilla.org/show_bug.cgi?id=1338099
+_repo=https://hg.mozilla.org/releases/mozilla-release
+_tag=FIREFOX_${pkgver//./_}_RELEASE
+
+_changeset=ea5154beddff08b919697e3bed6f38cfe3a3d82f
+_changeset_tag=FIREFOX_67_0_4_RELEASE
+
+if [[ $1 == update_hgrev ]]; then
+  _changeset=$(hg id -r $_tag --id $_repo --template '{node}')
+  sed -e "/^_changeset=/s/=.*/=$_changeset/;/^_changeset_tag=/s/=.*/=$_tag/" \
+      -i "${BASH_SOURCE[0]}"
+  exit 0
+elif [[ $_tag != $_changeset_tag ]]; then
+  error "Changeset needs update. Run: bash PKGBUILD update_hgrev"
+  exit 1
+fi
+
 prepare() {
   mkdir mozbuild
-  cd mozilla-release-FIREFOX_${pkgver//./_}_RELEASE
+  cd firefox-$pkgver
 
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1521249
   patch -Np1 -i ../0001-bz-1521249.patch
@@ -124,9 +145,10 @@ END
 }
 
 build() {
-  cd mozilla-release-FIREFOX_${pkgver//./_}_RELEASE
+  cd firefox-$pkgver
 
   export MOZ_SOURCE_REPO="$_repo"
+  export MOZ_SOURCE_CHANGESET="$_changeset"
   export MOZ_NOSPAM=1
   export MOZBUILD_STATE_PATH="$srcdir/mozbuild"
 
@@ -138,7 +160,7 @@ build() {
 }
 
 package() {
-  cd mozilla-release-FIREFOX_${pkgver//./_}_RELEASE
+  cd firefox-$pkgver
   DESTDIR="$pkgdir" ./mach install
   find . -name '*crashreporter-symbols-full.zip' -exec cp -fvt "$startdir" {} +