[crux-commits] ports/contrib (3.5): firefox: 76.0.1 -> 77.0.1

crux at crux.nu crux at crux.nu
Sun Jun 7 00:45:45 UTC 2020


commit d2456b01dcbc8bf826d37bcb7e1def963830b912
Author: Danny Rawlins <monster.romster at gmail.com>
Date:   Sun Jun 7 10:44:45 2020 +1000

    firefox: 76.0.1 -> 77.0.1

diff --git a/firefox/.signature b/firefox/.signature
index 038bbfe74..9963ad93a 100644
--- a/firefox/.signature
+++ b/firefox/.signature
@@ -1,8 +1,7 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF35aYmjmNq4uKjcMury/m6O4yFyQWjsSb/31oO3EbixxavLTwL8MqoGVp5b+hOqnKxk47eyeQOwqN+CMZMVICkwI=
-SHA256 (Pkgfile) = 6a6df02c826037bf2542016baebfb63aa4c807de7e64a56de040f00091d1f099
+RWSagIOpLGJF30qvJJFhIAqVOw9Ycs/X7KDfoNAClW6wGaF5Wa0DSdXZXHTkQB0AXzMY2kwROWmNrXHO4Fdu8tbDA0PvhQjm/AQ=
+SHA256 (Pkgfile) = 88104f5fe3030058b33902d0ee5d30ca304aa958d6526c5598de9315c9b7e3d0
 SHA256 (.footprint) = 8b8bebe1e51e7e8d82a57e60b95e4fd85c806ecbcbb15ad1774730025ba0e931
-SHA256 (firefox-76.0.1.source.tar.xz) = f61761e32774a6bdfedd5937c4992fbe5e24c3df057c2b9a559fcd0d038777c3
+SHA256 (firefox-77.0.1.source.tar.xz) = 54256fc5f8e9c2e8129ef84773fae31fcfdaf95da6d4d03151f3939e9f749640
 SHA256 (firefox.desktop) = 8ba3439f3dfc5cab883641969c93d8d15f8f20d7188d9568346b2edad52d6f91
-SHA256 (0001-Use-remoting-name-for-GDK-application-names.patch) = 5f7ac724a5c5afd9322b1e59006f4170ea5354ca1e0e60dab08b7784c2d8463c
-SHA256 (fix-unicode-errors.patch) = 47fa576aa3e2dcb1f1d48fa504893bcbe31e7a5fef7c1f2e84570a2692c6794d
+SHA256 (0001-Use-remoting-name-for-GDK-application-names.patch) = 3bb7463471fb43b2163a705a79a13a3003d70fff4bbe44f467807ca056de9a75
diff --git a/firefox/0001-Use-remoting-name-for-GDK-application-names.patch b/firefox/0001-Use-remoting-name-for-GDK-application-names.patch
index 165a532f4..73ae042cc 100644
--- a/firefox/0001-Use-remoting-name-for-GDK-application-names.patch
+++ b/firefox/0001-Use-remoting-name-for-GDK-application-names.patch
@@ -1,18 +1,18 @@
-From 83f234464554c7f4393cd1dbdeb3a68d3ae0ccae Mon Sep 17 00:00:00 2001
+From 5025aab61517c8608b555ba929c61eb0706bd6bd 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   | 7 +++----
- 2 files changed, 4 insertions(+), 9 deletions(-)
+ toolkit/xre/nsAppRunner.cpp |  6 +-----
+ widget/gtk/nsAppShell.cpp   | 11 ++++-------
+ 2 files changed, 5 insertions(+), 12 deletions(-)
 
 diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index 984b998133bd..b6c9f013940c 100644
+index da8289200e72..452195b146f3 100644
 --- a/toolkit/xre/nsAppRunner.cpp
 +++ b/toolkit/xre/nsAppRunner.cpp
-@@ -3746,11 +3746,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) {
+@@ -3785,11 +3785,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) {
    // consistently.
  
    // Set program name to the one defined in application.ini.
@@ -26,7 +26,7 @@ index 984b998133bd..b6c9f013940c 100644
    // Initialize GTK here for splash.
  
 diff --git a/widget/gtk/nsAppShell.cpp b/widget/gtk/nsAppShell.cpp
-index 0daa78fdbbad..49038d0bb1c8 100644
+index 163a93e2d1a4..4b6d45217671 100644
 --- a/widget/gtk/nsAppShell.cpp
 +++ b/widget/gtk/nsAppShell.cpp
 @@ -24,6 +24,7 @@
@@ -37,19 +37,23 @@ index 0daa78fdbbad..49038d0bb1c8 100644
  #include "ScreenHelperGTK.h"
  #include "HeadlessScreenHelper.h"
  #include "mozilla/widget/ScreenManager.h"
-@@ -175,10 +176,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);
+@@ -175,13 +176,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);
+       }
      }
    }
- 
 -- 
-2.24.0
+2.26.1
 
diff --git a/firefox/Pkgfile b/firefox/Pkgfile
index 88ca2a30a..3d5c06661 100644
--- a/firefox/Pkgfile
+++ b/firefox/Pkgfile
@@ -5,22 +5,18 @@
 # Optional: sccache
 
 name=firefox
-version=76.0.1
+version=77.0.1
 release=1
 source=(https://ftp.mozilla.org/pub/firefox/releases/$version/source/firefox-$version.source.tar.xz
 	firefox.desktop
-	0001-Use-remoting-name-for-GDK-application-names.patch
-	fix-unicode-errors.patch)
- 
+	0001-Use-remoting-name-for-GDK-application-names.patch)
+
 build() {
 	cd firefox-$version
 
 	# https://bugzilla.mozilla.org/show_bug.cgi?id=1530052
 	patch -p1 -i $SRC/0001-Use-remoting-name-for-GDK-application-names.patch
 
-	# https://bugzilla.mozilla.org/show_bug.cgi?id=1532169
-	patch -p1 -i $SRC/fix-unicode-errors.patch
-
 	if [ $(/usr/bin/python -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
diff --git a/firefox/fix-unicode-errors.patch b/firefox/fix-unicode-errors.patch
deleted file mode 100644
index 657785f6c..000000000
--- a/firefox/fix-unicode-errors.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -pruN firefox-75.0.orig/python/mozbuild/mozbuild/controller/building.py firefox-75.0/python/mozbuild/mozbuild/controller/building.py
---- firefox-75.0.orig/python/mozbuild/mozbuild/controller/building.py	2020-04-10 14:06:41.934514666 +1000
-+++ firefox-75.0/python/mozbuild/mozbuild/controller/building.py	2020-04-10 14:11:07.421260179 +1000
-@@ -586,7 +586,7 @@ class TerminalLoggingHandler(logging.Han
-             if self.footer:
-                 self.footer.clear()
- 
--            self.fh.write(msg)
-+            self.fh.write(msg.encode("utf-8"))
-             self.fh.write('\n')
- 
-             if self.footer:


More information about the crux-commits mailing list