From 37013f4e1e1f81ab191e896bdb356cf4b97bf99b Mon Sep 17 00:00:00 2001 From: Automatic Build System Date: Fri, 5 Jan 2024 22:19:12 +0100 Subject: [PATCH] automatic version update by autodist [release 84.0.1-1mamba;Thu Dec 24 2020] --- ...ting-names-for-gdk-application-names.patch | 56 ------------ ...ting-names-for-gdk-application-names.patch | 59 +++++++++++++ firefox.spec | 86 +++++++------------ 3 files changed, 88 insertions(+), 113 deletions(-) delete mode 100644 firefox-69.0-use-remoting-names-for-gdk-application-names.patch create mode 100644 firefox-77.0.1-use-remoting-names-for-gdk-application-names.patch diff --git a/firefox-69.0-use-remoting-names-for-gdk-application-names.patch b/firefox-69.0-use-remoting-names-for-gdk-application-names.patch deleted file mode 100644 index 8cc3786..0000000 --- a/firefox-69.0-use-remoting-names-for-gdk-application-names.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 1cab10b39cfda068100cab8c598f1ca0f50e4131 Mon Sep 17 00:00:00 2001 -Message-Id: <1cab10b39cfda068100cab8c598f1ca0f50e4131.1553597287.git.jan.steffens@gmail.com> -From: "Jan Alexander Steffens (heftig)" -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 - diff --git a/firefox-77.0.1-use-remoting-names-for-gdk-application-names.patch b/firefox-77.0.1-use-remoting-names-for-gdk-application-names.patch new file mode 100644 index 0000000..73ae042 --- /dev/null +++ b/firefox-77.0.1-use-remoting-names-for-gdk-application-names.patch @@ -0,0 +1,59 @@ +From 5025aab61517c8608b555ba929c61eb0706bd6bd Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" +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 | 11 ++++------- + 2 files changed, 5 insertions(+), 12 deletions(-) + +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 +@@ -3785,11 +3785,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" +@@ -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.26.1 + diff --git a/firefox.spec b/firefox.spec index e06c06a..b4d3e24 100644 --- a/firefox.spec +++ b/firefox.spec @@ -17,7 +17,7 @@ %define pkgver %(echo %version | tr . _) Name: firefox -Version: 76.0.1 +Version: 84.0.1 Release: 1mamba Epoch: 1 Summary: The next generation browsing technology from mozilla.org @@ -52,7 +52,7 @@ Patch9: firefox-42.0-build-add-freetype-system-wrapper.patch Patch10: firefox-43.0.4-fix-missing-PR_snprint.patch Patch11: firefox-47.0-gcc-6.1.0.patch Patch12: firefox-48.0.1-install_dir.patch -Patch13: firefox-69.0-use-remoting-names-for-gdk-application-names.patch +Patch13: firefox-77.0.1-use-remoting-names-for-gdk-application-names.patch Patch14: firefox-69.0.2-no-relinking.patch Patch15: firefox-70.0-fix-__warn_memset_zero_len.patch License: GPL, LGPL, MPL 1.1 @@ -116,10 +116,11 @@ BuildRequires: zip BuildRequires: unzip BuildRequires: bash BuildRequires: yasm -BuildRequires: rust-bin +BuildRequires: rustc BuildRequires: cbindgen BuildRequires: cbindgen BuildRequires: xorg-server-xvfb +BuildRequires: python-zstandard-py3 #BuildRequires: python-pygments252 BuildRequires: libcxx-devel Provides: xulrunner @@ -140,6 +141,8 @@ Obsoletes: xulrunner-devel Mofilla Firefox is the next generation browsing technology from mozilla.org. This package contains static libraries and header files needed for development. +#% debug_package + %prep %setup -q -n mozilla-release-FIREFOX_%{pkgver}_RELEASE #-D -T @@ -161,24 +164,27 @@ echo -n "AIzaSyBT3wXwxmFuUQcyeMyp0MbHHhhFwNfWKTc" >google-api-key cat > .mozconfig <.mozconfig mozconfig.base - <.mozconfig mozconfig.base - < ${OBJDIR}/dist/bin/browser/chrome/en-US/locale/branding/browserconfig.properties << EOF #browser.startup.homepage=%{default_browser_homepage} @@ -355,6 +323,7 @@ done # | %{__sed} -e "s,XULRUNNER_DIRECTORY,$(pkg-config --variable=libdir libxul),g" > \ # %{buildroot}%{_bindir}/firefox # +chmod 755 %{buildroot}%{firefoxappdir}/libxul.so #chmod 755 %{buildroot}%{_bindir}/firefox #install -pm 644 ./LICENSE %{buildroot}%{firefoxappdir}/ @@ -410,7 +379,7 @@ includedir=%{firefoxincludedir} Name: Mozilla Plug-In API Description: Mozilla Plug-In API -Version: 76.0.1 +Version: 84.0.1 Cflags: -I\${includedir} -DXP_UNIX _EOF @@ -1852,6 +1821,9 @@ Zulu language support for Firefox. #%{firefoxappdir}/browser/extensions/langpack-zu@firefox.mozilla.org.xpi %changelog +* Thu Dec 24 2020 Automatic Build System 84.0.1-1mamba +- automatic version update by autodist + * Mon May 18 2020 Automatic Build System 76.0.1-1mamba - automatic version update by autodist