diff --git a/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch b/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch deleted file mode 100644 index 6dfe2ada2bcab17ecf2caf305034f76b6e4b6a96..0000000000000000000000000000000000000000 --- a/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up firefox-60.0/mfbt/LinuxSignal.h.mozilla-1238661 firefox-60.0/mfbt/LinuxSignal.h ---- firefox-60.0/mfbt/LinuxSignal.h.mozilla-1238661 2018-04-27 08:55:38.848241768 +0200 -+++ firefox-60.0/mfbt/LinuxSignal.h 2018-04-27 09:06:47.946769859 +0200 -@@ -22,7 +22,7 @@ __attribute__((naked)) void SignalTrampo - void* aContext) { - asm volatile("nop; nop; nop; nop" : : : "memory"); - -- asm volatile("b %0" : : "X"(H) : "memory"); -+ asm volatile("bx %0" : : "r"(H), "l"(aSignal), "l"(aInfo), "l"(aContext) : "memory"); - } - - # define MOZ_SIGNAL_TRAMPOLINE(h) (mozilla::SignalTrampoline) diff --git a/Bug-1526653---fix_user_vfp_armv7.patch b/Bug-1526653---fix_user_vfp_armv7.patch deleted file mode 100644 index 3f84f9522a28d2e40b3f23266d90f4f495347c02..0000000000000000000000000000000000000000 --- a/Bug-1526653---fix_user_vfp_armv7.patch +++ /dev/null @@ -1,35 +0,0 @@ -From fd6847c9416f9eebde636e21d794d25d1be8791d Mon Sep 17 00:00:00 2001 -From: Mike Hommey -Date: Sat, 1 Jun 2019 09:06:01 +0900 -Subject: [PATCH] Bug 1526653 - Include struct definitions for user_vfp and - user_vfp_exc. - ---- - js/src/wasm/WasmSignalHandlers.cpp | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/js/src/wasm/WasmSignalHandlers.cpp b/js/src/wasm/WasmSignalHandlers.cpp -index 636537f8478..383c380f04c 100644 ---- a/js/src/wasm/WasmSignalHandlers.cpp -+++ b/js/src/wasm/WasmSignalHandlers.cpp -@@ -248,7 +248,16 @@ using mozilla::DebugOnly; - #endif - - #ifdef WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS --# include -+struct user_vfp { -+ unsigned long long fpregs[32]; -+ unsigned long fpscr; -+}; -+ -+struct user_vfp_exc { -+ unsigned long fpexc; -+ unsigned long fpinst; -+ unsigned long fpinst2; -+}; - #endif - - #if defined(ANDROID) --- -2.20.1 - diff --git a/download b/download new file mode 100644 index 0000000000000000000000000000000000000000..0e7309affc47ab2dfa8c883bee016f41a50fc17e --- /dev/null +++ b/download @@ -0,0 +1 @@ +c9f2564d7ee920f269434494b24ea440 firefox-91.8.0esr.processed-source.tar.xz diff --git a/firefox-91.7.0esr.processed-source.tar.xz b/firefox-91.7.0esr.processed-source.tar.xz deleted file mode 100644 index c3ae5ce040aa7b5299bb266e40bec585b77fcf3c..0000000000000000000000000000000000000000 --- a/firefox-91.7.0esr.processed-source.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b95c5d7185277d2728ad3811a52b61bd66963a22dac8abce7be17793b2e21008 -size 387161956 diff --git a/firefox-langpacks-91.7.0esr-20220307.tar.xz b/firefox-langpacks-91.8.0esr-20220405.tar.xz similarity index 77% rename from firefox-langpacks-91.7.0esr-20220307.tar.xz rename to firefox-langpacks-91.8.0esr-20220405.tar.xz index a9201ed2ee3ebca9dfef88a26283f7848be72f23..461da3374187422269acf5cb4e0b7fac271810dc 100644 Binary files a/firefox-langpacks-91.7.0esr-20220307.tar.xz and b/firefox-langpacks-91.8.0esr-20220405.tar.xz differ diff --git a/firefox-anolis-default-prefs.js b/firefox-redhat-default-prefs.js similarity index 83% rename from firefox-anolis-default-prefs.js rename to firefox-redhat-default-prefs.js index 40110248cfb0cc0ac9a41343b06885b5867a4db4..9ead3a2085db1bcf5515db5f25c4db81fc6ba7a6 100644 --- a/firefox-anolis-default-prefs.js +++ b/firefox-redhat-default-prefs.js @@ -14,8 +14,8 @@ 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("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); @@ -23,7 +23,7 @@ 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.centos.org/show_bug.cgi?id=1226489 */ +/* 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 */ @@ -31,5 +31,5 @@ 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.centos.org/show_bug.cgi?id=1672424 */ -pref("storage.nfs_filesystem", true); +/* 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 24bfb84a727a5cf06b975a38da01241077a00a6d..ac49416c36a30070daa86374e651cb08001d4369 100644 --- a/firefox.spec +++ b/firefox.spec @@ -1,4 +1,3 @@ -%define anolis_release .0.1 %global disable_toolsets 0 %ifarch %{ix86} @@ -129,8 +128,8 @@ end} Summary: Mozilla Firefox Web browser Name: firefox -Version: 91.7.0 -Release: 3%{anolis_release}%{?dist} +Version: 91.8.0 +Release: 1%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ %if 0%{?rhel} == 9 @@ -144,7 +143,7 @@ ExcludeArch: %{ix86} %endif %endif %if 0%{?rhel} == 7 -ExcludeArch: s390 ppc +ExcludeArch: aarch64 s390 ppc %endif # We can't use the official tarball as it contains some test files that use @@ -154,13 +153,17 @@ ExcludeArch: 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}.processed-source.tar.xz %if %{build_langpacks} -Source1: firefox-langpacks-%{version}%{?pre_version}-20220307.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20220405.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 @@ -209,12 +212,6 @@ Patch521: expat-CVE-2022-25315.patch # Flatpak patches -# CentOS patches -%if 0%{?centos} -Patch10000: Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch -Patch10001: Bug-1526653---fix_user_vfp_armv7.patch -%endif - %if %{?system_nss} %if !0%{?bundle_nss} BuildRequires: pkgconfig(nspr) >= %{nspr_version} @@ -330,7 +327,7 @@ Requires: nss >= %{nss_build_version} BuildRequires: desktop-file-utils BuildRequires: system-bookmarks -Requires: anolis-indexhtml +Requires: redhat-indexhtml %if %{?run_tests} BuildRequires: xorg-x11-server-Xvfb @@ -474,13 +471,6 @@ echo "use_rustts %{?use_rustts}" %endif %endif -%if 0%{?centos} -%ifarch %{arm} -%patch 10000 -p1 -b .centos.armhfp -%patch 10001 -p1 -b .centos.armhfp2 -%endif -%endif - %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig %if %{official_branding} @@ -1274,8 +1264,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Fri Mar 11 2022 maqi -91.7.0-3.0.1 -- Rebrand for Anolis +* Tue Apr 05 2022 Eike Rathke - 91.8.0-1 +- Update to 91.8.0 * Mon Mar 07 2022 Eike Rathke - 91.7.0-3 - Update to 91.7.0 build3