From 25c5cc06d8d83d542c8c0a1cf80e275a5749eba8 Mon Sep 17 00:00:00 2001 From: lxpzlm Date: Thu, 2 Jun 2022 17:02:56 +0800 Subject: [PATCH 1/2] update to firefox-91.10.0-1.el8_6 Signed-off-by: lxpzlm --- download | 4 +- ...refs.js => firefox-redhat-default-prefs.js | 8 +-- firefox.spec | 31 ++++++----- mozilla-s390x-skia-gradient.patch | 52 ------------------- 4 files changed, 23 insertions(+), 72 deletions(-) rename firefox-anolis-default-prefs.js => firefox-redhat-default-prefs.js (87%) delete mode 100644 mozilla-s390x-skia-gradient.patch diff --git a/download b/download index 84ee633..28637fc 100644 --- a/download +++ b/download @@ -1,5 +1,5 @@ 9030c1f285ee079a4c386e525e57a2b1 cbindgen-vendor.tar.xz -a135ed443e0a90b552880362975feefa firefox-91.9.1esr.processed-source.tar.xz -e3c6397907f2e5bb1ac5948acf01495c firefox-langpacks-91.9.1esr-20220520.tar.xz +1c3ecf42b041923418598c9b5e0b4e73 firefox-91.10.0esr.processed-source.tar.xz +f7fa2dc2eba51adba1a63645153c079d firefox-langpacks-91.10.0esr-20220524.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 9ebe5d2..29815df 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.9.1 -Release: 1%{anolis_release}%{?dist} +Version: 91.10.0 +Release: 1%{?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}-20220520.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20220524.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 @@ -207,7 +210,7 @@ Patch510: mozilla-bmo1554971.patch Patch511: mozilla-bmo1602730.patch Patch512: mozilla-bmo849632.patch Patch513: mozilla-bmo998749.patch -Patch514: mozilla-s390x-skia-gradient.patch +#Patch514: mozilla-s390x-skia-gradient.patch Patch515: mozilla-bmo1626236.patch Patch518: D110204-fscreen.diff Patch519: expat-CVE-2022-25235.patch @@ -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,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Sat May 28 2022 Liwei Ge - 91.9.1-1.0.1 -- Add firefox-anolis-default-prefs.js -- Remove bookmarks +* Tue May 24 2022 Eike Rathke - 91.10.0-1 +- Update to 91.10.0 build1 * Fri May 20 2022 Jan Horak - 91.9.1-1 - Update to 91.9.1 build1 diff --git a/mozilla-s390x-skia-gradient.patch b/mozilla-s390x-skia-gradient.patch deleted file mode 100644 index 8c0e3bd..0000000 --- a/mozilla-s390x-skia-gradient.patch +++ /dev/null @@ -1,52 +0,0 @@ -# HG changeset patch -# Parent acf59ea86dd1d878b43920832093f082dcfc61c0 - -diff -r acf59ea86dd1 gfx/skia/skia/src/shaders/gradients/Sk4fLinearGradient.cpp ---- a/gfx/skia/skia/src/shaders/gradients/Sk4fLinearGradient.cpp Mon Mar 09 08:26:10 2020 +0100 -+++ b/gfx/skia/skia/src/shaders/gradients/Sk4fLinearGradient.cpp Fri Mar 27 13:30:28 2020 +0100 -@@ -7,7 +7,7 @@ - - #include "include/core/SkPaint.h" - #include "src/shaders/gradients/Sk4fLinearGradient.h" -- -+#include "src/core/SkEndian.h" - #include - #include - -@@ -28,6 +28,9 @@ - - while (n >= 4) { - DstTraits::store4x(c0, c1, c2, c3, dst, bias0, bias1); -+#ifdef SK_CPU_BENDIAN -+ SkEndianSwap32s(dst, 4); -+#endif - dst += 4; - - c0 = c0 + dc4; -@@ -37,12 +40,23 @@ - n -= 4; - } - if (n & 2) { -- DstTraits::store(c0, dst++, bias0); -- DstTraits::store(c1, dst++, bias1); -+ DstTraits::store(c0, dst, bias0); -+#ifdef SK_CPU_BENDIAN -+ *dst = SkEndianSwap32(*dst); -+#endif -+ ++dst; -+ DstTraits::store(c1, dst, bias1); -+#ifdef SK_CPU_BENDIAN -+ *dst = SkEndianSwap32(*dst); -+#endif -+ ++dst; - c0 = c0 + dc2; - } - if (n & 1) { - DstTraits::store(c0, dst, bias0); -+#ifdef SK_CPU_BENDIAN -+ *dst = SkEndianSwap32(*dst); -+#endif - } - } - - -- Gitee From db806b0dd00425b6deb2f8c87f872d00c2df94d7 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 --- firefox-redhat-default-prefs.js | 35 --------------------------------- firefox.spec | 24 +++++++++++----------- 2 files changed, 12 insertions(+), 47 deletions(-) delete mode 100644 firefox-redhat-default-prefs.js diff --git a/firefox-redhat-default-prefs.js b/firefox-redhat-default-prefs.js deleted file mode 100644 index 9ead3a2..0000000 --- a/firefox-redhat-default-prefs.js +++ /dev/null @@ -1,35 +0,0 @@ -pref("app.update.auto", false); -pref("app.update.enabled", false); -pref("app.update.autoInstallEnabled", false); -pref("general.smoothScroll", true); -pref("intl.locale.matchOS", true); -pref("toolkit.storage.synchronous", 0); -pref("toolkit.networkmanager.disable", false); -pref("offline.autoDetect", true); -pref("browser.backspace_action", 2); -pref("browser.display.use_system_colors", true); -pref("browser.download.folderList", 1); -pref("browser.link.open_external", 3); -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("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); -pref("media.gmp-gmpopenh264.enabled",false); -pref("media.gmp-gmpopenh264.enabled",false); -pref("plugins.notifyMissingFlash", false); -/* See https://bugzilla.redhat.com/show_bug.cgi?id=1226489 */ -pref("browser.display.use_system_colors", false); -pref("layers.use-image-offscreen-surfaces", false); -/* Allow sending credetials to all https:// sites */ -pref("network.negotiate-auth.trusted-uris", "https://"); -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 diff --git a/firefox.spec b/firefox.spec index 29815df..418d8c1 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.10.0 -Release: 1%{?dist} +Release: 1%{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}-20220524.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 May 28 2022 Liwei Ge - 91.10.0-1.0.1 +- Add firefox-anolis-default-prefs.js +- Remove bookmarks + * Tue May 24 2022 Eike Rathke - 91.10.0-1 - Update to 91.10.0 build1 -- Gitee