71.0-1

3 files changed, 23 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 090254edd03f..e10fbeaca008 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = firefox-appmenu
 	pkgdesc = Firefox from extra with appmenu patch
-	pkgver = 70.0.1
+	pkgver = 71.0
 	pkgrel = 1
 	url = https://www.mozilla.org/firefox/
 	arch = x86_64
@@ -41,21 +41,21 @@ pkgbase = firefox-appmenu
 	optdepends = pulseaudio: Audio support
 	optdepends = speech-dispatcher: Text-to-Speech
 	optdepends = hunspell-en_US: Spell checking, American English
-	provides = firefox=70.0.1
+	provides = firefox=71.0
 	options = !emptydirs
 	options = !makeflags
 	options = !strip
-	source = https://archive.mozilla.org/pub/firefox/releases/70.0.1/source/firefox-70.0.1.source.tar.xz
-	source = https://archive.mozilla.org/pub/firefox/releases/70.0.1/source/firefox-70.0.1.source.tar.xz.asc
-	source = no-relinking.patch
+	source = https://archive.mozilla.org/pub/firefox/releases/71.0/source/firefox-71.0.source.tar.xz
+	source = https://archive.mozilla.org/pub/firefox/releases/71.0/source/firefox-71.0.source.tar.xz.asc
+	source = https://github.com/nikatar/AUR/raw/master/firefox-appmenu_source/0001-Bug-1212502-Switch-mozinfo-to-using-the-distro-packa.patch
 	source = 0001-Use-remoting-name-for-GDK-application-names.patch
 	source = firefox.desktop
 	source = unity-menubar.patch
 	validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
-	sha256sums = f2e9bb26af7682b31e82fdfc3a4b3e04fd1caa8b004469ea608185d33e35691b
+	sha256sums = 78304cd58229e7103b56b34718aad051c9a4db30c266512a64f501ba58da7fbe
 	sha256sums = SKIP
-	sha256sums = 2dc9d1aa5eb7798c89f46478f254ae61e4122b4d1956d6044426288627d8a014
-	sha256sums = ab07ab26617ff76fce68e07c66b8aa9b96c2d3e5b5517e51a3c3eac2edd88894
+	sha256sums = 33f5aec0bba83b23410176c5351425d2ad949d7f0bf409a579be25bebb773fce
+	sha256sums = 5f7ac724a5c5afd9322b1e59006f4170ea5354ca1e0e60dab08b7784c2d8463c
 	sha256sums = e466789015e15be9409b7a7044353674ca6aa0f392e882217f90c79821fe2630
 	sha256sums = 73b9804393381f2c278eff63fecbd05035264dbb2aa68dd263a14db9f981a668
 
diff --git a/0001-Use-remoting-name-for-GDK-application-names.patch b/0001-Use-remoting-name-for-GDK-application-names.patch
index 8cc378636c19..165a532f470c 100644
--- a/0001-Use-remoting-name-for-GDK-application-names.patch
+++ b/0001-Use-remoting-name-for-GDK-application-names.patch
@@ -1,5 +1,4 @@
-From 1cab10b39cfda068100cab8c598f1ca0f50e4131 Mon Sep 17 00:00:00 2001
-Message-Id: <1cab10b39cfda068100cab8c598f1ca0f50e4131.1553597287.git.jan.steffens@gmail.com>
+From 83f234464554c7f4393cd1dbdeb3a68d3ae0ccae Mon Sep 17 00:00:00 2001
 From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
 Date: Mon, 25 Mar 2019 20:30:11 +0100
 Subject: [PATCH] Use remoting name for GDK application names
@@ -10,10 +9,10 @@ Subject: [PATCH] Use remoting name for GDK application names
  2 files changed, 4 insertions(+), 9 deletions(-)
 
 diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index 0b808ef215f06..28911c0ffeaec 100644
+index 984b998133bd..b6c9f013940c 100644
 --- a/toolkit/xre/nsAppRunner.cpp
 +++ b/toolkit/xre/nsAppRunner.cpp
