From 1023e2ddcee4a31cce0a4d84fa31b2f21077b43c Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jan 16 2020 10:58:19 +0000 Subject: import thunderbird-68.4.1-2.el7_7 --- diff --git a/.gitignore b/.gitignore index dc10552..9389919 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.3.0.tar.xz +SOURCES/lightning-langpacks-68.4.1.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.3.0.source.tar.xz -SOURCES/thunderbird-langpacks-68.3.0-20191202.tar.xz +SOURCES/thunderbird-68.4.1.source.tar.xz +SOURCES/thunderbird-langpacks-68.4.1-20200113.tar.xz SOURCES/yasm-1.2.0-3.el5.src.rpm diff --git a/.thunderbird.metadata b/.thunderbird.metadata index 286970f..6117ecc 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 -52e3db96daa8c54295b6fe958f4dd5d7ca902534 SOURCES/lightning-langpacks-68.3.0.tar.xz +bcf1d1531135a8264f7b63c2aca089777f8925a7 SOURCES/lightning-langpacks-68.4.1.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 -1602af5c854109d939528ec14ada80103030128d SOURCES/thunderbird-68.3.0.source.tar.xz -9f691d8b90eda93a423d17f6ff45ddc81f63b6b4 SOURCES/thunderbird-langpacks-68.3.0-20191202.tar.xz +c9bf60dffda4641e7dac131772a229f96fad17bd SOURCES/thunderbird-68.4.1.source.tar.xz +2b21d3f786c631d3d915c45568e541e4c5b34bdd SOURCES/thunderbird-langpacks-68.4.1-20200113.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/build-big-endian.patch b/SOURCES/build-big-endian.patch deleted file mode 100644 index e8ec439..0000000 --- a/SOURCES/build-big-endian.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff -up firefox-60.0/gfx/skia/skia/include/core/SkColorPriv.h.big-endian firefox-60.0/gfx/skia/skia/include/core/SkColorPriv.h ---- firefox-60.0/gfx/skia/skia/include/core/SkColorPriv.h.big-endian 2018-04-09 22:50:48.000000000 +0200 -+++ firefox-60.0/gfx/skia/skia/include/core/SkColorPriv.h 2018-04-18 11:51:38.748680174 +0200 -@@ -54,18 +54,19 @@ static inline U8CPU SkUnitScalarClampToB - * - * Here we enforce this constraint. - */ -- -+/* - #ifdef SK_CPU_BENDIAN - #define SK_RGBA_R32_SHIFT 24 - #define SK_RGBA_G32_SHIFT 16 - #define SK_RGBA_B32_SHIFT 8 - #define SK_RGBA_A32_SHIFT 0 - #else -+*/ - #define SK_RGBA_R32_SHIFT 0 - #define SK_RGBA_G32_SHIFT 8 - #define SK_RGBA_B32_SHIFT 16 - #define SK_RGBA_A32_SHIFT 24 --#endif -+/*#endif*/ - - #define SkGetPackedA32(packed) ((uint32_t)((packed) << (24 - SK_A32_SHIFT)) >> 24) - #define SkGetPackedR32(packed) ((uint32_t)((packed) << (24 - SK_R32_SHIFT)) >> 24) -diff -up firefox-60.0/gfx/skia/skia/include/core/SkImageInfo.h.big-endian firefox-60.0/gfx/skia/skia/include/core/SkImageInfo.h ---- firefox-60.0/gfx/skia/skia/include/core/SkImageInfo.h.big-endian 2018-04-09 22:50:48.000000000 +0200 -+++ firefox-60.0/gfx/skia/skia/include/core/SkImageInfo.h 2018-04-18 11:51:38.748680174 +0200 -@@ -84,7 +84,8 @@ enum SkColorType { - #elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A) - kN32_SkColorType = kRGBA_8888_SkColorType, - #else -- #error "SK_*32_SHIFT values must correspond to BGRA or RGBA byte order" -+ //#error "SK_*32_SHIFT values must correspond to BGRA or RGBA byte order" -+ kN32_SkColorType = kBGRA_8888_SkColorType - #endif - }; - -diff -up firefox-60.0/gfx/skia/skia/include/gpu/GrTypes.h.big-endian firefox-60.0/gfx/skia/skia/include/gpu/GrTypes.h ---- firefox-60.0/gfx/skia/skia/include/gpu/GrTypes.h.big-endian 2018-04-09 22:50:48.000000000 +0200 -+++ firefox-60.0/gfx/skia/skia/include/gpu/GrTypes.h 2018-04-18 11:51:38.748680174 +0200 -@@ -344,15 +344,13 @@ enum GrPixelConfig { - static const int kGrPixelConfigCnt = kLast_GrPixelConfig + 1; - - // Aliases for pixel configs that match skia's byte order. --#ifndef SK_CPU_LENDIAN -- #error "Skia gpu currently assumes little endian" --#endif - #if SK_PMCOLOR_BYTE_ORDER(B,G,R,A) - static const GrPixelConfig kSkia8888_GrPixelConfig = kBGRA_8888_GrPixelConfig; - #elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A) - static const GrPixelConfig kSkia8888_GrPixelConfig = kRGBA_8888_GrPixelConfig; - #else -- #error "SK_*32_SHIFT values must correspond to GL_BGRA or GL_RGBA format." -+ static const GrPixelConfig kSkia8888_GrPixelConfig = kBGRA_8888_GrPixelConfig; -+ static const GrPixelConfig kSkiaGamma8888_GrPixelConfig = kSBGRA_8888_GrPixelConfig; - #endif - - /** -diff -up firefox-60.0/gfx/skia/skia/src/core/SkColorData.h.big-endian firefox-60.0/gfx/skia/skia/src/core/SkColorData.h ---- firefox-60.0/gfx/skia/skia/src/core/SkColorData.h.big-endian 2018-04-18 13:42:06.980476156 +0200 -+++ firefox-60.0/gfx/skia/skia/src/core/SkColorData.h 2018-04-18 13:42:50.493520552 +0200 -@@ -31,18 +31,19 @@ - * - * Here we enforce this constraint. - */ -- -+/* - #ifdef SK_CPU_BENDIAN - #define SK_BGRA_B32_SHIFT 24 - #define SK_BGRA_G32_SHIFT 16 - #define SK_BGRA_R32_SHIFT 8 - #define SK_BGRA_A32_SHIFT 0 - #else -+*/ - #define SK_BGRA_B32_SHIFT 0 - #define SK_BGRA_G32_SHIFT 8 - #define SK_BGRA_R32_SHIFT 16 - #define SK_BGRA_A32_SHIFT 24 --#endif -+//#endif - - #if defined(SK_PMCOLOR_IS_RGBA) && defined(SK_PMCOLOR_IS_BGRA) - #error "can't define PMCOLOR to be RGBA and BGRA" diff --git a/SOURCES/mozilla-1353817.patch b/SOURCES/mozilla-1353817.patch deleted file mode 100644 index 3e68cb8..0000000 --- a/SOURCES/mozilla-1353817.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up thunderbird-68.1.1/gfx/skia/skia/include/private/SkNx.h.1353817 thunderbird-68.1.1/gfx/skia/skia/include/private/SkNx.h ---- thunderbird-68.1.1/gfx/skia/skia/include/private/SkNx.h.1353817 2019-10-10 10:41:44.488904790 +0200 -+++ thunderbird-68.1.1/gfx/skia/skia/include/private/SkNx.h 2019-10-10 10:42:24.553039632 +0200 -@@ -416,7 +416,7 @@ typedef SkNx<8, uint32_t> Sk8u; - // Include platform specific specializations if available. - #if !defined(SKNX_NO_SIMD) && SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2 - #include "SkNx_sse.h" --#elif !defined(SKNX_NO_SIMD) && defined(SK_ARM_HAS_NEON) -+#elif !defined(SKNX_NO_SIMD) && (defined(SK_ARM_HAS_NEON) || defined(SK_CPU_ARM64)) - #include "SkNx_neon.h" - #else - diff --git a/SOURCES/mozilla-build-arm.patch b/SOURCES/mozilla-build-arm.patch deleted file mode 100644 index e390a28..0000000 --- a/SOURCES/mozilla-build-arm.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up firefox-52.0/gfx/skia/skia/include/core/SkPreConfig.h.arm firefox-52.0/gfx/skia/skia/include/core/SkPreConfig.h ---- firefox-52.0/gfx/skia/skia/include/core/SkPreConfig.h.arm 2017-03-03 13:53:52.480754536 +0100 -+++ firefox-52.0/gfx/skia/skia/include/core/SkPreConfig.h 2017-03-03 13:56:01.476018102 +0100 -@@ -203,6 +203,10 @@ - #define SK_ARM_HAS_CRC32 - #endif - -+#if defined(__aarch64__) -+ #undef SK_ARM_HAS_NEON -+#endif -+ - ////////////////////////////////////////////////////////////////////// - - #if !defined(SKIA_IMPLEMENTATION) diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec index 47ca81a..02081b1 100644 --- a/SPECS/thunderbird.spec +++ b/SPECS/thunderbird.spec @@ -123,8 +123,8 @@ Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 68.3.0 -Release: 1%{?dist} +Version: 68.4.1 +Release: 2%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -139,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}-20191202.tar.xz +Source1: thunderbird-langpacks-%{version}%{?ext_version}-20200113.tar.xz # Locales for lightning Source2: lightning-langpacks-%{version}.tar.xz %endif @@ -172,7 +172,6 @@ Source701: thunderbird-redhat-default-prefs.js.rhel7 ## Firefox patches # Build patches -Patch3: mozilla-build-arm.patch # workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1699374 Patch1001: build-ppc64le-inline.patch Patch1002: python-2.7-gcc8-fix.patch @@ -186,8 +185,6 @@ Patch7: firefox-debugedits-error.patch Patch8: firefox-dont-check-binary.patch Patch9: nss-build-mozilla-1564499.patch Patch26: build-icu-big-endian.patch -# Also fixes s390x: https://bugzilla.mozilla.org/show_bug.cgi?id=1376268 -Patch29: build-big-endian.patch # Always feel lucky for unsupported platforms: # https://bugzilla.mozilla.org/show_bug.cgi?id=1347128 Patch41: build-debug-qcms.patch @@ -206,7 +203,6 @@ Patch232: firefox-rhel6-hugepage.patch # Upstream patches Patch402: mozilla-1196777.patch -Patch413: mozilla-1353817.patch #Removing this patch would lead to losing user saved credentials in profile! ## Thunderbird patches @@ -392,7 +388,6 @@ Mozilla Thunderbird is a standalone mail and newsgroup client. %endif %patch9 -p1 -b .nss-build-mozilla-1564499 -#%patch29 -p1 -b .big-endian %if %{?debug_build} %patch41 -p1 -b .build-debug-qcms %endif @@ -400,7 +395,6 @@ Mozilla Thunderbird is a standalone mail and newsgroup client. %patch45 -p1 -b .elfhack #%endif -#%patch3 -p1 -b .arm %patch4 -p1 -b .build-mozconfig-fix %patch6 -p1 -b .nss-version @@ -425,7 +419,6 @@ Mozilla Thunderbird is a standalone mail and newsgroup client. %endif %patch402 -p1 -b .1196777 -#%patch413 -p1 -b .1353817 # Patch for big endian platforms only %if 0%{?big_endian} @@ -808,6 +801,11 @@ MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-g/-g1/') # (OOM when linking, rhbz#1238225) export MOZ_DEBUG_FLAGS=" " %endif +# RHEL6: Cannot find libldap60.so during launch (i686 only?) +%if 0%{?rhel} == 6 +MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -Wl,-rpath,%{mozappdir}" +%endif + export CFLAGS=$MOZ_OPT_FLAGS export CXXFLAGS=$MOZ_OPT_FLAGS export LDFLAGS=$MOZ_LINK_FLAGS @@ -1111,7 +1109,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog -* Mon Dec 02 2019 Jan Horak - 68.3.0-1 +* Mon Jan 13 2020 Jan Horak - 68.4.1-2 +- Update to 68.4.1 build1 + +* Mon Dec 02 2019 Jan Horak - 68.3.0-2 - Update to 68.3.0 build2 * Fri Oct 25 2019 Jan Horak - 68.2.0-2