Update

3 files changed, 4 insertions, 61 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 241b5460046d..7c431ab61c8c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -68,7 +68,6 @@ pkgbase = librewolf-nightly
 	source_x86_64 = remove_addons.patch
 	source_x86_64 = context-menu.patch
 	source_x86_64 = mozilla-vpn-ad.patch
-	source_x86_64 = 0001-Use-remoting-name-for-GDK-application-names.patch
 	sha512sums_x86_64 = SKIP
 	sha512sums_x86_64 = 65240292835fd82f35b6618ad6aa3ea62a22f6ff7a1675a1054097c6645f9df969ca317a554d4a05a261f41741326234e608f8accf2d8b5effb87e27885e38d1
 	sha512sums_x86_64 = SKIP
@@ -76,7 +75,6 @@ pkgbase = librewolf-nightly
 	sha512sums_x86_64 = 861e692daf2be7239eb6b61435688a7abed2bef198067f5b3a9c1a44d8316d1e547c06e1bfb45be402c4c38b1bf13018ba594d433c1b70da6296bd5b90b0fbe3
 	sha512sums_x86_64 = 5f7da8d54065c009f94c60eb9aa99d4d44d75b27800bcad5e9f2a365e0c853cb234c871c54855522598b1fe26669bd42a302705ac385d536c90f4ec199cf1df6
 	sha512sums_x86_64 = 43d008c63a6b90a3710c4e1bf6ccebcb0987316213fa993fd1bd4b47d9a5d553f51471467c9d9ab454911b9d6fb575e3035cd7a3f9e61dbb72fe3b0a3b20a066
-	sha512sums_x86_64 = 515141576862877fdaa51f8a1a902e287ebb773c86c18cb9481e0e490cb59a06e0bdead6197d5de9f2a86232bb7832b1d47636289c0d88738ef4ed314901b51d
 	source_aarch64 = hg+https://hg.mozilla.org/mozilla-unified#revision=autoland
 	source_aarch64 = librewolf-nightly.desktop
 	source_aarch64 = git+https://gitlab.com/vnepogodin/librewolf-common.git
@@ -86,7 +84,6 @@ pkgbase = librewolf-nightly
 	source_aarch64 = arm.patch
 	source_aarch64 = build-arm-libopus.patch
 	source_aarch64 = mozilla-vpn-ad.patch
-	source_aarch64 = 0001-Use-remoting-name-for-GDK-application-names.patch
 	sha512sums_aarch64 = SKIP
 	sha512sums_aarch64 = 65240292835fd82f35b6618ad6aa3ea62a22f6ff7a1675a1054097c6645f9df969ca317a554d4a05a261f41741326234e608f8accf2d8b5effb87e27885e38d1
 	sha512sums_aarch64 = SKIP
@@ -96,7 +93,6 @@ pkgbase = librewolf-nightly
 	sha512sums_aarch64 = 7c2f0c792eb5744eaf0f2ee7c0887a74118796d691029e824451b063d5ba9e65626617ad343f69837297b2002446e02ac1d5ab3bc470419ae092424abf08293f
 	sha512sums_aarch64 = 6d464cce32cb2e440fb137666aeefec1240bcbdfdef0e8633e0fbe22e2214446b2c992ee2c8716c682a42fcd1d66d9fdf1d6d5b40f8ec3b0eeec5ca9e3f1aa35
 	sha512sums_aarch64 = 43d008c63a6b90a3710c4e1bf6ccebcb0987316213fa993fd1bd4b47d9a5d553f51471467c9d9ab454911b9d6fb575e3035cd7a3f9e61dbb72fe3b0a3b20a066
-	sha512sums_aarch64 = 515141576862877fdaa51f8a1a902e287ebb773c86c18cb9481e0e490cb59a06e0bdead6197d5de9f2a86232bb7832b1d47636289c0d88738ef4ed314901b51d
 
 pkgname = librewolf-nightly
 
