Update to 60.5.0

This commit is contained in:
Martin Stransky 2019-01-30 11:10:12 +01:00
parent 98d4599996
commit 008304da84
4 changed files with 32 additions and 50 deletions

3
.gitignore vendored
View File

@ -226,3 +226,6 @@ thunderbird-langpacks-3.1.2-20100803.tar.bz2
/thunderbird-60.4.0.source.tar.xz /thunderbird-60.4.0.source.tar.xz
/thunderbird-langpacks-60.4.0-20190102.tar.xz /thunderbird-langpacks-60.4.0-20190102.tar.xz
/lightning-langpacks-60.4.0.tar.xz /lightning-langpacks-60.4.0.tar.xz
/thunderbird-60.5.0.source.tar.xz
/lightning-langpacks-60.5.0.tar.xz
/thunderbird-langpacks-60.5.0-20190129.tar.xz

View File

@ -1,30 +1,12 @@
diff -up firefox-57.0b5/js/src/jit/AtomicOperations.h.jit-atomic-lucky firefox-57.0b5/js/src/jit/AtomicOperations.h diff -up firefox-60.5.0/js/src/jit/AtomicOperations.h.jit-atomic-lucky firefox-60.5.0/js/src/jit/AtomicOperations.h
--- firefox-57.0b5/js/src/jit/AtomicOperations.h.jit-atomic-lucky 2017-10-06 12:34:02.338973607 +0200 --- firefox-60.5.0/js/src/jit/AtomicOperations.h.jit-atomic-lucky 2019-01-22 10:20:27.993697161 +0100
+++ firefox-57.0b5/js/src/jit/AtomicOperations.h 2017-10-06 12:38:24.632622215 +0200 +++ firefox-60.5.0/js/src/jit/AtomicOperations.h 2019-01-22 10:23:15.337873762 +0100
@@ -415,7 +415,7 @@ AtomicOperations::isLockfreeJS(int32_t s @@ -394,7 +394,7 @@ inline bool AtomicOperations::isLockfree
#elif defined(__s390__) || defined(__s390x__) #elif defined(__s390__) || defined(__s390x__)
# include "jit/none/AtomicOperations-feeling-lucky.h" #include "jit/none/AtomicOperations-feeling-lucky.h"
#else #else
-# error "No AtomicOperations support provided for this platform" -#error "No AtomicOperations support provided for this platform"
+# include "jit/none/AtomicOperations-feeling-lucky.h" +#include "jit/none/AtomicOperations-feeling-lucky.h"
#endif #endif
#endif // jit_AtomicOperations_h #endif // jit_AtomicOperations_h
diff -up firefox-57.0b5/js/src/jit/none/AtomicOperations-feeling-lucky.h.jit-atomic-lucky firefox-57.0b5/js/src/jit/none/AtomicOperations-feeling-lucky.h
--- firefox-57.0b5/js/src/jit/none/AtomicOperations-feeling-lucky.h.jit-atomic-lucky 2017-09-19 06:18:28.000000000 +0200
+++ firefox-57.0b5/js/src/jit/none/AtomicOperations-feeling-lucky.h 2017-10-06 12:34:02.338973607 +0200
@@ -79,6 +79,14 @@
# define GNUC_COMPATIBLE
#endif
+#ifdef __s390__
+# define GNUC_COMPATIBLE
+#endif
+
+#ifdef __s390x__
+# define GNUC_COMPATIBLE
+#endif
+
// The default implementation tactic for gcc/clang is to use the newer
// __atomic intrinsics added for use in C++11 <atomic>. Where that
// isn't available, we use GCC's older __sync functions instead.

View File

@ -1,3 +1,3 @@
SHA512 (thunderbird-60.4.0.source.tar.xz) = 084becec870ad1449196110ecd2d2cc397c32d9d5a682f3cf45a170b7bdf5c2197299a72034965e838af62534df870de5a46d49fd0d05a9c4c7fdf5e408e471d SHA512 (thunderbird-60.5.0.source.tar.xz) = b18bad3d0ec33a813ec8f2f7f539a9ba08bd05432a16b1838671a101a85d66b2acdd2573d9fc3117cecaa9aa1429c178d4ddbae987a3ce6e4e4211981eecb8d2
SHA512 (thunderbird-langpacks-60.4.0-20190102.tar.xz) = 321e78494ae503578e6828d54e3c6d4da6944679d58f6b65c9270d6721fb4714c81e828cabb566e565c884cc20ec4dc098110ca86b872a99160abd47be4453a8 SHA512 (lightning-langpacks-60.5.0.tar.xz) = 7aa2d3ac455ca52a5400841654ae896ac34f987d781ba0d713cb2a860c3865ef595e341c116d0e45521b1c13092fe53cca2f070a1f3e824d0a37b9dd574d5be1
SHA512 (lightning-langpacks-60.4.0.tar.xz) = fb3f7928ffa45263b76d584a7c15abb56fdf6d8f5276eb8c8b7ec758e481a32f51d3406503ff987f1c3da31009d0e5f4d2d679ca5d51d7bc2c3608c0f73f3826 SHA512 (thunderbird-langpacks-60.5.0-20190129.tar.xz) = 677661a1cb6b25b6b819e98a98ca7ab2bbdb3c631aeb44c160c7aff4bb57386338af27a13a3755778720b038bf1c2edda41aa0eb73a74f39d298267c78fb0edf

View File

@ -58,8 +58,6 @@
%global libvpx_version 1.4.0 %global libvpx_version 1.4.0
%endif %endif
%define tb_version 45.6.0
%define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\} %define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\}
%global langpackdir %{mozappdir}/distribution/extensions %global langpackdir %{mozappdir}/distribution/extensions
@ -83,14 +81,14 @@
Summary: Mozilla Thunderbird mail/newsgroup client Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird Name: thunderbird
Version: 60.4.0 Version: 60.5.0
Release: 1%{?dist} Release: 1%{?dist}
URL: http://www.mozilla.org/projects/thunderbird/ URL: http://www.mozilla.org/projects/thunderbird/
License: MPLv1.1 or GPLv2+ or LGPLv2+ License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet Group: Applications/Internet
Source0: ftp://ftp.mozilla.org/pub/thunderbird/releases/%{version}%{?pre_version}/source/thunderbird-%{version}%{?pre_version}.source.tar.xz Source0: ftp://ftp.mozilla.org/pub/thunderbird/releases/%{version}%{?pre_version}/source/thunderbird-%{version}%{?pre_version}.source.tar.xz
%if %{build_langpacks} %if %{build_langpacks}
Source1: thunderbird-langpacks-%{version}-20190102.tar.xz Source1: thunderbird-langpacks-%{version}-20190129.tar.xz
# Locales for lightning # Locales for lightning
Source2: lightning-langpacks-%{version}.tar.xz Source2: lightning-langpacks-%{version}.tar.xz
%endif %endif
@ -111,11 +109,11 @@ Patch37: build-jit-atomic-always-lucky.patch
Patch40: build-aarch64-skia.patch Patch40: build-aarch64-skia.patch
Patch226: rhbz-1354671.patch Patch226: rhbz-1354671.patch
Patch415: Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch Patch415: Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
Patch417: bug1375074-save-restore-x28.patch #Patch417: bug1375074-save-restore-x28.patch
# Build patches # Build patches
Patch103: rhbz-1219542-s390-build.patch Patch103: rhbz-1219542-s390-build.patch
Patch104: firefox-gcc-6.0.patch #Patch104: firefox-gcc-6.0.patch
# PPC fix # PPC fix
Patch304: mozilla-1245783.patch Patch304: mozilla-1245783.patch
@ -123,10 +121,10 @@ Patch305: build-big-endian.patch
Patch306: mozilla-1353817.patch Patch306: mozilla-1353817.patch
Patch307: build-disable-elfhack.patch Patch307: build-disable-elfhack.patch
Patch309: mozilla-1460871-ldap-query.patch Patch309: mozilla-1460871-ldap-query.patch
Patch314: mozbz-1500850-missing-dbus-header.patch #Patch314: mozbz-1500850-missing-dbus-header.patch
# Fedora specific patches # Fedora specific patches
Patch310: disable-dbus-remote.patch #Patch310: disable-dbus-remote.patch
Patch311: firefox-wayland.patch Patch311: firefox-wayland.patch
Patch313: firefox-wayland-crash-mozbz1507475.patch Patch313: firefox-wayland-crash-mozbz1507475.patch
@ -228,10 +226,6 @@ debug %{name}, you want to install %{name}-debuginfo instead.
%defattr(-,root,root) %defattr(-,root,root)
%endif %endif
%global tb_version %{version}
%prep %prep
%setup -q %setup -q
@ -241,17 +235,17 @@ debug %{name}, you want to install %{name}-debuginfo instead.
%ifarch s390 %ifarch s390
%patch103 -p1 -b .rhbz-1219542-s390-build %patch103 -p1 -b .rhbz-1219542-s390-build
%endif %endif
%patch104 -p1 -b .gcc6 #%patch104 -p1 -b .gcc6
%patch304 -p1 -b .1245783 %patch304 -p1 -b .1245783
%patch309 -p1 -b .1460871-ldap-query %patch309 -p1 -b .1460871-ldap-query
%patch314 -p1 -b .1500850-missing-dbus-header #%patch314 -p1 -b .1500850-missing-dbus-header
# Patch for big endian platforms only # Patch for big endian platforms only
%if 0%{?big_endian} %if 0%{?big_endian}
%patch26 -p1 -b .icu %patch26 -p1 -b .icu
%patch305 -p1 -b .big-endian %patch305 -p1 -b .big-endian
%endif %endif
%patch310 -p1 -b .disable-dbus-remote #%patch310 -p1 -b .disable-dbus-remote
%patch37 -p1 -b .jit-atomic-lucky %patch37 -p1 -b .jit-atomic-lucky
%patch40 -p1 -b .aarch64-skia %patch40 -p1 -b .aarch64-skia
@ -262,7 +256,7 @@ debug %{name}, you want to install %{name}-debuginfo instead.
%ifarch %{arm} %ifarch %{arm}
%patch415 -p1 -b .mozilla-1238661 %patch415 -p1 -b .mozilla-1238661
%endif %endif
%patch417 -p1 -b .bug1375074-save-restore-x28 #%patch417 -p1 -b .bug1375074-save-restore-x28
%patch306 -p1 -b .1353817 %patch306 -p1 -b .1353817
%if 0%{?disable_elfhack} %if 0%{?disable_elfhack}
@ -270,9 +264,9 @@ debug %{name}, you want to install %{name}-debuginfo instead.
%endif %endif
#cd .. #cd ..
# TODO - needs fixes #TODO - needs fixes
%patch311 -p1 -b .wayland #%patch311 -p1 -b .wayland
%patch313 -p1 -b .mozbz1507475 #%patch313 -p1 -b .mozbz1507475
%if %{official_branding} %if %{official_branding}
# Required by Mozilla Corporation # Required by Mozilla Corporation
@ -507,7 +501,7 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/thunderbird
%{__chmod} 755 %{buildroot}%{_bindir}/thunderbird-wayland %{__chmod} 755 %{buildroot}%{_bindir}/thunderbird-wayland
# set up our default preferences # set up our default preferences
%{__cat} %{SOURCE12} | %{__sed} -e 's,THUNDERBIRD_RPM_VR,%{tb_version}-%{release},g' > \ %{__cat} %{SOURCE12} | %{__sed} -e 's,THUNDERBIRD_RPM_VR,%{version}-%{release},g' > \
$RPM_BUILD_ROOT/rh-default-prefs $RPM_BUILD_ROOT/rh-default-prefs
%{__install} -D $RPM_BUILD_ROOT/rh-default-prefs $RPM_BUILD_ROOT/%{mozappdir}/greprefs/all-redhat.js %{__install} -D $RPM_BUILD_ROOT/rh-default-prefs $RPM_BUILD_ROOT/%{mozappdir}/greprefs/all-redhat.js
%{__install} -D $RPM_BUILD_ROOT/rh-default-prefs $RPM_BUILD_ROOT/%{mozappdir}/defaults/pref/all-redhat.js %{__install} -D $RPM_BUILD_ROOT/rh-default-prefs $RPM_BUILD_ROOT/%{mozappdir}/defaults/pref/all-redhat.js
@ -553,7 +547,7 @@ cd -
%endif # build_langpacks %endif # build_langpacks
# Get rid of devel package and its debugsymbols # Get rid of devel package and its debugsymbols
%{__rm} -rf $RPM_BUILD_ROOT%{_libdir}/%{name}-devel-%{tb_version} %{__rm} -rf $RPM_BUILD_ROOT%{_libdir}/%{name}-devel-%{version}
# Copy over the LICENSE # Copy over the LICENSE
install -c -m 644 LICENSE $RPM_BUILD_ROOT%{mozappdir} install -c -m 644 LICENSE $RPM_BUILD_ROOT%{mozappdir}
@ -692,6 +686,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#=============================================================================== #===============================================================================
%changelog %changelog
* Wed Jan 30 2019 Martin Stransky <stransky@redhat.com> - 60.5.0-1
- Update to 60.5.0
* Wed Jan 2 2019 Jan Horak <jhorak@redhat.com> - 60.4.0-1 * Wed Jan 2 2019 Jan Horak <jhorak@redhat.com> - 60.4.0-1
- Update to 60.4.0 - Update to 60.4.0