From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 713B6158044 for ; Mon, 4 Mar 2024 14:53:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 94002E2A46; Mon, 4 Mar 2024 14:53:20 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4AC9CE2A46 for ; Mon, 4 Mar 2024 14:53:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8F81E343011 for ; Mon, 4 Mar 2024 14:53:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2D45714A2 for ; Mon, 4 Mar 2024 14:53:18 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1709563983.2b0f2b8e183501df3f878bd15876d6dbe60aaeaa.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtquick3d/, dev-qt/qtquick3d/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtquick3d/files/qtquick3d-6.6.2-x32abi.patch dev-qt/qtquick3d/qtquick3d-6.6.2.ebuild dev-qt/qtquick3d/qtquick3d-6.6.9999.ebuild dev-qt/qtquick3d/qtquick3d-6.7.9999.ebuild dev-qt/qtquick3d/qtquick3d-6.9999.ebuild X-VCS-Directories: dev-qt/qtquick3d/files/ dev-qt/qtquick3d/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 2b0f2b8e183501df3f878bd15876d6dbe60aaeaa X-VCS-Branch: master Date: Mon, 4 Mar 2024 14:53:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1b73cc42-9de9-4bed-887f-ff2bef4a01f1 X-Archives-Hash: 85aa8617a926e403d8a80873330e6b5a commit: 2b0f2b8e183501df3f878bd15876d6dbe60aaeaa Author: Ionen Wolkens gentoo org> AuthorDate: Mon Mar 4 14:19:44 2024 +0000 Commit: Ionen Wolkens gentoo 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 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=(