From 615f0e0f2e57ec398e93ba6d4aeec02e6e731e9d Mon Sep 17 00:00:00 2001 From: Liwei Ge Date: Sat, 2 Jul 2022 19:55:43 +0800 Subject: [PATCH 1/2] update to firefox-91.11.0-2.el8_6.src.rpm Signed-off-by: Liwei Ge --- D110204-fscreen.diff | 20 ++++++------ download | 4 +-- ...refs.js => firefox-redhat-default-prefs.js | 8 ++--- firefox.spec | 32 +++++++++++-------- 4 files changed, 34 insertions(+), 30 deletions(-) rename firefox-anolis-default-prefs.js => firefox-redhat-default-prefs.js (87%) diff --git a/D110204-fscreen.diff b/D110204-fscreen.diff index 99eeb3b..ce4c908 100644 --- a/D110204-fscreen.diff +++ b/D110204-fscreen.diff @@ -1,6 +1,5 @@ -diff -up firefox-91.0/widget/gtk/nsWindow.cpp.D110204-fscreen.diff firefox-91.0/widget/gtk/nsWindow.cpp ---- firefox-91.0/widget/gtk/nsWindow.cpp.D110204-fscreen.diff 2021-07-27 23:31:38.000000000 +0200 -+++ firefox-91.0/widget/gtk/nsWindow.cpp 2021-07-30 15:47:22.031795569 +0200 +--- firefox-91.11.0/widget/gtk/nsWindow.cpp.D110204-fscreen.diff 2022-06-20 21:18:51.000000000 +0200 ++++ firefox-91.11.0/widget/gtk/nsWindow.cpp 2022-06-21 12:21:44.892706641 +0200 @@ -91,6 +91,7 @@ #include "SystemTimeConverter.h" #include "WidgetUtilsGtk.h" @@ -17,7 +16,7 @@ diff -up firefox-91.0/widget/gtk/nsWindow.cpp.D110204-fscreen.diff firefox-91.0/ mAspectRatio(0.0f), mAspectRatioSaved(0.0f), mLastScrollEventTime(GDK_CURRENT_TIME), -@@ -4626,6 +4628,19 @@ void nsWindow::OnWindowStateEvent(GtkWid +@@ -4618,6 +4620,19 @@ void nsWindow::OnWindowStateEvent(GtkWid ClearTransparencyBitmap(); } } @@ -37,7 +36,7 @@ diff -up firefox-91.0/widget/gtk/nsWindow.cpp.D110204-fscreen.diff firefox-91.0/ } void nsWindow::OnDPIChanged() { -@@ -6880,6 +6895,19 @@ nsresult nsWindow::MakeFullScreen(bool a +@@ -6860,6 +6875,19 @@ nsresult nsWindow::MakeFullScreen(bool a } } @@ -57,14 +56,13 @@ diff -up firefox-91.0/widget/gtk/nsWindow.cpp.D110204-fscreen.diff firefox-91.0/ gtk_window_fullscreen(GTK_WINDOW(mShell)); } else { mSizeMode = mLastSizeMode; -diff -up firefox-91.0/widget/gtk/nsWindow.h.D110204-fscreen.diff firefox-91.0/widget/gtk/nsWindow.h ---- firefox-91.0/widget/gtk/nsWindow.h.D110204-fscreen.diff 2021-07-27 23:31:38.000000000 +0200 -+++ firefox-91.0/widget/gtk/nsWindow.h 2021-07-29 18:35:41.000639386 +0200 -@@ -763,6 +763,7 @@ class nsWindow final : public nsBaseWidg - * move-to-rect callback we store it to mNewSizeAfterMoveToRect. +--- firefox-91.11.0/widget/gtk/nsWindow.h.D110204-fscreen.diff 2022-06-21 12:21:44.894706636 +0200 ++++ firefox-91.11.0/widget/gtk/nsWindow.h 2022-06-21 12:25:20.985209461 +0200 +@@ -767,6 +767,7 @@ class nsWindow final : public nsBaseWidg + * move-to-rect callback we set mResizedAfterMoveToRect. */ bool mWaitingForMoveToRectCallback; + bool mPendingFullscreen; - LayoutDeviceIntRect mNewSizeAfterMoveToRect; + bool mResizedAfterMoveToRect; /** diff --git a/download b/download index 28637fc..6ce352d 100644 --- a/download +++ b/download @@ -1,5 +1,5 @@ 9030c1f285ee079a4c386e525e57a2b1 cbindgen-vendor.tar.xz -1c3ecf42b041923418598c9b5e0b4e73 firefox-91.10.0esr.processed-source.tar.xz -f7fa2dc2eba51adba1a63645153c079d firefox-langpacks-91.10.0esr-20220524.tar.xz +8dd8b60be6ddd63e5a703b9d6f83bb68 firefox-91.11.0esr.processed-source.tar.xz +9cb418769d632ed9b6ebed12bc70e499 firefox-langpacks-91.11.0esr-20220623.tar.xz 5b7e3326f4484ce1ab685e74f8477a26 nspr-4.32.0-1.el8_1.src.rpm 770fbbfb259e656b8f3879934137d10c nss-3.67.0-7.el8_1.src.rpm diff --git a/firefox-anolis-default-prefs.js b/firefox-redhat-default-prefs.js similarity index 87% rename from firefox-anolis-default-prefs.js rename to firefox-redhat-default-prefs.js index a02fa2a..9ead3a2 100644 --- a/firefox-anolis-default-prefs.js +++ b/firefox-redhat-default-prefs.js @@ -14,9 +14,9 @@ pref("browser.shell.checkDefaultBrowser", false); pref("network.manage-offline-status", true); pref("extensions.shownSelectionUI", true); pref("ui.SpellCheckerUnderlineStyle", 1); -pref("startup.homepage_override_url", "https://openanolis.cn/"); -pref("startup.homepage_welcome_url", "https://openanolis.cn/"); -pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=file:///usr/share/doc/HTML/index.html"); +pref("startup.homepage_override_url", "http://www.redhat.com"); +pref("startup.homepage_welcome_url", "http://www.redhat.com"); +pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=file:///%PREFIX%/share/doc/HTML/index.html"); pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%"); pref("media.gmp-gmpopenh264.provider.enabled",false); pref("media.gmp-gmpopenh264.autoupdate",false); @@ -32,4 +32,4 @@ pref("security.use_sqldb", false); /* Use OS settings for UI language */ pref("intl.locale.requested", ""); /* See https://bugzilla.redhat.com/show_bug.cgi?id=1672424 */ -pref("storage.nfs_filesystem", true); +pref("storage.nfs_filesystem", true); \ No newline at end of file diff --git a/firefox.spec b/firefox.spec index 418d8c1..40d136d 100644 --- a/firefox.spec +++ b/firefox.spec @@ -1,4 +1,3 @@ -%define anolis_release .0.1 %global disable_toolsets 0 %ifarch %{ix86} @@ -9,15 +8,15 @@ %{lua: function dist_to_rhel_minor(str, start) - match = string.match(str, ".module%+an8.%d+") + match = string.match(str, ".module%+el8.%d+") if match then return string.sub(match, 13) end - match = string.match(str, ".an8_%d+") + match = string.match(str, ".el8_%d+") if match then return string.sub(match, 6) end - match = string.match(str, ".an8") + match = string.match(str, ".el8") if match then return 7 end @@ -136,8 +135,8 @@ end} Summary: Mozilla Firefox Web browser Name: firefox -Version: 91.10.0 -Release: 1%{anolis_release}%{?dist} +Version: 91.11.0 +Release: 2%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ %if 0%{?rhel} == 9 @@ -161,13 +160,17 @@ ExcludeArch: aarch64 s390 ppc # Link to official tarball: https://hg.mozilla.org/releases/mozilla-release/archive/firefox-%%{version}%%{?pre_version}.source.tar.xz Source0: firefox-%{version}%{?pre_version}%{?buildnum}.processed-source.tar.xz %if %{build_langpacks} -Source1: firefox-langpacks-%{version}%{?pre_version}-20220524.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20220623.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball Source10: firefox-mozconfig -Source12: firefox-anolis-default-prefs.js +%if 0%{?centos} +Source12: firefox-centos-default-prefs.js +%else +Source12: firefox-redhat-default-prefs.js +%endif Source20: firefox.desktop Source21: firefox.sh.in Source23: firefox.1 @@ -330,7 +333,8 @@ Requires: nss >= %{nss_build_version} %endif BuildRequires: desktop-file-utils -Requires: anolis-indexhtml +BuildRequires: system-bookmarks +Requires: redhat-indexhtml %if %{?run_tests} BuildRequires: xorg-x11-server-Xvfb @@ -987,7 +991,7 @@ function install_rpms_to_current_dir() { %endif # set up our default bookmarks -# %{__cp} -p %{default_bookmarks_file} objdir/dist/bin/browser/chrome/en-US/locale/browser/bookmarks.html +%{__cp} -p %{default_bookmarks_file} objdir/dist/bin/browser/chrome/en-US/locale/browser/bookmarks.html # Make sure locale works for langpacks %{__cat} > objdir/dist/bin/browser/defaults/preferences/firefox-l10n.js << EOF @@ -1267,9 +1271,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Sat May 28 2022 Liwei Ge - 91.10.0-1.0.1 -- Add firefox-anolis-default-prefs.js -- Remove bookmarks +* Thu Jun 23 2022 Eike Rathke - 91.11.0-2 +- Update to 91.11.0 build2 + +* Tue Jun 21 2022 Eike Rathke - 91.11.0-1 +- Update to 91.11.0 build1 * Tue May 24 2022 Eike Rathke - 91.10.0-1 - Update to 91.10.0 build1 -- Gitee From cdef9941e4cac635f926887488c772738cafe6ff Mon Sep 17 00:00:00 2001 From: Zhao Hang Date: Thu, 16 Dec 2021 06:12:47 +0000 Subject: [PATCH 2/2] rebrand: add firefox-anolis-default-prefs.js --- ...refs.js => firefox-anolis-default-prefs.js | 8 +++---- firefox.spec | 24 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) rename firefox-redhat-default-prefs.js => firefox-anolis-default-prefs.js (87%) diff --git a/firefox-redhat-default-prefs.js b/firefox-anolis-default-prefs.js similarity index 87% rename from firefox-redhat-default-prefs.js rename to firefox-anolis-default-prefs.js index 9ead3a2..a02fa2a 100644 --- a/firefox-redhat-default-prefs.js +++ b/firefox-anolis-default-prefs.js @@ -14,9 +14,9 @@ pref("browser.shell.checkDefaultBrowser", false); pref("network.manage-offline-status", true); pref("extensions.shownSelectionUI", true); pref("ui.SpellCheckerUnderlineStyle", 1); -pref("startup.homepage_override_url", "http://www.redhat.com"); -pref("startup.homepage_welcome_url", "http://www.redhat.com"); -pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=file:///%PREFIX%/share/doc/HTML/index.html"); +pref("startup.homepage_override_url", "https://openanolis.cn/"); +pref("startup.homepage_welcome_url", "https://openanolis.cn/"); +pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=file:///usr/share/doc/HTML/index.html"); pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%"); pref("media.gmp-gmpopenh264.provider.enabled",false); pref("media.gmp-gmpopenh264.autoupdate",false); @@ -32,4 +32,4 @@ pref("security.use_sqldb", false); /* Use OS settings for UI language */ pref("intl.locale.requested", ""); /* See https://bugzilla.redhat.com/show_bug.cgi?id=1672424 */ -pref("storage.nfs_filesystem", true); \ No newline at end of file +pref("storage.nfs_filesystem", true); diff --git a/firefox.spec b/firefox.spec index 40d136d..1b223cc 100644 --- a/firefox.spec +++ b/firefox.spec @@ -1,3 +1,4 @@ +%define anolis_release .0.1 %global disable_toolsets 0 %ifarch %{ix86} @@ -8,15 +9,15 @@ %{lua: function dist_to_rhel_minor(str, start) - match = string.match(str, ".module%+el8.%d+") + match = string.match(str, ".module%+an8.%d+") if match then return string.sub(match, 13) end - match = string.match(str, ".el8_%d+") + match = string.match(str, ".an8_%d+") if match then return string.sub(match, 6) end - match = string.match(str, ".el8") + match = string.match(str, ".an8") if match then return 7 end @@ -136,7 +137,7 @@ end} Summary: Mozilla Firefox Web browser Name: firefox Version: 91.11.0 -Release: 2%{?dist} +Release: 2%{anolis_release}%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ %if 0%{?rhel} == 9 @@ -166,11 +167,7 @@ Source1: firefox-langpacks-%{version}%{?pre_version}-20220623.tar.xz Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball Source10: firefox-mozconfig -%if 0%{?centos} -Source12: firefox-centos-default-prefs.js -%else -Source12: firefox-redhat-default-prefs.js -%endif +Source12: firefox-anolis-default-prefs.js Source20: firefox.desktop Source21: firefox.sh.in Source23: firefox.1 @@ -333,8 +330,7 @@ Requires: nss >= %{nss_build_version} %endif BuildRequires: desktop-file-utils -BuildRequires: system-bookmarks -Requires: redhat-indexhtml +Requires: anolis-indexhtml %if %{?run_tests} BuildRequires: xorg-x11-server-Xvfb @@ -991,7 +987,7 @@ function install_rpms_to_current_dir() { %endif # set up our default bookmarks -%{__cp} -p %{default_bookmarks_file} objdir/dist/bin/browser/chrome/en-US/locale/browser/bookmarks.html +# %{__cp} -p %{default_bookmarks_file} objdir/dist/bin/browser/chrome/en-US/locale/browser/bookmarks.html # Make sure locale works for langpacks %{__cat} > objdir/dist/bin/browser/defaults/preferences/firefox-l10n.js << EOF @@ -1271,6 +1267,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Sat Jul 2 2022 Liwei Ge - 91.11.0-2.0.1 +- Add firefox-anolis-default-prefs.js +- Remove bookmarks + * Thu Jun 23 2022 Eike Rathke - 91.11.0-2 - Update to 91.11.0 build2 -- Gitee