diff --git a/.gitignore b/.gitignore index d139924..a987494 100644 --- a/.gitignore +++ b/.gitignore @@ -3,9 +3,9 @@ SOURCES/Python-3.6.8.tar.xz SOURCES/cbindgen-vendor.tar.xz SOURCES/gtk3-private-3.22.26-1.el6.src.rpm SOURCES/libffi-3.0.13-18.el7_3.src.rpm -SOURCES/lightning-langpacks-68.11.0.tar.xz +SOURCES/lightning-langpacks-68.12.0.tar.xz SOURCES/nodejs-8.11.4-1.3.fc27.src.rpm SOURCES/openssl-1.0.2k-19.6.bundle.el7_7.src.rpm -SOURCES/thunderbird-68.11.0.source.tar.xz -SOURCES/thunderbird-langpacks-68.11.0-20200804.tar.xz +SOURCES/thunderbird-68.12.0.source.tar.xz +SOURCES/thunderbird-langpacks-68.12.0-20200902.tar.xz SOURCES/yasm-1.2.0-3.el5.src.rpm diff --git a/.thunderbird.metadata b/.thunderbird.metadata index fa1d651..a5ad252 100644 --- a/.thunderbird.metadata +++ b/.thunderbird.metadata @@ -3,9 +3,9 @@ ee55acedef049268307633cbc9c7ff0610d1244f SOURCES/Python-3.6.8.tar.xz e86c38c48960b95353503b78e1de9ddca1ed34d7 SOURCES/cbindgen-vendor.tar.xz 0de63f863b158454b9429234b52ed28a397ec45c SOURCES/gtk3-private-3.22.26-1.el6.src.rpm e188ab1a444697bc649e223c28389d82ca94c472 SOURCES/libffi-3.0.13-18.el7_3.src.rpm -8476c6e7c27eba1836581ad86fc504e4853f077b SOURCES/lightning-langpacks-68.11.0.tar.xz +cbfcc6f4f69d50daed63fa044a062cbd09b896a9 SOURCES/lightning-langpacks-68.12.0.tar.xz 4f8d3bf2483d95261ff90742ecec82d6a899eca3 SOURCES/nodejs-8.11.4-1.3.fc27.src.rpm a379070abf5000cde61411c97af7e733b267a4d3 SOURCES/openssl-1.0.2k-19.6.bundle.el7_7.src.rpm -7b5764677819ca27af51b5e9b4be0d8180a8bfed SOURCES/thunderbird-68.11.0.source.tar.xz -627fbe742a97fcfa7b4b08c8e9688b95a043bcba SOURCES/thunderbird-langpacks-68.11.0-20200804.tar.xz +7ffe345515453434accf0cfa21c8a831ff676d10 SOURCES/thunderbird-68.12.0.source.tar.xz +6fa9366d357a6800b30c7c225876a530fc3a0711 SOURCES/thunderbird-langpacks-68.12.0-20200902.tar.xz 77fd30f7ebc12a629a31c1e252cec06af55a71fe SOURCES/yasm-1.2.0-3.el5.src.rpm diff --git a/README.debrand b/README.debrand deleted file mode 100644 index 01c46d2..0000000 --- a/README.debrand +++ /dev/null @@ -1,2 +0,0 @@ -Warning: This package was configured for automatic debranding, but the changes -failed to apply. diff --git a/SOURCES/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch b/SOURCES/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch deleted file mode 100644 index 6dfe2ad..0000000 --- a/SOURCES/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/SOURCES/Bug-1526653---fix_user_vfp_armv7.patch b/SOURCES/Bug-1526653---fix_user_vfp_armv7.patch deleted file mode 100644 index 3f84f95..0000000 --- a/SOURCES/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/SOURCES/no-rust-lto.patch b/SOURCES/no-rust-lto.patch deleted file mode 100644 index 227bb9c..0000000 --- a/SOURCES/no-rust-lto.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up thunderbird-68.11.0/config/makefiles/rust.mk.no-rust-lto thunderbird-68.11.0/config/makefiles/rust.mk ---- thunderbird-68.11.0/config/makefiles/rust.mk.no-rust-lto 2020-08-04 12:01:08.172071480 +0200 -+++ thunderbird-68.11.0/config/makefiles/rust.mk 2020-08-04 12:26:25.927808414 +0200 -@@ -50,8 +50,8 @@ ifndef MOZ_DEBUG_RUST - # Pass -Clto for older versions of rust, and CARGO_PROFILE_RELEASE_LTO=true - # for newer ones that support it. Combining the latter with -Clto works, so - # set both everywhere. --cargo_rustc_flags += -C lto --export CARGO_PROFILE_RELEASE_LTO=true -+#cargo_rustc_flags += -C lto -+#export CARGO_PROFILE_RELEASE_LTO=true - endif - endif - diff --git a/SOURCES/thunderbird-centos-default-prefs.js.el6 b/SOURCES/thunderbird-centos-default-prefs.js.el6 deleted file mode 100644 index 75de82e..0000000 --- a/SOURCES/thunderbird-centos-default-prefs.js.el6 +++ /dev/null @@ -1,30 +0,0 @@ -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", "CentOS"); -pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR"); -pref("intl.locale.matchOS", true); -pref("mail.shell.checkDefaultClient", false); -pref("toolkit.networkmanager.disable", false); -pref("offline.autoDetect", true); - -# Disable global indexing by default -pref("mailnews.database.global.indexer.enabled", false); - -# Do not switch to Smart Folders after upgrade to 3.0b4 -pref("mail.folder.views.version", "1"); -pref("extensions.shownSelectionUI", true); -pref("extensions.autoDisableScope", 0); - -# For rhbz#1024232 -pref("ui.SpellCheckerUnderlineStyle", 1); - -/* Workaround for rhbz#1134876 */ -pref("javascript.options.baselinejit", false); -/* Workaround for rhbz#1110291 */ -pref("network.negotiate-auth.allow-insecure-ntlm-v1", true); -/* Workaround for mozbz#1063315 */ -pref("security.use_mozillapkix_verification", false); -/* Use OS settings for UI language */ -pref("intl.locale.requested", ""); diff --git a/SOURCES/thunderbird-centos-default-prefs.js.el7 b/SOURCES/thunderbird-centos-default-prefs.js.el7 deleted file mode 100644 index 75de82e..0000000 --- a/SOURCES/thunderbird-centos-default-prefs.js.el7 +++ /dev/null @@ -1,30 +0,0 @@ -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", "CentOS"); -pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR"); -pref("intl.locale.matchOS", true); -pref("mail.shell.checkDefaultClient", false); -pref("toolkit.networkmanager.disable", false); -pref("offline.autoDetect", true); - -# Disable global indexing by default -pref("mailnews.database.global.indexer.enabled", false); - -# Do not switch to Smart Folders after upgrade to 3.0b4 -pref("mail.folder.views.version", "1"); -pref("extensions.shownSelectionUI", true); -pref("extensions.autoDisableScope", 0); - -# For rhbz#1024232 -pref("ui.SpellCheckerUnderlineStyle", 1); - -/* Workaround for rhbz#1134876 */ -pref("javascript.options.baselinejit", false); -/* Workaround for rhbz#1110291 */ -pref("network.negotiate-auth.allow-insecure-ntlm-v1", true); -/* Workaround for mozbz#1063315 */ -pref("security.use_mozillapkix_verification", false); -/* Use OS settings for UI language */ -pref("intl.locale.requested", ""); diff --git a/SOURCES/thunderbird-redhat-default-prefs.js.rhel6 b/SOURCES/thunderbird-redhat-default-prefs.js.rhel6 new file mode 100644 index 0000000..c412cb5 --- /dev/null +++ b/SOURCES/thunderbird-redhat-default-prefs.js.rhel6 @@ -0,0 +1,30 @@ +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", "Red Hat"); +pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR"); +pref("intl.locale.matchOS", true); +pref("mail.shell.checkDefaultClient", false); +pref("toolkit.networkmanager.disable", false); +pref("offline.autoDetect", true); + +# Disable global indexing by default +pref("mailnews.database.global.indexer.enabled", false); + +# Do not switch to Smart Folders after upgrade to 3.0b4 +pref("mail.folder.views.version", "1"); +pref("extensions.shownSelectionUI", true); +pref("extensions.autoDisableScope", 0); + +# For rhbz#1024232 +pref("ui.SpellCheckerUnderlineStyle", 1); + +/* Workaround for rhbz#1134876 */ +pref("javascript.options.baselinejit", false); +/* Workaround for rhbz#1110291 */ +pref("network.negotiate-auth.allow-insecure-ntlm-v1", true); +/* Workaround for mozbz#1063315 */ +pref("security.use_mozillapkix_verification", false); +/* Use OS settings for UI language */ +pref("intl.locale.requested", ""); diff --git a/SOURCES/thunderbird-redhat-default-prefs.js.rhel7 b/SOURCES/thunderbird-redhat-default-prefs.js.rhel7 new file mode 100644 index 0000000..c412cb5 --- /dev/null +++ b/SOURCES/thunderbird-redhat-default-prefs.js.rhel7 @@ -0,0 +1,30 @@ +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", "Red Hat"); +pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR"); +pref("intl.locale.matchOS", true); +pref("mail.shell.checkDefaultClient", false); +pref("toolkit.networkmanager.disable", false); +pref("offline.autoDetect", true); + +# Disable global indexing by default +pref("mailnews.database.global.indexer.enabled", false); + +# Do not switch to Smart Folders after upgrade to 3.0b4 +pref("mail.folder.views.version", "1"); +pref("extensions.shownSelectionUI", true); +pref("extensions.autoDisableScope", 0); + +# For rhbz#1024232 +pref("ui.SpellCheckerUnderlineStyle", 1); + +/* Workaround for rhbz#1134876 */ +pref("javascript.options.baselinejit", false); +/* Workaround for rhbz#1110291 */ +pref("network.negotiate-auth.allow-insecure-ntlm-v1", true); +/* Workaround for mozbz#1063315 */ +pref("security.use_mozillapkix_verification", false); +/* Use OS settings for UI language */ +pref("intl.locale.requested", ""); diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec index d5a8175..b3f896c 100644 --- a/SPECS/thunderbird.spec +++ b/SPECS/thunderbird.spec @@ -1,9 +1,3 @@ -%ifarch %{arm} -%if 0%{?rhel} == 8 -%undefine _debugsource_packages -%endif -%endif - %global debug_build 0 # Set for local builds only %global disable_toolsets 0 @@ -129,7 +123,7 @@ Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 68.11.0 +Version: 68.12.0 Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -145,7 +139,7 @@ ExclusiveArch: i686 x86_64 ppc64 s390x # From ftp://archive.mozilla.org/pub/thunderbird/releases/%{version}%{?ext_version}/source Source0: https://archive.mozilla.org/pub/thunderbird/releases/%{version}%{?pre_version}/source/thunderbird-%{version}%{?pre_version}.source.tar.xz %if %{build_langpacks} -Source1: thunderbird-langpacks-%{version}%{?ext_version}-20200804.tar.xz +Source1: thunderbird-langpacks-%{version}%{?ext_version}-20200902.tar.xz # Locales for lightning Source2: lightning-langpacks-%{version}.tar.xz %endif @@ -172,8 +166,8 @@ Source301: yasm-1.2.0-3.el5.src.rpm Source303: libffi-3.0.13-18.el7_3.src.rpm Source304: nodejs-8.11.4-1.3.fc27.src.rpm Source305: openssl-1.0.2k-19.6.bundle.el7_7.src.rpm -Source601: thunderbird-centos-default-prefs.js.el6 -Source701: thunderbird-centos-default-prefs.js.el7 +Source601: thunderbird-redhat-default-prefs.js.rhel6 +Source701: thunderbird-redhat-default-prefs.js.rhel7 ## Firefox patches @@ -183,7 +177,6 @@ Patch1001: build-ppc64le-inline.patch Patch1002: python-2.7-gcc8-fix.patch Patch1003: python-missing-utimensat.patch # workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1699374 -Patch1: no-rust-lto.patch Patch2: rust-network-check.patch Patch4: build-mozconfig-fix.patch Patch6: build-nss-version.patch @@ -214,9 +207,6 @@ Patch402: mozilla-1196777.patch ## Thunderbird patches Patch501: python-encode.patch -Patch10000: Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch -Patch10001: Bug-1526653---fix_user_vfp_armv7.patch - # --------------------------------------------------- BuildRequires: autoconf213 @@ -388,7 +378,6 @@ Mozilla Thunderbird is a standalone mail and newsgroup client. %setup -q -n %{tarballdir} # Firefox patches -%patch1 -p1 -b .no-rust-lto %patch2 -p1 -b .rust-network-check %patch7 -p1 -b .debugedits-error %ifarch %{ix86} %{arm} ppc @@ -438,11 +427,6 @@ Mozilla Thunderbird is a standalone mail and newsgroup client. %patch501 -p1 -b .python-encode %patch1001 -p1 -b .ppc64le-inline -%ifarch %{arm} -%patch10000 -p1 -b .mozilla-1238661 -%patch10001 -p1 -b .mozilla-1526653 -%endif - %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig function add_to_mozconfig() { @@ -491,12 +475,8 @@ function add_to_mozconfig() { %endif %ifarch armv7hl # ARMv7 need that (rhbz#1426850) -%if 0%{?rhel} == 8 -%global optimize_flags "-g0 -O2 -fno-schedule-insns -fno-lto" -%else %global optimize_flags "-g -O2 -fno-schedule-insns" %endif -%endif %ifarch ppc64le aarch64 %global optimize_flags "-g -O2" %endif @@ -809,12 +789,8 @@ export MOZ_DEBUG_FLAGS=" " %ifarch s390 %{arm} ppc aarch64 i686 x86_64 MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads" %endif -%ifarch %{arm} +%ifarch %{arm} i686 export RUSTFLAGS="-Cdebuginfo=0" -%if 0%{?rhel} == 8 -MOZ_LINK_FLAGS="-Wl,--no-keep-memory" -echo "ac_add_options --enable-linker=gold" >> .mozconfig -%endif %endif %ifarch s390 MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-g/-g1/') @@ -823,12 +799,6 @@ MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-g/-g1/') # (OOM when linking, rhbz#1238225) export MOZ_DEBUG_FLAGS=" " %endif -%ifarch %{arm} -%if 0%{?rhel} == 8 -MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-g/-g0/') -export MOZ_DEBUG_FLAGS=" " -%endif -%endif # RHEL6: Cannot find libldap60.so during launch (i686 only?) %if 0%{?rhel} == 6 MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -Wl,-rpath,%{mozappdir}" @@ -1137,8 +1107,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog -* Thu Aug 06 2020 CentOS Sources - 68.11.0-1.el8.centos -- Apply debranding changes +* Wed Sep 02 2020 Jan Horak - 68.12.0-1 +- Update to 68.12.0 build1 * Tue Aug 04 2020 Jan Horak - 68.11.0-1 - Update to 68.11.0 build1