From fd813cc5362c89f1dd3ff4cff5ed99db09b1d17c Mon Sep 17 00:00:00 2001
From: Danny Rawlins <contact@romster.me>
Date: Sat, 12 Mar 2022 17:30:57 +1100
Subject: firefox: 97.0.1 -> 98.0

---
 firefox/.signature                                 |  7 ++-
 ...e-remoting-name-for-GDK-application-names.patch | 57 ----------------------
 firefox/Pkgfile                                    |  8 +--
 3 files changed, 5 insertions(+), 67 deletions(-)
 delete mode 100644 firefox/0001-Use-remoting-name-for-GDK-application-names.patch

(limited to 'firefox')

diff --git a/firefox/.signature b/firefox/.signature
index 41f9d71c9..39f2699f3 100644
--- a/firefox/.signature
+++ b/firefox/.signature
@@ -1,7 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF31VD4lCm8lml0buic15ZeEnHRc/nv76EH5Dkixp3v0SwwaLO5u+U1bVkcAOiP9hbiP7+6lzkWSkJRgLofO1ETw8=
-SHA256 (Pkgfile) = 32032a728d81eefb8034bdf2cb6638fcac4fc052a775e7bd62c9ef892cad0859
+RWSagIOpLGJF30M7oZaZPF8Eb5xFDJy+OaiPkEKClkie3OgnowaZqA9Nv0L2ZVEsNcG4WF0h8DhK5unCEnqMWNWVdYcC6GaokQc=
+SHA256 (Pkgfile) = d80ea416f2e6293605d2246cca776f00cd3e06780e58ea74103ad0b943dcb44a
 SHA256 (.footprint) = c8226cc240304363b6289982601426f70c5cd4e82ac62feff3485bee4f48e050
-SHA256 (firefox-97.0.1.source.tar.xz) = 3f2c87cf28645130777e875ddc9c67e8994c8d5c859f425f3ddced6fecb78d45
+SHA256 (firefox-98.0.source.tar.xz) = fd0a4c11d007d9045706667eb0f99f9b7422945188424cb937bfef530cb6f4dd
 SHA256 (firefox.desktop) = 8ba3439f3dfc5cab883641969c93d8d15f8f20d7188d9568346b2edad52d6f91
-SHA256 (0001-Use-remoting-name-for-GDK-application-names.patch) = 8de6c0ecc70d2763936be6df4b91a3d2e806765bf510f987d6f2ffa2377c3f01
diff --git a/firefox/0001-Use-remoting-name-for-GDK-application-names.patch b/firefox/0001-Use-remoting-name-for-GDK-application-names.patch
deleted file mode 100644
index f30777294..000000000
--- a/firefox/0001-Use-remoting-name-for-GDK-application-names.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-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   | 12 +++++-------
- 2 files changed, 6 insertions(+), 12 deletions(-)
-
-diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index ce001e93821f..3be817c5cbd5 100644
---- a/toolkit/xre/nsAppRunner.cpp
-+++ b/toolkit/xre/nsAppRunner.cpp
-@@ -4348,11 +4348,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) {
-   // consistently.
- 
-   // Set program name to the one defined in application.ini.
--  {
--    nsAutoCString program(gAppData->name);
--    ToLowerCase(program);
--    g_set_prgname(program.get());
--  }
-+  g_set_prgname(gAppData->remotingName);
- 
-   // Initialize GTK here for splash.
- 
-diff --git a/widget/gtk/nsAppShell.cpp b/widget/gtk/nsAppShell.cpp
-index c8bbd9a373f5..a6a2186f20fb 100644
---- a/widget/gtk/nsAppShell.cpp
-+++ b/widget/gtk/nsAppShell.cpp
-@@ -27,6 +27,8 @@
- #  include "nsIObserverService.h"
- #endif
- #include "gfxPlatform.h"
-+#include "nsAppRunner.h"
-+#include "mozilla/XREAppData.h"
- #include "ScreenHelperGTK.h"
- #include "HeadlessScreenHelper.h"
- #include "mozilla/widget/ScreenManager.h"
-@@ -257,13 +259,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
--      // creating top-level windows. (At this point, a child process hasn't
--      // received the list of registered chrome packages, so the
--      // GetBrandShortName call would fail anyway.)
--      nsAutoString brandName;
--      mozilla::widget::WidgetUtils::GetBrandShortName(brandName);
--      if (!brandName.IsEmpty()) {
--        gdk_set_program_class(NS_ConvertUTF16toUTF8(brandName).get());
-+      // creating top-level windows.
-+      if (gAppData) {
-+        gdk_set_program_class(gAppData->remotingName);
-       }
-     }
-   }
diff --git a/firefox/Pkgfile b/firefox/Pkgfile
index 62b955385..112483122 100644
--- a/firefox/Pkgfile
+++ b/firefox/Pkgfile
@@ -5,18 +5,14 @@
 # Optional: sccache jack
 
 name=firefox
-version=97.0.1
+version=98.0
 release=1
 source=(https://archive.mozilla.org/pub/firefox/releases/$version/source/$name-$version.source.tar.xz
-	firefox.desktop
-	0001-Use-remoting-name-for-GDK-application-names.patch)
+	firefox.desktop)
 
 build() {
 	cd $name-$version
 
-	# https://bugzilla.mozilla.org/show_bug.cgi?id=1530052
-	patch -p1 -i $SRC/0001-Use-remoting-name-for-GDK-application-names.patch
-
 	if [ "$(/usr/bin/python3 -c "import sys; print(sys.stdout.encoding)")" != 'utf-8' ]; then
 		printf "\e[031mError: set an UTF-8 locale to compile this!\033[0m\n"
 		exit 1
-- 
cgit v1.2.3