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 A6C7C158043 for ; Sun, 14 Apr 2024 08:56:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C0315E29FB; Sun, 14 Apr 2024 08:56:48 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 93A98E29FB for ; Sun, 14 Apr 2024 08:56:48 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9ACB8343360 for ; Sun, 14 Apr 2024 08:56:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D1E719B6 for ; Sun, 14 Apr 2024 08:56:45 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1713084833.91f702aa09d2fd99e78bb974ae80440daf8dc74b.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/, media-gfx/freecad/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/freecad/files/freecad-0.21.2-shiboken-6.7.0.patch media-gfx/freecad/freecad-0.21.2-r2.ebuild X-VCS-Directories: media-gfx/freecad/ media-gfx/freecad/files/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 91f702aa09d2fd99e78bb974ae80440daf8dc74b X-VCS-Branch: master Date: Sun, 14 Apr 2024 08:56:45 +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: f49ec1e8-c936-4a83-8450-c3452d16e21a X-Archives-Hash: c058979ebe73f6fe05a8c2708e4f83a7 commit: 91f702aa09d2fd99e78bb974ae80440daf8dc74b Author: Andrew Ammerlaan gentoo org> AuthorDate: Sun Apr 14 08:53:53 2024 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Sun Apr 14 08:53:53 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91f702aa media-gfx/freecad: add patch for build with shiboken 6.7.0 patch is added conditional because not sure what this does with older shiboken and block against opencascade[inspector] which breaks qt6 configure Bug: https://bugs.gentoo.org/929973 Signed-off-by: Andrew Ammerlaan gentoo.org> media-gfx/freecad/files/freecad-0.21.2-shiboken-6.7.0.patch | 8 ++++++++ media-gfx/freecad/freecad-0.21.2-r2.ebuild | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/media-gfx/freecad/files/freecad-0.21.2-shiboken-6.7.0.patch b/media-gfx/freecad/files/freecad-0.21.2-shiboken-6.7.0.patch new file mode 100644 index 000000000000..8efd55121ee7 --- /dev/null +++ b/media-gfx/freecad/files/freecad-0.21.2-shiboken-6.7.0.patch @@ -0,0 +1,8 @@ +https://bugs.gentoo.org/929973 +--- a/src/Gui/PythonWrapper.cpp ++++ b/src/Gui/PythonWrapper.cpp +@@ -480,3 +480,3 @@ + return false; +- types = Shiboken::Module::getTypes(requiredModule); ++ types = reinterpret_cast(Shiboken::Module::getTypes(requiredModule)); + } diff --git a/media-gfx/freecad/freecad-0.21.2-r2.ebuild b/media-gfx/freecad/freecad-0.21.2-r2.ebuild index f0c0f0c47bbb..33eb615da690 100644 --- a/media-gfx/freecad/freecad-0.21.2-r2.ebuild +++ b/media-gfx/freecad/freecad-0.21.2-r2.ebuild @@ -98,6 +98,7 @@ RDEPEND=" ' python3_{10..11} ) ) qt6? ( + sci-libs/opencascade[-inspector(-)] designer? ( dev-qt/qttools:6[designer] ) dev-qt/qt5compat:6 dev-qt/qttools:6[widgets] @@ -181,6 +182,11 @@ src_prepare() { find "${S}" -type f -exec dos2unix -q {} \; || die "failed to convert to unix line endings" + if has_version ">=dev-python/shiboken6-6.7.0"; then + # https://bugs.gentoo.org/929973 + eapply "${FILESDIR}/${PN}-0.21.2-shiboken-6.7.0.patch" + fi + cmake_src_prepare }