[arch-commits] Commit in firefox-developer-edition/trunk (3 files)
Andrew Crerar
andrewsc at archlinux.org
Tue Dec 15 20:20:10 UTC 2020
Date: Tuesday, December 15, 2020 @ 20:20:09
Author: andrewsc
Revision: 776169
upgpkg: firefox-developer-edition 85.0b1-1
Added:
firefox-developer-edition/trunk/0001-Use-remoting-name-for-GDK-application-names.patch
Modified:
firefox-developer-edition/trunk/PKGBUILD
Deleted:
firefox-developer-edition/trunk/0001_Use_remoting_name_for_GDK_application_names.patch
--------------------------------------------------------+
0001-Use-remoting-name-for-GDK-application-names.patch | 57 +++++++++++++++
0001_Use_remoting_name_for_GDK_application_names.patch | 48 ------------
PKGBUILD | 10 +-
3 files changed, 62 insertions(+), 53 deletions(-)
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-12-15 20:20:09 UTC (rev 776169)
@@ -0,0 +1,57 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at 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 d944ce905cbe3..9a50545bfafcb 100644
+--- a/toolkit/xre/nsAppRunner.cpp
++++ b/toolkit/xre/nsAppRunner.cpp
+@@ -4161,11 +4161,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 cfe022e65d820..c228237830e43 100644
+--- a/widget/gtk/nsAppShell.cpp
++++ b/widget/gtk/nsAppShell.cpp
+@@ -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"
+@@ -159,13 +161,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);
+ }
+ }
+ }
Deleted: 0001_Use_remoting_name_for_GDK_application_names.patch
===================================================================
--- 0001_Use_remoting_name_for_GDK_application_names.patch 2020-12-15 20:20:08 UTC (rev 776168)
+++ 0001_Use_remoting_name_for_GDK_application_names.patch 2020-12-15 20:20:09 UTC (rev 776169)
@@ -1,48 +0,0 @@
-# HG changeset patch
-# User Andrew Crerar <andrew at crerar.io>
-# 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-12-15 20:20:08 UTC (rev 776168)
+++ PKGBUILD 2020-12-15 20:20:09 UTC (rev 776169)
@@ -2,7 +2,7 @@
# Contributor: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
pkgname=firefox-developer-edition
-pkgver=84.0b8
+pkgver=85.0b1
pkgrel=1
pkgdesc="Developer Edition of the popular Firefox web browser"
arch=('x86_64')
@@ -21,12 +21,12 @@
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=('3dd91be90f5e258757072ebe778d3fca578d97170e26fa1f7fab555ca5d9f4c776995d6fee480c15004479f8f8ca6d64f01ef6daa20da5f015aa07c1cf5c249b'
+sha512sums=('6714afd46a9c17b84b79ab8c2ebc7d3ca5468030c16b53f0b98a092823e9b96dc8ea2a576a97f7e48a2cf49dea7c1cf92691d52a50841f011443fb77e8b590f9'
'SKIP'
'b66dbe7f262d036e5a5b895ab5b0dbb03313bca18b0823c001ef2dbaeb1a33169b57db0cf4dfd268499f28913845119902b5d62e8a6a9cc4820eb0ee2f322a1e'
- '812f0f34d16472a305ad78b5b22f4d0ef0ac63e47e10700954f4e3374cfe25d596a9ef137ea48a421128d504affb653cf310bd3c33bc313d505924f8f392ad8f'
+ '8df3228209334aaaddec9c761c063e61ebbf3e75c6b249db9347dc4cabb79d912ccc8abdcfe4fab63387f2a0e09b4f3c9edf3b7e25aa0fd00ee56bcc7e9dde2c'
'3b42fe7dc8f53952330e57f1e85b46c5bd4b0c4ebc2796e0f5230446d10a67cf0fcbaadcbbb30888a99d43ca888a4e753aa5ddfbf93269cc22a6f640ba611ea3')
validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release at mozilla.com>
@@ -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
More information about the arch-commits
mailing list