From 5a363f10fc3ce7b1225cbacac0ee93c406eee190 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Sep 16 2019 11:22:31 +0000 Subject: import thunderbird-60.9.0-2.el8_0 --- diff --git a/.gitignore b/.gitignore index 5146649..cc55744 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ SOURCES/Python-2.7.13.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-60.8.0.tar.xz -SOURCES/thunderbird-60.8.0.source.tar.xz -SOURCES/thunderbird-langpacks-60.8.0-20190704.tar.xz +SOURCES/lightning-langpacks-60.9.0.tar.xz +SOURCES/thunderbird-60.9.0.source.tar.xz +SOURCES/thunderbird-langpacks-60.9.0-20190904.tar.xz SOURCES/yasm-1.2.0-3.el5.src.rpm diff --git a/.thunderbird.metadata b/.thunderbird.metadata index 80418a2..24cf516 100644 --- a/.thunderbird.metadata +++ b/.thunderbird.metadata @@ -1,7 +1,7 @@ 18a8f30a0356c751b8d0ea6f76e764cab13ee046 SOURCES/Python-2.7.13.tar.xz 0de63f863b158454b9429234b52ed28a397ec45c SOURCES/gtk3-private-3.22.26-1.el6.src.rpm e188ab1a444697bc649e223c28389d82ca94c472 SOURCES/libffi-3.0.13-18.el7_3.src.rpm -6bf54dcaae3e1bf1e7440f68e9146ddb13bb5356 SOURCES/lightning-langpacks-60.8.0.tar.xz -f269436ebc3b10480cb2dd187a9b98605778ad0a SOURCES/thunderbird-60.8.0.source.tar.xz -2e74ba8e7988a2678509b966ff996b2a6fd5bf19 SOURCES/thunderbird-langpacks-60.8.0-20190704.tar.xz +fcd61b9db9e787b8891afbcf6be1efc50cc7b678 SOURCES/lightning-langpacks-60.9.0.tar.xz +e2378df848679ecd80493e6c7fda6c2ab4258d3f SOURCES/thunderbird-60.9.0.source.tar.xz +675a0dd3eb14c2069f7f407976575d1eab939c61 SOURCES/thunderbird-langpacks-60.9.0-20190904.tar.xz 77fd30f7ebc12a629a31c1e252cec06af55a71fe SOURCES/yasm-1.2.0-3.el5.src.rpm 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 b551e1b..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/build-rust-missing-docs.patch b/SOURCES/build-rust-missing-docs.patch new file mode 100644 index 0000000..7789cb7 --- /dev/null +++ b/SOURCES/build-rust-missing-docs.patch @@ -0,0 +1,19 @@ +diff -up thunderbird-60.9.0/servo/components/style_traits/values.rs.rust-build thunderbird-60.9.0/servo/components/style_traits/values.rs +--- thunderbird-60.9.0/servo/components/style_traits/values.rs.rust-build 2019-09-06 12:25:57.491129675 +0200 ++++ thunderbird-60.9.0/servo/components/style_traits/values.rs 2019-09-06 12:27:54.698509544 +0200 +@@ -135,6 +135,7 @@ where + } + } + ++/// Some dummy docs + #[macro_export] + macro_rules! serialize_function { + ($dest: expr, $name: ident($( $arg: expr, )+)) => { +@@ -404,6 +405,7 @@ impl_to_css_for_predefined_type!(::csspa + impl_to_css_for_predefined_type!(::cssparser::Color); + impl_to_css_for_predefined_type!(::cssparser::UnicodeRange); + ++/// Some dummy docs + #[macro_export] + macro_rules! define_css_keyword_enum { + (pub enum $name:ident { $($variant:ident = $css:expr,)+ }) => { 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 0d55f31..daf60ed 100644 --- a/SPECS/thunderbird.spec +++ b/SPECS/thunderbird.spec @@ -91,8 +91,8 @@ Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 60.8.0 -Release: 1%{?dist} +Version: 60.9.0 +Release: 2%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -107,7 +107,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}-20190704.tar.xz +Source1: thunderbird-langpacks-%{version}%{?ext_version}-20190904.tar.xz # Locales for lightning Source2: lightning-langpacks-%{version}.tar.xz %endif @@ -129,8 +129,8 @@ Source205: gtk3-private-%{gtk3_nvr}-setup-flags-env.inc Source206: gtk3-private-%{gtk3_nvr}-requires-provides-filter.inc Source301: yasm-1.2.0-3.el5.src.rpm Source303: libffi-3.0.13-18.el7_3.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 #Python 2.7 Source100: https://www.python.org/ftp/python/%{bundled_python_version}/Python-%{bundled_python_version}.tar.xz @@ -151,6 +151,7 @@ Patch40: build-aarch64-skia.patch Patch41: build-debug-qcms.patch Patch43: xulrunner-24.0-jemalloc-ppc.patch Patch45: build-disable-elfhack.patch +Patch46: build-rust-missing-docs.patch # Fedora/RHEL specific patches Patch215: firefox-enable-addons.patch @@ -167,8 +168,6 @@ Patch406: mozilla-256180.patch Patch413: mozilla-1353817.patch Patch415: mozilla-1436242.patch Patch416: mozilla-1460871-ldap-query.patch - -Patch1000: Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch #Removing this patch would lead to losing user saved credentials in profile! ## Thunderbird patches @@ -340,6 +339,7 @@ Mozilla Thunderbird is a standalone mail and newsgroup client. %if 0%{?rhel} == 8 %patch45 -p1 -b .elfhack %endif +%patch46 -p1 -b .build-rust-missing-docs %patch3 -p1 -b .arm %patch4 -p1 -b .build-mozconfig-fix @@ -374,10 +374,6 @@ Mozilla Thunderbird is a standalone mail and newsgroup client. %patch26 -p1 -b .icu %endif -%ifarch %{arm} -%patch1000 -p1 -b .mozilla-1238661 -%endif - # Thunderbird patches %{__rm} -f .mozconfig @@ -627,6 +623,10 @@ set -e export SHELL=/bin/sh %endif +# Workaround for build faulures becase rust warnings threated as errors +# mozbz#1519629 +export RUSTFLAGS="--cap-lints warn" + echo "Building Thunderbird"; echo "===============================" #cd %{tarballdir} echo "Generate big endian version of config/external/icu/data/icud58l.dat" @@ -687,7 +687,7 @@ export MOZ_DEBUG_FLAGS=" " %ifarch s390 %{arm} ppc aarch64 i686 MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads" %endif -%ifarch %{arm} +%ifarch %{arm} %{ix86} export RUSTFLAGS="-Cdebuginfo=0" %endif export CFLAGS=$MOZ_OPT_FLAGS @@ -722,12 +722,8 @@ export MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS" #export MOZ_SERVICES_SYNC="1" export STRIP=/bin/true %if 0%{?rhel} == 8 -%ifarch %{arm} -export LLVM_CONFIG=/usr/bin/llvm-config-32 -%else export LLVM_CONFIG=/usr/bin/llvm-config-64 %endif -%endif ./mach build -v #--------------------------------------------------------------------- @@ -997,6 +993,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Wed Sep 4 2019 Jan Horak - 60.9.0-2 +- Update to 60.9.0 + * Thu Jul 4 2019 Martin Stransky - 60.8.0-1 - Updated to 60.8.0