[arch-commits] Commit in firefox-developer-edition/trunk (PKGBUILD no-relinking.patch)

[Andrew Crerar]

    Date: Thursday, October 17, 2019 @ 19:31:16
  Author: andrewsc
Revision: 516592

upgpkg: firefox-developer-edition 71.0b1-1

firefox-developer-edition: Updating to 71.0b1

Modified:
  firefox-developer-edition/trunk/PKGBUILD
Deleted:
  firefox-developer-edition/trunk/no-relinking.patch

--------------------+
 PKGBUILD           |   19 +++++++------------
 no-relinking.patch |   41 -----------------------------------------
 2 files changed, 7 insertions(+), 53 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-10-17 19:29:54 UTC (rev 516591)
+++ PKGBUILD	2019-10-17 19:31:16 UTC (rev 516592)
@@ -2,7 +2,7 @@
 # Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
 
 pkgname=firefox-developer-edition
-pkgver=70.0b14
+pkgver=71.0b1
 pkgrel=1
 pkgdesc="Developer Edition of the popular Firefox web browser"
 arch=('x86_64')
@@ -20,19 +20,17 @@
             'hunspell-en_US: Spell checking, American English')
 replaces=('firefox-developer')
 options=(!emptydirs !makeflags !strip)
-source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc}
+source=(https://archive.mozilla.org/pub/devedition/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc}
         firefox-install-dir.patch
         0001-Use-remoting-name-for-GDK-application-names.patch
         "$pkgname".desktop
-        firefox-symbolic.svg
-        no-relinking.patch)
-sha512sums=('269c8ac6a1e7cb3ef9af03296d69ced967df07d947088673111574fa1b41ce4f89634ec39b062d8fb76f23af02296d3a902d888466360ab7415fd0aee123bfbe'
+        firefox-symbolic.svg)
+sha512sums=('b02d7547f1148be556a91cabaa0019bf6a6d252a8d454885f30ced1e5707e36e856b9c9fe1e52ea8f4eadac0d69e10392768fd7c58d15c65867df20a32ae23ae'
             'SKIP'
             'b66dbe7f262d036e5a5b895ab5b0dbb03313bca18b0823c001ef2dbaeb1a33169b57db0cf4dfd268499f28913845119902b5d62e8a6a9cc4820eb0ee2f322a1e'
             '40c931b8abbe5880122dbcc93d457e04e9b4f2bc3e0275e9e3e35dd347fe0658f9446c89e99553203be8a8c9ab6f4ca872a7aedc514920c107b9235c04df91dc'
             'c212158fe76b1e6228adba9214e2881458b81f38564149719dd18b121f962285bf54603a5bea93c27cb09be851b1d70091a2ce2eb5294c9d75f7619e06d549be'
-            'ba7db9a7c95a051bcd84e4c09c802fc55ee3c0d1d06ec1b169b04e414259b75bbe92fe584aee41a1e3f71e71c160df8bedf5393449e5024110ed27dbc0579ea8'
-            'af9857cd697748b9d2142da2ed8f2de1bdc7d94a0b1fd0b20bb45c7d356441e1ad152f166fa843e1f3781d3ead2ec64ff509862818eaae2e9f61264501a699a1')
+            'ba7db9a7c95a051bcd84e4c09c802fc55ee3c0d1d06ec1b169b04e414259b75bbe92fe584aee41a1e3f71e71c160df8bedf5393449e5024110ed27dbc0579ea8')
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release at mozilla.com>
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
@@ -55,9 +53,6 @@
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052
   patch -Np1 -i ../0001-Use-remoting-name-for-GDK-application-names.patch
 
-  # Avoid relinking during buildsymbols
-  patch -Np1 -i ../no-relinking.patch
-
   echo -n "$_google_api_key" > google-api-key
   echo -n "$_mozilla_api_key" > mozilla-api-key
 
@@ -136,7 +131,7 @@
     xvfb-run -a -n 92 -s "-screen 0 1600x1200x24" \
     ./mach python build/pgo/profileserver.py
 
-  if ! compgen -G '*.profraw' >&2; then
+  if [[ ! -s merged.profdata ]]; then
     error "No profile data produced."
     return 1
   fi
@@ -153,7 +148,7 @@
   cat >.mozconfig ../mozconfig - <<END
 ac_add_options --enable-lto=cross
 ac_add_options --enable-profile-use=cross
-ac_add_options --with-pgo-profile-path=${PWD at Q}
+ac_add_options --with-pgo-profile-path=${PWD at Q}/merged.profdata
 ac_add_options --with-pgo-jarlog=${PWD at Q}/jarlog
 END
   ./mach build

Deleted: no-relinking.patch
===================================================================
--- no-relinking.patch	2019-10-17 19:29:54 UTC (rev 516591)
+++ no-relinking.patch	2019-10-17 19:31:16 UTC (rev 516592)
@@ -1,41 +0,0 @@
-
-# HG changeset patch
-# User Mike Shal <mshal at mozilla.com>
-# Date 1570127498 25200
-# Node ID b8bc2504f108d8a2216ee11405cbbe4cf7a0eaec
-# Parent  9a4d6aacc48080f019024c02ac7da1fd576b39fe
-Bug XYZ - Only force re-linking on 1-tier PGO builds; r?#firefox-build-system-reviewers
-
-
-diff --git a/config/rules.mk b/config/rules.mk
---- a/config/rules.mk
-+++ b/config/rules.mk
-@@ -465,25 +465,27 @@ ifeq ($(OS_ARCH)_$(GNU_CC), WINNT_)
- 	$(foreach pgd,$(wildcard *.pgd),pgomgr -clear $(pgd);)
- else
- ifdef GNU_CC
- 	-$(RM) *.gcda
- endif
- endif
- endif
- 
-+ifdef MOZ_1TIER_PGO
- ifneq (,$(MOZ_PROFILE_GENERATE)$(MOZ_PROFILE_USE))
- ifneq (,$(filter target,$(MAKECMDGOALS)))
- ifdef GNU_CC
- # Force rebuilding libraries and programs in both passes because each
- # pass uses different object files.
- $(PROGRAM) $(SHARED_LIBRARY) $(LIBRARY): FORCE
- endif
- endif
- endif
-+endif
- 
- endif # NO_PROFILE_GUIDED_OPTIMIZE
- 
- ##############################################
- 
- clean clobber realclean clobber_all::
- 	-$(RM) $(ALL_TRASH)
- 	-$(RM) -r $(ALL_TRASH_DIRS)
-