-@@ -3728,11 +3728,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) {
+@@ -3746,11 +3746,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) {
    // consistently.
  
    // Set program name to the one defined in application.ini.
@@ -27,7 +26,7 @@ index 0b808ef215f06..28911c0ffeaec 100644
    // Initialize GTK here for splash.
  
 diff --git a/widget/gtk/nsAppShell.cpp b/widget/gtk/nsAppShell.cpp
-index 0686ff814916b..ae4a4ea55f420 100644
+index 0daa78fdbbad..49038d0bb1c8 100644
 --- a/widget/gtk/nsAppShell.cpp
 +++ b/widget/gtk/nsAppShell.cpp
 @@ -24,6 +24,7 @@
@@ -38,7 +37,7 @@ index 0686ff814916b..ae4a4ea55f420 100644
  #include "ScreenHelperGTK.h"
  #include "HeadlessScreenHelper.h"
  #include "mozilla/widget/ScreenManager.h"
-@@ -171,10 +172,8 @@ nsresult nsAppShell::Init() {
+@@ -175,10 +176,8 @@ nsresult nsAppShell::Init() {
      // option when program uses gdk_set_program_class().
      //
      // See https://bugzilla.gnome.org/show_bug.cgi?id=747634
@@ -52,5 +51,5 @@ index 0686ff814916b..ae4a4ea55f420 100644
    }
  
 -- 
-2.21.0
+2.24.0
 
diff --git a/PKGBUILD b/PKGBUILD
index 6164b3b14fe8..31b3bbcd004a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=firefox-appmenu
 _pkgname=firefox
-pkgver=70.0.1
+pkgver=71.0
 pkgrel=1
 pkgdesc="Firefox from extra with appmenu patch"
 arch=(x86_64)
@@ -25,14 +25,14 @@ provides=("firefox=$pkgver")
 conflict=("firefox")
 options=(!emptydirs !makeflags !strip)
 source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc}
-        no-relinking.patch
+        https://github.com/nikatar/AUR/raw/master/firefox-appmenu_source/0001-Bug-1212502-Switch-mozinfo-to-using-the-distro-packa.patch
         0001-Use-remoting-name-for-GDK-application-names.patch
         $_pkgname.desktop
         unity-menubar.patch)
-sha256sums=('f2e9bb26af7682b31e82fdfc3a4b3e04fd1caa8b004469ea608185d33e35691b'
+sha256sums=('78304cd58229e7103b56b34718aad051c9a4db30c266512a64f501ba58da7fbe'
             'SKIP'
-            '2dc9d1aa5eb7798c89f46478f254ae61e4122b4d1956d6044426288627d8a014'
-            'ab07ab26617ff76fce68e07c66b8aa9b96c2d3e5b5517e51a3c3eac2edd88894'
+            '33f5aec0bba83b23410176c5351425d2ad949d7f0bf409a579be25bebb773fce'
+            '5f7ac724a5c5afd9322b1e59006f4170ea5354ca1e0e60dab08b7784c2d8463c'
             'e466789015e15be9409b7a7044353674ca6aa0f392e882217f90c79821fe2630'
             '73b9804393381f2c278eff63fecbd05035264dbb2aa68dd263a14db9f981a668')
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release@mozilla.com>
@@ -53,8 +53,8 @@ prepare() {
   mkdir mozbuild
   cd firefox-$pkgver
 
-  # Avoid relinking during buildsymbols
-  patch -Np1 -i ../no-relinking.patch
+  # Make it compile with Python 3.8
+  patch -Np1 -i ../0001-Bug-1212502-Switch-mozinfo-to-using-the-distro-packa.patch
 
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052
   patch -Np1 -i ../0001-Use-remoting-name-for-GDK-application-names.patch
@@ -137,7 +137,7 @@ END
     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
@@ -154,7 +154,7 @@ END
   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@Q}
+ac_add_options --with-pgo-profile-path=${PWD@Q}/merged.profdata
 ac_add_options --with-pgo-jarlog=${PWD@Q}/jarlog
 END
   ./mach build
@@ -236,5 +236,3 @@ END
       cp -fvt "$startdir" {} +
   fi
 }
-
-# vim:set sw=2 et: