commit:     73bec710536da954edada1cddf97a833960bfb81
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 26 20:44:29 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Mar 26 20:47:13 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73bec710

dev-qt/qtbase: do build workaround for gcc:14 + avx512fp16

Closes: https://bugs.gentoo.org/926287
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qtbase/files/qtbase-6.6.3-gcc14-avx512fp16.patch | 15 +++++++++++++++
 dev-qt/qtbase/qtbase-6.6.3.ebuild                       |  1 +
 dev-qt/qtbase/qtbase-6.6.9999.ebuild                    |  1 +
 dev-qt/qtbase/qtbase-6.7.0_rc2-r1.ebuild                |  1 +
 dev-qt/qtbase/qtbase-6.7.9999.ebuild                    |  1 +
 dev-qt/qtbase/qtbase-6.9999.ebuild                      |  1 +
 6 files changed, 20 insertions(+)

diff --git a/dev-qt/qtbase/files/qtbase-6.6.3-gcc14-avx512fp16.patch 
b/dev-qt/qtbase/files/qtbase-6.6.3-gcc14-avx512fp16.patch
new file mode 100644
index 000000000000..e7eb9dcc9209
--- /dev/null
+++ b/dev-qt/qtbase/files/qtbase-6.6.3-gcc14-avx512fp16.patch
@@ -0,0 +1,15 @@
+Simply disable the broken path rather than worry about it for now.
+
+Likely an easy fix but would rather this be handled upstream and
+reported by someone that is affected and can test.
+
+https://bugs.gentoo.org/926287
+--- a/src/gui/painting/qrgbafloat.h
++++ b/src/gui/painting/qrgbafloat.h
+@@ -20,5 +20,5 @@
+ public:
+     using Type = F;
+-#if defined(__AVX512FP16__) && QFLOAT16_IS_NATIVE
++#if 0
+     // AVX512FP16 has multiplication instructions
+     using FastType = F;

diff --git a/dev-qt/qtbase/qtbase-6.6.3.ebuild 
b/dev-qt/qtbase/qtbase-6.6.3.ebuild
index 1adebe3c5958..40a65fab575d 100644
--- a/dev-qt/qtbase/qtbase-6.6.3.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.3.ebuild
@@ -137,6 +137,7 @@ PATCHES=(
        "${FILESDIR}"/${PN}-6.5.2-no-glx.patch
        "${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
        "${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
+       "${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch
 )
 
 src_prepare() {

diff --git a/dev-qt/qtbase/qtbase-6.6.9999.ebuild 
b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
index 1adebe3c5958..40a65fab575d 100644
--- a/dev-qt/qtbase/qtbase-6.6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
@@ -137,6 +137,7 @@ PATCHES=(
        "${FILESDIR}"/${PN}-6.5.2-no-glx.patch
        "${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
        "${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
+       "${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch
 )
 
 src_prepare() {

diff --git a/dev-qt/qtbase/qtbase-6.7.0_rc2-r1.ebuild 
b/dev-qt/qtbase/qtbase-6.7.0_rc2-r1.ebuild
index 87d5fb955203..016279f8fec5 100644
--- a/dev-qt/qtbase/qtbase-6.7.0_rc2-r1.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.0_rc2-r1.ebuild
@@ -138,6 +138,7 @@ PATCHES=(
        "${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch
        "${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
        "${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
+       "${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch
 )
 
 src_prepare() {

diff --git a/dev-qt/qtbase/qtbase-6.7.9999.ebuild 
b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
index 87d5fb955203..016279f8fec5 100644
--- a/dev-qt/qtbase/qtbase-6.7.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
@@ -138,6 +138,7 @@ PATCHES=(
        "${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch
        "${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
        "${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
+       "${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch
 )
 
 src_prepare() {

diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild 
b/dev-qt/qtbase/qtbase-6.9999.ebuild
index 87d5fb955203..016279f8fec5 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -138,6 +138,7 @@ PATCHES=(
        "${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch
        "${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
        "${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
+       "${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch
 )
 
 src_prepare() {

Reply via email to