Date: Thursday, May 7, 2020 @ 21:41:51 Author: andrewsc Revision: 625497
upgpkg: firefox-developer-edition 77.0b2-1 - Added additional MimeTypes - Updated remoting name patch Added: firefox-developer-edition/trunk/0001_Use_remoting_name_for_GDK_application_names.patch Modified: firefox-developer-edition/trunk/PKGBUILD firefox-developer-edition/trunk/firefox-developer-edition.desktop Deleted: firefox-developer-edition/trunk/0001-Use-remoting-name-for-GDK-application-names.patch --------------------------------------------------------+ 0001-Use-remoting-name-for-GDK-application-names.patch | 56 --------------- 0001_Use_remoting_name_for_GDK_application_names.patch | 48 ++++++++++++ PKGBUILD | 12 +-- firefox-developer-edition.desktop | 2 4 files changed, 55 insertions(+), 63 deletions(-) Deleted: 0001-Use-remoting-name-for-GDK-application-names.patch =================================================================== --- 0001-Use-remoting-name-for-GDK-application-names.patch 2020-05-07 21:32:35 UTC (rev 625496) +++ 0001-Use-remoting-name-for-GDK-application-names.patch 2020-05-07 21:41:51 UTC (rev 625497) @@ -1,56 +0,0 @@ -From 1cab10b39cfda068100cab8c598f1ca0f50e4131 Mon Sep 17 00:00:00 2001 -Message-Id: <1cab10b39cfda068100cab8c598f1ca0f50e4131.1553597287.git.jan.steff...@gmail.com> -From: "Jan Alexander Steffens (heftig)" <[email protected]> -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 | 7 +++---- - 2 files changed, 4 insertions(+), 9 deletions(-) - -diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp -index 0b808ef215f06..28911c0ffeaec 100644 ---- a/toolkit/xre/nsAppRunner.cpp -+++ b/toolkit/xre/nsAppRunner.cpp -@@ -3728,11 +3728,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 0686ff814916b..ae4a4ea55f420 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" -@@ -171,10 +172,8 @@ nsresult nsAppShell::Init() { - // option when program uses gdk_set_program_class(). - // - // See https://bugzilla.gnome.org/show_bug.cgi?id=747634 -- nsAutoString brandName; -- mozilla::widget::WidgetUtils::GetBrandShortName(brandName); -- if (!brandName.IsEmpty()) { -- gdk_set_program_class(NS_ConvertUTF16toUTF8(brandName).get()); -+ if (gAppData) { -+ gdk_set_program_class(gAppData->remotingName); - } - } - --- -2.21.0 - Added: 0001_Use_remoting_name_for_GDK_application_names.patch =================================================================== --- 0001_Use_remoting_name_for_GDK_application_names.patch (rev 0) +++ 0001_Use_remoting_name_for_GDK_application_names.patch 2020-05-07 21:41:51 UTC (rev 625497) @@ -0,0 +1,48 @@ +# HG changeset patch +# User Andrew Crerar <[email protected]> +# Date 1588883129 14400 +# Thu May 07 16:25:29 2020 -0400 +# Node ID 9970281ae22ce7cad35870ef91d27149ec7e9879 +# Parent c9a2a8be0647d05e5f354794c3e7b7298cdbe26f +Use remoting name for GDK application names + +diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp +--- a/toolkit/xre/nsAppRunner.cpp ++++ b/toolkit/xre/nsAppRunner.cpp +@@ -3703,11 +3703,7 @@ + // 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 +--- 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" +@@ -178,10 +179,8 @@ + // 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()); ++ if (gAppData) { ++ gdk_set_program_class(gAppData->remotingName); + } + } + } Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-05-07 21:32:35 UTC (rev 625496) +++ PKGBUILD 2020-05-07 21:41:51 UTC (rev 625497) @@ -2,7 +2,7 @@ # Contributor: Jan Alexander Steffens (heftig) <[email protected]> pkgname=firefox-developer-edition -pkgver=76.0b8 +pkgver=77.0b2 pkgrel=1 pkgdesc="Developer Edition of the popular Firefox web browser" arch=('x86_64') @@ -21,13 +21,13 @@ options=(!emptydirs !makeflags !strip) source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc} firefox-install-dir.patch - 0001-Use-remoting-name-for-GDK-application-names.patch + 0001_Use_remoting_name_for_GDK_application_names.patch "$pkgname".desktop) -sha512sums=('06c66be36391827fe8f0767fc61ddbf1e4effa1d3c851a2801f2402285318491993a4912ef295233b5caa46a5a4e2aae602f4b45e9f24fc05961ca37b4779d03' +sha512sums=('8f8b802fc6082b8af951232ea1a13663da2afa40e8c23fcf0bacb97fa1fe1f5cb1dc0125e3dc7801b31986e1daf711c71876b5aeb55f152dff4aa4aeec55b1ac' 'SKIP' 'b66dbe7f262d036e5a5b895ab5b0dbb03313bca18b0823c001ef2dbaeb1a33169b57db0cf4dfd268499f28913845119902b5d62e8a6a9cc4820eb0ee2f322a1e' - '40c931b8abbe5880122dbcc93d457e04e9b4f2bc3e0275e9e3e35dd347fe0658f9446c89e99553203be8a8c9ab6f4ca872a7aedc514920c107b9235c04df91dc' - 'c212158fe76b1e6228adba9214e2881458b81f38564149719dd18b121f962285bf54603a5bea93c27cb09be851b1d70091a2ce2eb5294c9d75f7619e06d549be') + '812f0f34d16472a305ad78b5b22f4d0ef0ac63e47e10700954f4e3374cfe25d596a9ef137ea48a421128d504affb653cf310bd3c33bc313d505924f8f392ad8f' + '3b42fe7dc8f53952330e57f1e85b46c5bd4b0c4ebc2796e0f5230446d10a67cf0fcbaadcbbb30888a99d43ca888a4e753aa5ddfbf93269cc22a6f640ba611ea3') validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <[email protected]> # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) @@ -48,7 +48,7 @@ patch -Np1 -i ../firefox-install-dir.patch # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052 - patch -Np1 -i ../0001-Use-remoting-name-for-GDK-application-names.patch + patch -Np1 -i ../0001_Use_remoting_name_for_GDK_application_names.patch echo -n "$_google_api_key" > google-api-key echo -n "$_mozilla_api_key" > mozilla-api-key Modified: firefox-developer-edition.desktop =================================================================== --- firefox-developer-edition.desktop 2020-05-07 21:32:35 UTC (rev 625496) +++ firefox-developer-edition.desktop 2020-05-07 21:41:51 UTC (rev 625497) @@ -117,7 +117,7 @@ Terminal=false X-MultipleArgs=false Type=Application -MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;application/x-xpinstall; +MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;application/x-xpinstall;application/pdf;application/json; StartupNotify=true StartupWMClass=firefoxdeveloperedition Categories=Network;WebBrowser;
