From eec1d9e941a21684fe04a4bb6310e229ffb7f01d Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Wed, 29 Jun 2022 11:02:32 +0200 Subject: [PATCH] Update to 91.11.0 Obsoletes gcc12-D139078.patch now added upstream. --- .gitignore | 2 + gcc12-D139078.patch | 94 --------------------------------------------- sources | 4 +- thunderbird.spec | 9 +++-- 4 files changed, 9 insertions(+), 100 deletions(-) delete mode 100644 gcc12-D139078.patch diff --git a/.gitignore b/.gitignore index 433b6f1..4a41ad8 100644 --- a/.gitignore +++ b/.gitignore @@ -361,3 +361,5 @@ thunderbird-langpacks-3.1.2-20100803.tar.bz2 /thunderbird-langpacks-91.9.1-20220523.tar.xz /thunderbird-91.10.0.source.tar.xz /thunderbird-langpacks-91.10.0-20220530.tar.xz +/thunderbird-91.11.0.source.tar.xz +/thunderbird-langpacks-91.11.0-20220628.tar.xz diff --git a/gcc12-D139078.patch b/gcc12-D139078.patch deleted file mode 100644 index 8198e1a..0000000 --- a/gcc12-D139078.patch +++ /dev/null @@ -1,94 +0,0 @@ -diff --git a/gfx/wr/swgl/src/glsl.h b/gfx/wr/swgl/src/glsl.h ---- a/gfx/wr/swgl/src/glsl.h -+++ b/gfx/wr/swgl/src/glsl.h -@@ -2301,20 +2301,12 @@ - const vec2& operator[](int index) const { return data[index]; } - mat2() = default; - -- IMPLICIT mat2(Float a) { -- data[0] = vec2(a); -- data[1] = vec2(a); -- } -+ IMPLICIT constexpr mat2(Float a) : data{vec2(a), vec2(a)} {} - -- mat2(vec2 a, vec2 b) { -- data[0] = a; -- data[1] = b; -- } -+ constexpr mat2(vec2 a, vec2 b) : data{a, b} {} - IMPLICIT mat2(const mat4& mat); -- IMPLICIT constexpr mat2(mat2_scalar s) { -- data[0] = vec2(s.data[0]); -- data[1] = vec2(s.data[1]); -- } -+ IMPLICIT constexpr mat2(mat2_scalar s) -+ : data{vec2(s.data[0]), vec2(s.data[1])} {} - - friend vec2 operator*(mat2 m, vec2 v) { - vec2 u; -@@ -2404,30 +2396,19 @@ - vec3& operator[](int index) { return data[index]; } - const vec3& operator[](int index) const { return data[index]; } - mat3() = default; -- mat3(vec3 a, vec3 b, vec3 c) { -- data[0] = a; -- data[1] = b; -- data[2] = c; -- } -+ constexpr mat3(vec3 a, vec3 b, vec3 c) : data{a, b, c} {} - -- IMPLICIT constexpr mat3(mat3_scalar s) { -- data[0] = vec3(s.data[0]); -- data[1] = vec3(s.data[1]); -- data[2] = vec3(s.data[2]); -- } -- constexpr mat3(mat3_scalar s0, mat3_scalar s1, mat3_scalar s2, -- mat3_scalar s3) { -- data[0] = vec3(s0.data[0], s1.data[0], s2.data[0], s3.data[0]); -- data[1] = vec3(s0.data[1], s1.data[1], s2.data[1], s3.data[1]); -- data[2] = vec3(s0.data[2], s1.data[2], s2.data[2], s3.data[2]); -- } -+ IMPLICIT constexpr mat3(mat3_scalar s) -+ : data{vec3(s.data[0]), vec3(s.data[1]), vec3(s.data[2])} {} -+ -+ constexpr mat3(mat3_scalar s0, mat3_scalar s1, mat3_scalar s2, mat3_scalar s3) -+ : data{vec3(s0.data[0], s1.data[0], s2.data[0], s3.data[0]), -+ vec3(s0.data[1], s1.data[1], s2.data[1], s3.data[1]), -+ vec3(s0.data[2], s1.data[2], s2.data[2], s3.data[2])} {} - - constexpr mat3(Float d1, Float d2, Float d3, Float d4, Float d5, Float d6, -- Float d7, Float d8, Float d9) { -- data[0] = vec3(d1, d2, d3); -- data[1] = vec3(d4, d5, d6); -- data[2] = vec3(d7, d8, d9); -- } -+ Float d7, Float d8, Float d9) -+ : data{vec3(d1, d2, d3), vec3(d4, d5, d6), vec3(d7, d8, d9)} {} - - IMPLICIT mat3(const mat4& mat); - -@@ -2597,19 +2578,11 @@ - vec4 data[4]; - - mat4() = default; -- IMPLICIT constexpr mat4(mat4_scalar s) { -- data[0] = vec4(s.data[0]); -- data[1] = vec4(s.data[1]); -- data[2] = vec4(s.data[2]); -- data[3] = vec4(s.data[3]); -- } -+ IMPLICIT constexpr mat4(mat4_scalar s) -+ : data{vec4(s.data[0]), vec4(s.data[1]), vec4(s.data[2]), -+ vec4(s.data[3])} {} - -- mat4(vec4 a, vec4 b, vec4 c, vec4 d) { -- data[0] = a; -- data[1] = b; -- data[2] = c; -- data[3] = d; -- } -+ constexpr mat4(vec4 a, vec4 b, vec4 c, vec4 d) : data{a, b, c, d} {} - - vec4& operator[](int index) { return data[index]; } - const vec4& operator[](int index) const { return data[index]; } - diff --git a/sources b/sources index e50adf5..b8e806c 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (cbindgen-vendor.tar.xz) = 105a7d93d63920d8c232421a29f6330c171343d27807feaeadb1737374e5cf1d48916cb6e9ce04773dd81bb3c52a6f5cef12e633b0922cb9f91ca99acc9e4b78 -SHA512 (thunderbird-91.10.0.source.tar.xz) = 335d47e93d5fce4ff6e1ec0305cdaa86031f28289cc06f30ab3782bae484ad10ac4b9aa70911787627744277715edffd8ec8c3a2008f00b8b90ea02b0d79fcc8 -SHA512 (thunderbird-langpacks-91.10.0-20220530.tar.xz) = 9c3570d50e199f51cd6b04a97103de7a7579caa94ebfde99afa28e41c3b6d97a064db5087888b1abcc08f76581d53ebd2c705fadd985c9db966999e3bf678f3e +SHA512 (thunderbird-91.11.0.source.tar.xz) = 26b9242259b71eb14ddadffb34a59d07d515bbbc0cb806eed965a73b001ee81b3b1128d06cfdf3e50d5da4ef97be21d11193be34a582d3c9f27f27d2f97d90d2 +SHA512 (thunderbird-langpacks-91.11.0-20220628.tar.xz) = 9cc8d12246771ad706db278dc1e05bc041fdee221c15cefeecf2ea0c77d16e6da32ed8446ec080ebcd318b4358ea8eac0b81820482902af91d2c50132ca267b9 diff --git a/thunderbird.spec b/thunderbird.spec index 51ba84d..48fec43 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -95,13 +95,13 @@ ExcludeArch: s390x Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 91.10.0 +Version: 91.11.0 Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ 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}-20220530.tar.xz +Source1: thunderbird-langpacks-%{version}-20220628.tar.xz %endif Source3: get-calendar-langpacks.sh Source4: cbindgen-vendor.tar.xz @@ -125,7 +125,6 @@ Patch418: mozilla-1512162.patch #Patch419: bindgen-d0dfc52706f23db9dc9d74642eeebd89d73cb8d0.patch Patch103: rhbz-1219542-s390-build.patch # gcc 12 build fix patches -Patch420: gcc12-D139078.patch Patch421: gcc12-D139088.patch Patch422: 0001-GLIBCXX-fix-for-GCC-12.patch @@ -306,7 +305,6 @@ debug %{name}, you want to install %{name}-debuginfo instead. pushd comm popd -%patch420 -p1 -b .gcc12-D139078 %patch421 -p1 -b .gcc12-D139088 %patch422 -p1 -b .0001-GLIBCXX-fix-for-GCC-12 @@ -744,6 +742,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Wed Jun 29 2022 Eike Rathke - 91.11.0-1 +- Update to 91.11.0 + * Tue May 31 2022 Eike Rathke - 91.10.0-1 - Update to 91.10.0