89b2 update

3 files changed, 19 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a487205c326..85f6e0a1716 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = firefox-beta
 	pkgdesc = Standalone web browser from mozilla.org - Beta
-	pkgver = 89.0b1
+	pkgver = 89.0b2
 	pkgrel = 1
 	url = https://www.mozilla.org/en-US/firefox/channel/#beta
 	arch = i686
@@ -43,19 +43,19 @@ pkgbase = firefox-beta
 	optdepends = pulseaudio: Audio support
 	optdepends = speech-dispatcher: Text-to-Speech
 	optdepends = hunspell-en_US: Spell checking, American English
-	provides = firefox=89.0b1
+	provides = firefox=89.0b2
 	conflicts = firefox-beta-bin
 	options = !emptydirs
 	options = !makeflags
 	options = !strip
-	source = https://ftp.mozilla.org/pub/firefox/candidates/89.0b1-candidates/build1/source/firefox-89.0b1.source.tar.xz
-	source = https://ftp.mozilla.org/pub/firefox/candidates/89.0b1-candidates/build1/source/firefox-89.0b1.source.tar.xz.asc
+	source = https://ftp.mozilla.org/pub/firefox/candidates/89.0b2-candidates/build1/source/firefox-89.0b2.source.tar.xz
+	source = https://ftp.mozilla.org/pub/firefox/candidates/89.0b2-candidates/build1/source/firefox-89.0b2.source.tar.xz.asc
 	source = 0001-Use-remoting-name-for-GDK-application-names.patch
 	source = firefox-beta.desktop
 	validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
-	sha256sums = f259a3cf334dfcdeb603dc8d1a448197ba357b3182a6789e1ba81ac758266bf9
+	sha256sums = a94da49d047267493714544dadfcc274a8fed389b1cceb4d67f7449dd5b402a3
 	sha256sums = SKIP
-	sha256sums = 3bb7463471fb43b2163a705a79a13a3003d70fff4bbe44f467807ca056de9a75
+	sha256sums = 1b6814e85f13dcf069482ad1acfc1a099661922c85e3344aa4ee059288506ccc
 	sha256sums = 54d93249fedc9c4cdc5eb82da498b08f08bcb089f85a138b457f3251a0913ad1
 
 pkgname = firefox-beta
diff --git a/0001-Use-remoting-name-for-GDK-application-names.patch b/0001-Use-remoting-name-for-GDK-application-names.patch
index 73ae042cc17..c3f4fde4d79 100644
--- a/0001-Use-remoting-name-for-GDK-application-names.patch
+++ b/0001-Use-remoting-name-for-GDK-application-names.patch
@@ -1,18 +1,18 @@
-From 5025aab61517c8608b555ba929c61eb0706bd6bd Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 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
 
 ---
  toolkit/xre/nsAppRunner.cpp |  6 +-----
- widget/gtk/nsAppShell.cpp   | 11 ++++-------
- 2 files changed, 5 insertions(+), 12 deletions(-)
+ widget/gtk/nsAppShell.cpp   | 12 +++++-------
+ 2 files changed, 6 insertions(+), 12 deletions(-)
 
 diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index da8289200e72..452195b146f3 100644
+index 5eb43aa0ae632..ff331c3b2076e 100644
 --- a/toolkit/xre/nsAppRunner.cpp
 +++ b/toolkit/xre/nsAppRunner.cpp
-@@ -3785,11 +3785,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) {
+@@ -4363,11 +4363,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) {
    // consistently.
  
    // Set program name to the one defined in application.ini.
@@ -26,18 +26,19 @@ index da8289200e72..452195b146f3 100644
    // Initialize GTK here for splash.
  
 diff --git a/widget/gtk/nsAppShell.cpp b/widget/gtk/nsAppShell.cpp
-index 163a93e2d1a4..4b6d45217671 100644
+index 24bdd5083375b..74dd54a5ae0e6 100644
 --- a/widget/gtk/nsAppShell.cpp
 +++ b/widget/gtk/nsAppShell.cpp
-@@ -24,6 +24,7 @@
+@@ -24,6 +24,8 @@
  #  include "WakeLockListener.h"
  #endif
  #include "gfxPlatform.h"
 +#include "nsAppRunner.h"
++#include "mozilla/XREAppData.h"
  #include "ScreenHelperGTK.h"
  #include "HeadlessScreenHelper.h"
  #include "mozilla/widget/ScreenManager.h"
-@@ -175,13 +176,9 @@ nsresult nsAppShell::Init() {
+@@ -153,13 +155,9 @@ nsresult nsAppShell::Init() {
        // See https://bugzilla.gnome.org/show_bug.cgi?id=747634
        //
        // Only bother doing this for the parent process, since it's the one
@@ -54,6 +55,3 @@ index 163a93e2d1a4..4b6d45217671 100644
        }
      }
    }
--- 
-2.26.1
-
diff --git a/PKGBUILD b/PKGBUILD
index 9ee09e257bf..2c329d9a260 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -49,7 +49,7 @@ fi
 
 pkgname=firefox-beta
 _pkgname=firefox
-pkgver=89.0b1
+pkgver=89.0b2
 _major=${pkgver/rc*}
 _build=${pkgver/*rc}
 _pkgver=89.0
@@ -70,12 +70,12 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
 provides=("firefox=$pkgver")
 conflicts=('firefox-beta-bin')
 options=(!emptydirs !makeflags !strip)
-source=(https://ftp.mozilla.org/pub/firefox/candidates/89.0b1-candidates/build1/source/$_pkgname-$pkgver.source.tar.xz{,.asc}
+source=(https://ftp.mozilla.org/pub/firefox/candidates/${pkgver}-candidates/build1/source/$_pkgname-$pkgver.source.tar.xz{,.asc}
         0001-Use-remoting-name-for-GDK-application-names.patch
         $pkgname.desktop)
-sha256sums=('f259a3cf334dfcdeb603dc8d1a448197ba357b3182a6789e1ba81ac758266bf9'
+sha256sums=('a94da49d047267493714544dadfcc274a8fed389b1cceb4d67f7449dd5b402a3'
             'SKIP'
-            '3bb7463471fb43b2163a705a79a13a3003d70fff4bbe44f467807ca056de9a75'
+            '1b6814e85f13dcf069482ad1acfc1a099661922c85e3344aa4ee059288506ccc'
             '54d93249fedc9c4cdc5eb82da498b08f08bcb089f85a138b457f3251a0913ad1')
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release@mozilla.com>