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 59F4315800D for ; Sat, 31 Dec 2022 15:36:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A1596E0871; Sat, 31 Dec 2022 15:36:50 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8516CE0871 for ; Sat, 31 Dec 2022 15:36:50 +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 7AE0733BF3C for ; Sat, 31 Dec 2022 15:36:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 170797F4 for ; Sat, 31 Dec 2022 15:36:48 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1672500966.bdaa85f652b25c81c889d9a1bcff53a819b0afc2.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/opencascade/files/opencascade-7.7.0-build-against-vtk-9.2.patch sci-libs/opencascade/opencascade-7.7.0-r1.ebuild sci-libs/opencascade/opencascade-7.7.0.ebuild X-VCS-Directories: sci-libs/opencascade/files/ sci-libs/opencascade/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: bdaa85f652b25c81c889d9a1bcff53a819b0afc2 X-VCS-Branch: master Date: Sat, 31 Dec 2022 15:36:48 +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: 2dde0214-585a-4ca9-9666-32484bd7c3c3 X-Archives-Hash: e27cf6924bf417e6346713747dbc7a40 commit: bdaa85f652b25c81c889d9a1bcff53a819b0afc2 Author: Bernd Waibel posteo net> AuthorDate: Sun Dec 18 15:37:34 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Dec 31 15:36:06 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdaa85f6 sci-libs/opencascade: build 7.7.0 against vtk-9.2 cleanup some X related libraries Closes: https://bugs.gentoo.org/886343 Signed-off-by: Bernd Waibel posteo.net> Signed-off-by: Sam James gentoo.org> .../opencascade-7.7.0-build-against-vtk-9.2.patch | 36 ++++++++++++++++++++++ ...de-7.7.0.ebuild => opencascade-7.7.0-r1.ebuild} | 25 ++++++--------- 2 files changed, 45 insertions(+), 16 deletions(-) diff --git a/sci-libs/opencascade/files/opencascade-7.7.0-build-against-vtk-9.2.patch b/sci-libs/opencascade/files/opencascade-7.7.0-build-against-vtk-9.2.patch new file mode 100644 index 000000000000..7e744189a8d2 --- /dev/null +++ b/sci-libs/opencascade/files/opencascade-7.7.0-build-against-vtk-9.2.patch @@ -0,0 +1,36 @@ +From: http://git.dev.opencascade.org/gitweb/?p=occt.git;a=commitdiff_plain;h=7f523af8e8a63ee17d8fc26f107c191cd51dcd44;hp=0b4962a7f04caef12d090d087b7196cefde0703c + +From: Aiden Grossman +Date: Mon, 10 Oct 2022 18:25:13 +0000 (-0700) +Subject: Fix naming conflict between X11 headers and VTK 9.2.2+ +X-Git-Url: http://git.dev.opencascade.org/gitweb/?p=occt.git;a=commitdiff_plain;h=7f523af8e8a63ee17d8fc26f107c191cd51dcd44;hp=0b4962a7f04caef12d090d087b7196cefde0703c + +Fix naming conflict between X11 headers and VTK 9.2.2+ + +Currently, the GLX headers include the X11 headers which use a +preprocessor define to make Status an int. However, VTK has a class +called Status, and this define replaces this class name with int which +results in compilation errors. This patch undefs Status and Success, +which are both defined in the X11 headers if they exist so that there +are no conflicts within the VTK headers for newer versions. +--- + +--- a/src/IVtkDraw/IVtkDraw_Interactor.cxx ++++ b/src/IVtkDraw/IVtkDraw_Interactor.cxx +@@ -27,6 +27,16 @@ + #undef AllValues + #endif + ++// Prevent naming collisions between X11 ++// and VTK versions 9.2.0 and above. ++// X11 is included through glx ++#ifdef Status ++#undef Status ++#endif ++#ifdef Success ++#undef Success ++#endif ++ + #include + #include + #endif diff --git a/sci-libs/opencascade/opencascade-7.7.0.ebuild b/sci-libs/opencascade/opencascade-7.7.0-r1.ebuild similarity index 88% rename from sci-libs/opencascade/opencascade-7.7.0.ebuild rename to sci-libs/opencascade/opencascade-7.7.0-r1.ebuild index c2f7e7dbf7a4..efd245f9b465 100644 --- a/sci-libs/opencascade/opencascade-7.7.0.ebuild +++ b/sci-libs/opencascade/opencascade-7.7.0-r1.ebuild @@ -34,7 +34,7 @@ RDEPEND=" media-libs/fontconfig media-libs/freetype:2 virtual/opengl - x11-libs/libXmu + x11-libs/libX11 examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 @@ -63,6 +63,7 @@ PATCHES=( "${FILESDIR}"/${PN}-7.7.0-add-missing-include-limits.patch "${FILESDIR}"/${PN}-7.7.0-fix-installation-of-cmake-config-files.patch "${FILESDIR}"/${PN}-7.7.0-avoid-pre-stripping-binaries.patch + "${FILESDIR}"/${PN}-7.7.0-build-against-vtk-9.2.patch ) src_prepare() { @@ -132,24 +133,16 @@ src_configure() { fi if use vtk; then + mycmakeargs+=( + -D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr + -D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir) + ) if has_version ">=sci-libs/vtk-9.2.0"; then - mycmakeargs+=( - -D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr - -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.2 - -D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir) - ) + mycmakeargs+=( -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.2 ) elif has_version ">=sci-libs/vtk-9.1.0"; then - mycmakeargs+=( - -D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr - -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.1 - -D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir) - ) + mycmakeargs+=( -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.1 ) elif has_version ">=sci-libs/vtk-9.0.0"; then - mycmakeargs+=( - -D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr - -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.0 - -D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir) - ) + mycmakeargs+=( -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.0 ) fi fi