commit:     9b07a9098003ac55adc8a611b9aa40a880a48854
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  4 16:54:25 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Aug  4 17:03:08 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b07a909

dev-qt/qtshadertools: fix build with gcc15

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

 dev-qt/qtshadertools/files/qtshadertools-6.7.2-gcc15.patch | 8 ++++++++
 dev-qt/qtshadertools/qtshadertools-6.7.2.ebuild            | 4 ++++
 dev-qt/qtshadertools/qtshadertools-6.7.9999.ebuild         | 4 ++++
 dev-qt/qtshadertools/qtshadertools-6.8.9999.ebuild         | 4 ++++
 dev-qt/qtshadertools/qtshadertools-6.9999.ebuild           | 4 ++++
 5 files changed, 24 insertions(+)

diff --git a/dev-qt/qtshadertools/files/qtshadertools-6.7.2-gcc15.patch 
b/dev-qt/qtshadertools/files/qtshadertools-6.7.2-gcc15.patch
new file mode 100644
index 000000000000..ceab10f4c1f6
--- /dev/null
+++ b/dev-qt/qtshadertools/files/qtshadertools-6.7.2-gcc15.patch
@@ -0,0 +1,8 @@
+https://bugs.gentoo.org/937261
+https://github.com/KhronosGroup/glslang/pull/3684
+--- a/src/3rdparty/glslang/SPIRV/SpvBuilder.h
++++ b/src/3rdparty/glslang/SPIRV/SpvBuilder.h
+@@ -58,2 +58,3 @@
+ #include <algorithm>
++#include <cstdint>
+ #include <map>

diff --git a/dev-qt/qtshadertools/qtshadertools-6.7.2.ebuild 
b/dev-qt/qtshadertools/qtshadertools-6.7.2.ebuild
index e3cbab00e5f0..f136b15894c7 100644
--- a/dev-qt/qtshadertools/qtshadertools-6.7.2.ebuild
+++ b/dev-qt/qtshadertools/qtshadertools-6.7.2.ebuild
@@ -15,3 +15,7 @@ RDEPEND="
        ~dev-qt/qtbase-${PV}:6[gui]
 "
 DEPEND="${RDEPEND}"
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-6.7.2-gcc15.patch
+)

diff --git a/dev-qt/qtshadertools/qtshadertools-6.7.9999.ebuild 
b/dev-qt/qtshadertools/qtshadertools-6.7.9999.ebuild
index 68dae044e31f..15f54c185b88 100644
--- a/dev-qt/qtshadertools/qtshadertools-6.7.9999.ebuild
+++ b/dev-qt/qtshadertools/qtshadertools-6.7.9999.ebuild
@@ -15,3 +15,7 @@ RDEPEND="
        ~dev-qt/qtbase-${PV}:6[gui]
 "
 DEPEND="${RDEPEND}"
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-6.7.2-gcc15.patch
+)

diff --git a/dev-qt/qtshadertools/qtshadertools-6.8.9999.ebuild 
b/dev-qt/qtshadertools/qtshadertools-6.8.9999.ebuild
index 68dae044e31f..15f54c185b88 100644
--- a/dev-qt/qtshadertools/qtshadertools-6.8.9999.ebuild
+++ b/dev-qt/qtshadertools/qtshadertools-6.8.9999.ebuild
@@ -15,3 +15,7 @@ RDEPEND="
        ~dev-qt/qtbase-${PV}:6[gui]
 "
 DEPEND="${RDEPEND}"
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-6.7.2-gcc15.patch
+)

diff --git a/dev-qt/qtshadertools/qtshadertools-6.9999.ebuild 
b/dev-qt/qtshadertools/qtshadertools-6.9999.ebuild
index 68dae044e31f..15f54c185b88 100644
--- a/dev-qt/qtshadertools/qtshadertools-6.9999.ebuild
+++ b/dev-qt/qtshadertools/qtshadertools-6.9999.ebuild
@@ -15,3 +15,7 @@ RDEPEND="
        ~dev-qt/qtbase-${PV}:6[gui]
 "
 DEPEND="${RDEPEND}"
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-6.7.2-gcc15.patch
+)

Reply via email to