The package rpms/icecat.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/icecat.git/commit/?id=0163a46ea8f....
Change:
+%ifarch %{power64}
Thanks.
Full change:
============
commit 37c438b574cbba39af83890e575ef02f97150fd3
Author: Antonio Trande <sagitter(a)fedoraproject.org>
Date: Sun Mar 6 12:48:06 2022 +0100
Release 91.6.1
diff --git a/.gitignore b/.gitignore
index deba8bf..d943282 100644
--- a/.gitignore
+++ b/.gitignore
@@ -178,3 +178,5 @@
/icecat-91.5.0-rh1.tar.bz2
/icecat-91.6.0-langpacks.tar.gz
/icecat-91.6.0-rh1.tar.bz2
+/icecat-91.6.1-langpacks.tar.gz
+/icecat-91.6.1-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 53f6fa1..6053060 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-VERSION=91.6.0
+VERSION=91.6.1
URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_...
for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index e704bd1..a2980eb 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -95,8 +95,8 @@ ExcludeArch: %{arm}
%global __requires_exclude_from ^%{icecatappdir}
Name: icecat
-Version: 91.6.0
-Release: 2.%{redhat_ver}%{?pre_tag}%{?dist}
+Version: 91.6.1
+Release: 1.%{redhat_ver}%{?pre_tag}%{?dist}
Summary: GNU version of Firefox browser
# Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the
extensions included
@@ -824,6 +824,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%{_datadir}/applications/%{name}-wayland.desktop
%changelog
+* Sun Mar 06 2022 Antonio Trande <sagitter(a)fedoraproject.org> - 91.6.1-1.rh1
+- Release 91.6.1
+
* Fri Feb 18 2022 Antonio Trande <sagitter(a)fedoraproject.org> - 91.6.0-2.rh1
- Patched for GCC-12
diff --git a/sources b/sources
index e58d23c..dc3d702 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
SHA512 (cbindgen-vendor.tar.xz) =
99ac9076366d7f567909754635918e61710c3e4d17b00bebb4373bd072fa9fe0d01bbd877074f0cee0893f5db724d6c9db4398fa3e589194bd15d63f5baaa3ae
-SHA512 (icecat-91.6.0-langpacks.tar.gz) =
20a0940fcd768ccf01df258e09288e4d297e486fc9b216a5341044b3c59924063580f72b4abe4c5744fb4a721d87b1907b7d9d68ed6ce7d80c715036d476968c
-SHA512 (icecat-91.6.0-rh1.tar.bz2) =
adb4d5b4171f443e0099dbf2cd4534451b415f18489712ef01dd7c543ae806668a39ab5278803b85687e3efeb17c2a9fdb4a1ed27f55c5490e6f3a06d3f5f523
+SHA512 (icecat-91.6.1-langpacks.tar.gz) =
cf294a74de25dcdc783850912d2b79694ed90c67345e230a9709ff06c44c6c9e8f147e67cacaaca6506e8505a8e0563281eebe0995ab8164117c4eb07b261d41
+SHA512 (icecat-91.6.1-rh1.tar.bz2) =
d25e408ab2f9e79e69c5c8e7ba9fb7e36ccba17381097512c1c222d865a480069714192441879a6a387866abc3142bd24c3d199a38149179ff692500a6638517
SHA512 (icecat-COPYING-licensefiles.tar.gz) =
ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
SHA512 (icecat.png) =
a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c
commit 0163a46ea8f0789c4ff414988e6a3fdc40564aa6
Author: Antonio Trande <sagitter(a)fedoraproject.org>
Date: Fri Feb 18 21:49:36 2022 +0100
Patched for GCC-12
diff --git a/icecat-mozilla-1754752.patch b/icecat-mozilla-1754752.patch
new file mode 100644
index 0000000..b0df2ff
--- /dev/null
+++ b/icecat-mozilla-1754752.patch
@@ -0,0 +1,171 @@
+# HG changeset patch
+# User Emilio Cobos Álvarez <emilio(a)crisal.io>
+# Date 1645177075 0
+# Node ID 8af9ccb50f19e293ab7eb2b3d76961827ba84a54
+# Parent 2c092e335ae05bf05c0217a1936b185a68a66a8b
+Bug 1754752 - Use initializer lists in some swgl constructors. r=lsalzman,gfx-reviewers
+
+We call it from another constexpr function. Clang seems to not be so
+strict about this.
+
+Differential Revision:
https://phabricator.services.mozilla.com/D139078
+
+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
+@@ -2296,30 +2296,22 @@ struct mat4;
+
+ struct mat2 {
+ vec2 data[2];
+
+ vec2& operator[](int index) { return data[index]; }
+ const vec2& operator[](int index) const { return data[index]; }
+ mat2() = default;
+
+- IMPLICIT mat2(Float a) {
+- data[0] = vec2(a);
+- data[1] = vec2(a);
+- }
+-
+- mat2(vec2 a, vec2 b) {
+- data[0] = a;
+- data[1] = b;
+- }
++ IMPLICIT constexpr mat2(Float a) : data{vec2(a), vec2(a)} {}
++
++ 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;
+ u.x = m[0].x * v.x + m[1].x * v.y;
+ u.y = m[0].y * v.x + m[1].y * v.y;
+ return u;
+ }
+ friend mat2 operator*(mat2 m, Float f) {
+@@ -2399,40 +2391,29 @@ struct mat3_scalar {
+ };
+
+ struct mat3 {
+ vec3 data[3];
+
+ 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;
+- }
+-
+- 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]);
+- }
++ constexpr mat3(vec3 a, vec3 b, vec3 c) : data{a, b, c} {}
++
++ 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);
+
+ friend vec3 operator*(mat3 m, vec3 v) {
+ vec3 u;
+ u.x = m[0].x * v.x + m[1].x * v.y + m[2].x * v.z;
+ u.y = m[0].y * v.x + m[1].y * v.y + m[2].y * v.z;
+ u.z = m[0].z * v.x + m[1].z * v.y + m[2].z * v.z;
+@@ -2592,29 +2573,21 @@ struct mat4_scalar {
+ return u;
+ }
+ };
+
+ struct mat4 {
+ 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]);
+- }
+-
+- mat4(vec4 a, vec4 b, vec4 c, vec4 d) {
+- data[0] = a;
+- data[1] = b;
+- data[2] = c;
+- data[3] = d;
+- }
++ IMPLICIT constexpr mat4(mat4_scalar s)
++ : data{vec4(s.data[0]), vec4(s.data[1]), vec4(s.data[2]),
++ vec4(s.data[3])} {}
++
++ 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]; }
+
+ friend vec4 operator*(mat4 m, vec4 v) {
+ vec4 u;
+ u.x = m[0].x * v.x + m[1].x * v.y + m[2].x * v.z + m[3].x * v.w;
+ u.y = m[0].y * v.x + m[1].y * v.y + m[2].y * v.z + m[3].y * v.w;
+
+# HG changeset patch
+# User Emilio Cobos Álvarez <emilio(a)crisal.io>
+# Date 1645177101 0
+# Node ID 00128c425ebb4d4094e829f1936490d0aa2507f1
+# Parent 8af9ccb50f19e293ab7eb2b3d76961827ba84a54
+Bug 1754752 - Avoid a ton of warning spam when building swgl with gcc. r=lsalzman
+
+Differential Revision:
https://phabricator.services.mozilla.com/D139088
+
+diff --git a/gfx/wr/swgl/src/gl.cc b/gfx/wr/swgl/src/gl.cc
+--- a/gfx/wr/swgl/src/gl.cc
++++ b/gfx/wr/swgl/src/gl.cc
+@@ -77,17 +77,17 @@ WINBASEAPI BOOL WINAPI QueryPerformanceF
+ #endif
+
+ #define UNREACHABLE __builtin_unreachable()
+
+ #define UNUSED [[maybe_unused]]
+
+ #define FALLTHROUGH [[fallthrough]]
+
+-#ifdef MOZILLA_CLIENT
++#if defined(MOZILLA_CLIENT) && defined(MOZ_CLANG_PLUGIN)
+ # define IMPLICIT __attribute__((annotate("moz_implicit")))
+ #else
+ # define IMPLICIT
+ #endif
+
+ #include "gl_defs.h"
+ #include "glsl.h"
+ #include "program.h"
+
diff --git a/icecat.spec b/icecat.spec
index c71ba16..e704bd1 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -96,7 +96,7 @@ ExcludeArch: %{arm}
Name: icecat
Version: 91.6.0
-Release: 1.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 2.%{redhat_ver}%{?pre_tag}%{?dist}
Summary: GNU version of Firefox browser
# Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the
extensions included
@@ -169,6 +169,7 @@ Patch226: rhbz-1354671.patch
Patch402: mozilla-1196777.patch
Patch412: mozilla-1337988.patch
Patch422: mozilla-1580174-webrtc-popup.patch
+Patch424: icecat-mozilla-1754752.patch
# Fix crash on ppc64le (mozilla#1512162)
Patch423: mozilla-1512162.patch
@@ -372,7 +373,12 @@ tar -xf %{SOURCE5}
%endif
%patch402 -p1 -b .1196777
-%patch423 -p1 -b .1596503
+%ifarch %{power64}
+%patch423 -p1 -b .1512162
+%endif
+%if 0%{?fedora} > 35
+%patch424 -p1 -b .1754752
+%endif
%patch584 -p1 -b .firefox-disable-ffvpx-with-vapi
%patch585 -p1 -b .firefox-vaapi-extra-frames
@@ -818,6 +824,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%{_datadir}/applications/%{name}-wayland.desktop
%changelog
+* Fri Feb 18 2022 Antonio Trande <sagitter(a)fedoraproject.org> - 91.6.0-2.rh1
+- Patched for GCC-12
+
* Tue Feb 15 2022 Antonio Trande <sagitter(a)fedoraproject.org> - 91.6.0-1.rh1
- Release 91.6.0