[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtquick3d/, dev-qt/qtquick3d/files/

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtquick3d/, dev-qt/qtquick3d/files/

[Ionen Wolkens]

commit:     2b0f2b8e183501df3f878bd15876d6dbe60aaeaa
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  4 14:19:44 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Mar  4 14:53:03 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b0f2b8e

dev-qt/qtquick3d: fix build with x32 abi

Have not tested myself, but this is harmless.

Closes: https://bugs.gentoo.org/926094
Thanks-to: Andrii Batyiev
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qtquick3d/files/qtquick3d-6.6.2-x32abi.patch | 12 ++++++++++++
 dev-qt/qtquick3d/qtquick3d-6.6.2.ebuild             |  1 +
 dev-qt/qtquick3d/qtquick3d-6.6.9999.ebuild          |  1 +
 dev-qt/qtquick3d/qtquick3d-6.7.9999.ebuild          |  1 +
 dev-qt/qtquick3d/qtquick3d-6.9999.ebuild            |  1 +
 5 files changed, 16 insertions(+)

diff --git a/dev-qt/qtquick3d/files/qtquick3d-6.6.2-x32abi.patch b/dev-qt/qtquick3d/files/qtquick3d-6.6.2-x32abi.patch
new file mode 100644
index 000000000000..981f2f87b3c6
--- /dev/null
+++ b/dev-qt/qtquick3d/files/qtquick3d-6.6.2-x32abi.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/926094
+https://bugreports.qt.io/browse/QTBUG-122955
+
+https://bugs.gentoo.org/926093
+https://github.com/embree/embree/issues/477
+--- a/src/3rdparty/embree/common/sys/platform.h
++++ b/src/3rdparty/embree/common/sys/platform.h
+@@ -34,3 +34,3 @@
+ /* detect 64 bit platform */
+-#if defined(__X86_64__) || defined(__aarch64__)
++#if (defined(__X86_64__) || defined(__aarch64__)) && ! defined(__ILP32__)
+ #define __64BIT__

diff --git a/dev-qt/qtquick3d/qtquick3d-6.6.2.ebuild b/dev-qt/qtquick3d/qtquick3d-6.6.2.ebuild
index 365c08549b82..2e694e24b23b 100644
--- a/dev-qt/qtquick3d/qtquick3d-6.6.2.ebuild
+++ b/dev-qt/qtquick3d/qtquick3d-6.6.2.ebuild
@@ -31,6 +31,7 @@ DEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.6.2-gcc14.patch
+	"${FILESDIR}"/${PN}-6.6.2-x32abi.patch
 )
 
 CMAKE_SKIP_TESTS=(

diff --git a/dev-qt/qtquick3d/qtquick3d-6.6.9999.ebuild b/dev-qt/qtquick3d/qtquick3d-6.6.9999.ebuild
index f1ff25e4b555..b7438f43ac1d 100644
--- a/dev-qt/qtquick3d/qtquick3d-6.6.9999.ebuild
+++ b/dev-qt/qtquick3d/qtquick3d-6.6.9999.ebuild
@@ -31,6 +31,7 @@ DEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.6.2-gcc14.patch
+	"${FILESDIR}"/${PN}-6.6.2-x32abi.patch
 )
 
 CMAKE_SKIP_TESTS=(

diff --git a/dev-qt/qtquick3d/qtquick3d-6.7.9999.ebuild b/dev-qt/qtquick3d/qtquick3d-6.7.9999.ebuild
index f1ff25e4b555..b7438f43ac1d 100644
--- a/dev-qt/qtquick3d/qtquick3d-6.7.9999.ebuild
+++ b/dev-qt/qtquick3d/qtquick3d-6.7.9999.ebuild
@@ -31,6 +31,7 @@ DEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.6.2-gcc14.patch
+	"${FILESDIR}"/${PN}-6.6.2-x32abi.patch
 )
 
 CMAKE_SKIP_TESTS=(

diff --git a/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild b/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild
index f1ff25e4b555..b7438f43ac1d 100644
--- a/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild
+++ b/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild
@@ -31,6 +31,7 @@ DEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.6.2-gcc14.patch
+	"${FILESDIR}"/${PN}-6.6.2-x32abi.patch
 )
 
 CMAKE_SKIP_TESTS=(