[arch-commits] Commit in firefox/trunk (PKGBUILD)

[Jan Steffens]

    Date: Monday, September 2, 2019 @ 21:29:21
  Author: heftig
Revision: 361500

69.0-1

Modified:
  firefox/trunk/PKGBUILD

----------+
 PKGBUILD |   29 +++++------------------------
 1 file changed, 5 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-02 21:13:12 UTC (rev 361499)
+++ PKGBUILD	2019-09-02 21:29:21 UTC (rev 361500)
@@ -3,7 +3,7 @@
 # Contributor: Jakub Schmidtke <sjakub at gmail.com>
 
 pkgname=firefox
-pkgver=68.0.2
+pkgver=69.0
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org"
 arch=(x86_64)
@@ -23,7 +23,7 @@
 source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc}
         0001-Use-remoting-name-for-GDK-application-names.patch
         $pkgname.desktop firefox-symbolic.svg)
-sha256sums=('9b3e6d8f99819f9eda9ebba403b644a2b96d19450b42cae422bbf4386902a840'
+sha256sums=('413c3febdfeb69eade818824eecbdb11eaeda71de229573810afd641ba741ec5'
             'SKIP'
             'ab07ab26617ff76fce68e07c66b8aa9b96c2d3e5b5517e51a3c3eac2edd88894'
             'a9e5264257041c0b968425b5c97436ba48e8d294e1a0f02c59c35461ea245c33'
@@ -42,26 +42,6 @@
 # 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=7ece03f6971968eede29275477502309bbe399da
-_changeset_tag=FIREFOX_68_0_2_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 firefox-$pkgver
@@ -121,8 +101,6 @@
 build() {
   cd firefox-$pkgver
 
-  export MOZ_SOURCE_REPO="$_repo"
-  export MOZ_SOURCE_CHANGESET="$_changeset"
   export MOZ_NOSPAM=1
   export MOZBUILD_STATE_PATH="$srcdir/mozbuild"
 
@@ -129,7 +107,10 @@
   # LTO needs more open files
   ulimit -n 4096
 
+  msg2 "Building optimized browser..."
   xvfb-run -a -n 97 -s "-screen 0 1600x1200x24" ./mach build
+
+  msg2 "Building symbol archive..."
   ./mach buildsymbols
 }