diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..f6ce870650a1e23b105c023cfcdd0c1b7a7c440a --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +thunderbird-91.4.0.processed-source.tar.xz filter=lfs diff=lfs merge=lfs -text diff --git a/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch b/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch new file mode 100644 index 0000000000000000000000000000000000000000..6dfe2ada2bcab17ecf2caf305034f76b6e4b6a96 --- /dev/null +++ b/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch @@ -0,0 +1,12 @@ +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 new file mode 100644 index 0000000000000000000000000000000000000000..3f84f9522a28d2e40b3f23266d90f4f495347c02 --- /dev/null +++ b/Bug-1526653---fix_user_vfp_armv7.patch @@ -0,0 +1,35 @@ +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/nss-3.67.0-6.el8_1.src.rpm b/nss-3.67.0-7.el8_1.src.rpm similarity index 94% rename from nss-3.67.0-6.el8_1.src.rpm rename to nss-3.67.0-7.el8_1.src.rpm index 403efc28f87e7e6bd1729fe30b990a3651e1d588..1fcafc06c7876b1813718f72eb5e6e3f153d9203 100644 Binary files a/nss-3.67.0-6.el8_1.src.rpm and b/nss-3.67.0-7.el8_1.src.rpm differ diff --git a/thunderbird-91.3.0.processed-source.tar.xz b/thunderbird-91.3.0.processed-source.tar.xz deleted file mode 100644 index 59cddef96be735c15c326ef87154e1ee68b39edc..0000000000000000000000000000000000000000 Binary files a/thunderbird-91.3.0.processed-source.tar.xz and /dev/null differ diff --git a/thunderbird-91.4.0.processed-source.tar.xz b/thunderbird-91.4.0.processed-source.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..2188b7e1c4b38611aec5620c4d5cd9f268430aa5 --- /dev/null +++ b/thunderbird-91.4.0.processed-source.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1a38cbec65edf26aecb3d3f78f2ba1de9d338af16e354262744cb723695ffbd1 +size 409981408 diff --git a/thunderbird-redhat-default-prefs.js.an7 b/thunderbird-centos-default-prefs.js.el7 similarity index 96% rename from thunderbird-redhat-default-prefs.js.an7 rename to thunderbird-centos-default-prefs.js.el7 index a3f8698dd8f69bc5b3dc1f79feeb3dee741f168e..c27d9d31f6758c227fa7cdd781bbc51cfffd2054 100644 --- a/thunderbird-redhat-default-prefs.js.an7 +++ b/thunderbird-centos-default-prefs.js.el7 @@ -2,7 +2,7 @@ pref("app.update.enabled", false); pref("app.update.autoInstallEnabled", false); /* Allow users to set custom colors*/ /* pref("browser.display.use_system_colors", true);*/ -pref("general.useragent.vendor", "Anolis OS"); +pref("general.useragent.vendor", "CentOS"); pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR"); pref("intl.locale.matchOS", true); pref("mail.shell.checkDefaultClient", false); diff --git a/thunderbird-langpacks-91.3.0-20211102.tar.xz b/thunderbird-langpacks-91.4.0-20211206.tar.xz similarity index 76% rename from thunderbird-langpacks-91.3.0-20211102.tar.xz rename to thunderbird-langpacks-91.4.0-20211206.tar.xz index 1c0de736b701eec353f674e5c14025722a3b0529..e1b8367fbf1df8a4ed1b9298ab436ab9fd3e2498 100644 Binary files a/thunderbird-langpacks-91.3.0-20211102.tar.xz and b/thunderbird-langpacks-91.4.0-20211206.tar.xz differ diff --git a/thunderbird.spec b/thunderbird.spec index 25d4bf91969daa95e89d943a72f54ac600969846..7831803965780700a6cacc4edccffefdcf929513 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -1,4 +1,3 @@ -%define anolis_release .0.1 # Set for local builds only %global disable_toolsets 0 @@ -129,8 +128,8 @@ end} %global build_langpacks 1 Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 91.3.0 -Release: 2%{anolis_release}%{?dist} +Version: 91.4.0 +Release: 3%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -146,13 +145,13 @@ ExcludeArch: s390 ppc %endif # We can't use the official tarball as it contains some test files that use -# licenses that are rejected by Anolis Legal. +# licenses that are rejected by Red Hat Legal. # The official tarball has to be always processed by the process-official-tarball # script. # Link to official tarball: https://archive.mozilla.org/pub/thunderbird/releases/%%{version}%%{?pre_version}/source/thunderbird-%%{version}%%{?pre_version}.source.tar.xz Source0: thunderbird-%{version}%{?pre_version}.processed-source.tar.xz %if %{build_langpacks} -Source1: thunderbird-langpacks-%{version}%{?ext_version}-20211102.tar.xz +Source1: thunderbird-langpacks-%{version}%{?ext_version}-20211206.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: get-calendar-langpacks.sh @@ -164,9 +163,9 @@ Source21: thunderbird.sh.in Source24: mozilla-api-key Source27: google-api-key Source28: node-stdout-nonblocking-wrapper -Source701: thunderbird-redhat-default-prefs.js.an7 +Source701: thunderbird-centos-default-prefs.js.el7 -Source403: nss-3.67.0-6.el8_1.src.rpm +Source403: nss-3.67.0-7.el8_1.src.rpm Source401: nss-setup-flags-env.inc Source402: nspr-4.32.0-1.el8_1.src.rpm @@ -201,6 +200,9 @@ Patch513: mozilla-bmo998749.patch Patch514: mozilla-s390x-skia-gradient.patch Patch515: mozilla-bmo1626236.patch +Patch10000: Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch +Patch10001: Bug-1526653---fix_user_vfp_armv7.patch + %if %{?system_nss} %if !0%{?bundle_nss} BuildRequires: pkgconfig(nspr) >= %{nspr_version} @@ -439,6 +441,11 @@ echo "use_rustts %{?use_rustts}" %endif %endif +%ifarch %{arm} +%patch10000 -p1 -b .mozilla-1238661 +%patch10001 -p1 -b .mozilla-15266 +%endif + %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig # Modify mozconfig file @@ -1152,11 +1159,17 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog -* Wed Dec 29 2021 yangxianzhao - 91.3.0-2.0.1 -- Rebrand for Anolis +* Tue Dec 07 2021 Eike Rathke - 91.4.0-3 +- Bump NVR for ppc64 build + +* Mon Dec 06 2021 Eike Rathke - 91.4.0-2 +- Update to 91.4.0 build2 + +* Wed Dec 01 2021 Eike Rathke - 91.4.0-1 +- Update to 91.4.0 build1 * Tue Nov 02 2021 Eike Rathke - 91.3.0-2 -- Update to 19.3.0 build2 +- Update to 91.3.0 build2 * Mon Nov 01 2021 Eike Rathke - 91.3.0-1 - Update to 91.3.0 build1