diff --git a/0001-Use-remoting-name-for-GDK-application-names.patch b/0001-Use-remoting-name-for-GDK-application-names.patch
deleted file mode 100644
index bca0879f3b48..000000000000
--- a/0001-Use-remoting-name-for-GDK-application-names.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index da8289200e72..452195b146f3 100644
---- a/toolkit/xre/nsAppRunner.cpp
-+++ b/toolkit/xre/nsAppRunner.cpp
-@@ -4358,11 +4358,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 163a93e2d1a4..4b6d45217671 100644
---- a/widget/gtk/nsAppShell.cpp
-+++ b/widget/gtk/nsAppShell.cpp
-@@ -24,6 +24,7 @@
- #  include "WakeLockListener.h"
- #endif
- #include "gfxPlatform.h"
-+#include "nsAppRunner.h"
- #include "ScreenHelperGTK.h"
- #include "HeadlessScreenHelper.h"
- #include "mozilla/widget/ScreenManager.h"
-@@ -153,13 +154,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/PKGBUILD b/PKGBUILD
index 852c34ad82f2..9a2c13a373d4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -39,8 +39,7 @@ source_x86_64=("hg+$_repo#revision=autoland"
                "git+https://gitlab.com/vnepogodin/librewolf-settings.git"
                remove_addons.patch
                context-menu.patch
-               mozilla-vpn-ad.patch
-               0001-Use-remoting-name-for-GDK-application-names.patch)
+               mozilla-vpn-ad.patch)
 source_aarch64=("hg+$_repo#revision=autoland"
                 $pkgname.desktop
                 "git+https://gitlab.com/vnepogodin/librewolf-common.git"
@@ -49,8 +48,7 @@ source_aarch64=("hg+$_repo#revision=autoland"
                 context-menu.patch
                 arm.patch
                 build-arm-libopus.patch
-                mozilla-vpn-ad.patch
-                0001-Use-remoting-name-for-GDK-application-names.patch)
+                mozilla-vpn-ad.patch)
 
 sha512sums_x86_64=('SKIP'
                    '65240292835fd82f35b6618ad6aa3ea62a22f6ff7a1675a1054097c6645f9df969ca317a554d4a05a261f41741326234e608f8accf2d8b5effb87e27885e38d1'
@@ -58,8 +56,7 @@ sha512sums_x86_64=('SKIP'
                    'SKIP'
                    '861e692daf2be7239eb6b61435688a7abed2bef198067f5b3a9c1a44d8316d1e547c06e1bfb45be402c4c38b1bf13018ba594d433c1b70da6296bd5b90b0fbe3'
                    '5f7da8d54065c009f94c60eb9aa99d4d44d75b27800bcad5e9f2a365e0c853cb234c871c54855522598b1fe26669bd42a302705ac385d536c90f4ec199cf1df6'
-                   '43d008c63a6b90a3710c4e1bf6ccebcb0987316213fa993fd1bd4b47d9a5d553f51471467c9d9ab454911b9d6fb575e3035cd7a3f9e61dbb72fe3b0a3b20a066'
-                   '515141576862877fdaa51f8a1a902e287ebb773c86c18cb9481e0e490cb59a06e0bdead6197d5de9f2a86232bb7832b1d47636289c0d88738ef4ed314901b51d')
+                   '43d008c63a6b90a3710c4e1bf6ccebcb0987316213fa993fd1bd4b47d9a5d553f51471467c9d9ab454911b9d6fb575e3035cd7a3f9e61dbb72fe3b0a3b20a066')
 sha512sums_aarch64=('SKIP'
                     '65240292835fd82f35b6618ad6aa3ea62a22f6ff7a1675a1054097c6645f9df969ca317a554d4a05a261f41741326234e608f8accf2d8b5effb87e27885e38d1'
                     'SKIP'
@@ -68,8 +65,7 @@ sha512sums_aarch64=('SKIP'
                     '5f7da8d54065c009f94c60eb9aa99d4d44d75b27800bcad5e9f2a365e0c853cb234c871c54855522598b1fe26669bd42a302705ac385d536c90f4ec199cf1df6'
                     '7c2f0c792eb5744eaf0f2ee7c0887a74118796d691029e824451b063d5ba9e65626617ad343f69837297b2002446e02ac1d5ab3bc470419ae092424abf08293f'
                     '6d464cce32cb2e440fb137666aeefec1240bcbdfdef0e8633e0fbe22e2214446b2c992ee2c8716c682a42fcd1d66d9fdf1d6d5b40f8ec3b0eeec5ca9e3f1aa35'
-                    '43d008c63a6b90a3710c4e1bf6ccebcb0987316213fa993fd1bd4b47d9a5d553f51471467c9d9ab454911b9d6fb575e3035cd7a3f9e61dbb72fe3b0a3b20a066'
-                    '515141576862877fdaa51f8a1a902e287ebb773c86c18cb9481e0e490cb59a06e0bdead6197d5de9f2a86232bb7832b1d47636289c0d88738ef4ed314901b51d')
+                    '43d008c63a6b90a3710c4e1bf6ccebcb0987316213fa993fd1bd4b47d9a5d553f51471467c9d9ab454911b9d6fb575e3035cd7a3f9e61dbb72fe3b0a3b20a066')
 
 pkgver() {
   cd mozilla-unified
@@ -182,9 +178,6 @@ ac_add_options --enable-optimize
 END
 fi
 
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052
-  patch -Np1 -i ../0001-Use-remoting-name-for-GDK-application-names.patch
-
   # Remove some pre-installed addons that might be questionable
   patch -p1 -i ../remove_addons.patch