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 0D69815800F for ; Mon, 30 Jan 2023 13:26:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E673BE0975; Mon, 30 Jan 2023 13:26:28 +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 C2F17E0975 for ; Mon, 30 Jan 2023 13:26:28 +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 85ED5340DB5 for ; Mon, 30 Jan 2023 13:26:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E5BE5828 for ; Mon, 30 Jan 2023 13:26:25 +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: <1675085128.4b5edf17f69a4315b3fdc422d4a8c4e81c73d6b7.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/files/, sci-libs/vtk/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/vtk/files/vtk-9.2.5-Add-include-cstdint-for-gcc-13.patch sci-libs/vtk/files/vtk-9.2.5-Add-include-cstdint-to-compile-with-gcc-13.patch sci-libs/vtk/vtk-9.2.5.ebuild X-VCS-Directories: sci-libs/vtk/ sci-libs/vtk/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4b5edf17f69a4315b3fdc422d4a8c4e81c73d6b7 X-VCS-Branch: master Date: Mon, 30 Jan 2023 13:26:25 +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: 831ddcc2-2464-4c1f-858f-9ca81ae98e1d X-Archives-Hash: 7a29ec894f5338a9b58e69ff56458d01 commit: 4b5edf17f69a4315b3fdc422d4a8c4e81c73d6b7 Author: Bernd Waibel posteo net> AuthorDate: Sun Jan 29 08:42:49 2023 +0000 Commit: Sam James gentoo org> CommitDate: Mon Jan 30 13:25:28 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b5edf17 sci-libs/vtk: fix build with gcc-13 Add #include to build with gcc-13 Closes: https://bugs.gentoo.org/892435 Signed-off-by: Bernd Waibel posteo.net> Closes: https://github.com/gentoo/gentoo/pull/29329 Signed-off-by: Sam James gentoo.org> .../vtk-9.2.5-Add-include-cstdint-for-gcc-13.patch | 20 +++++++++++++++ ...dd-include-cstdint-to-compile-with-gcc-13.patch | 30 ++++++++++++++++++++++ sci-libs/vtk/vtk-9.2.5.ebuild | 2 ++ 3 files changed, 52 insertions(+) diff --git a/sci-libs/vtk/files/vtk-9.2.5-Add-include-cstdint-for-gcc-13.patch b/sci-libs/vtk/files/vtk-9.2.5-Add-include-cstdint-for-gcc-13.patch new file mode 100644 index 000000000000..3ab71521b6b5 --- /dev/null +++ b/sci-libs/vtk/files/vtk-9.2.5-Add-include-cstdint-for-gcc-13.patch @@ -0,0 +1,20 @@ +From 69351f357a82c0bb7f97f4f707962de3400760a8 Mon Sep 17 00:00:00 2001 +From: Bernd Waibel +Date: Sun, 29 Jan 2023 12:17:36 +0100 +Subject: [PATCH] Add #include for gcc-13 + +Bug: https://gitlab.kitware.com/vtk/vtk/-/issues/18782 +Signed-off-by: Bernd Waibel +--- a/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h ++++ b/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h +@@ -50,6 +50,7 @@ + #include "vtkRenderingMatplotlibModule.h" // For export macro + + #include // for std::vector ++#include // for std::uint64_t + + struct _object; + typedef struct _object PyObject; +-- +2.39.1 + diff --git a/sci-libs/vtk/files/vtk-9.2.5-Add-include-cstdint-to-compile-with-gcc-13.patch b/sci-libs/vtk/files/vtk-9.2.5-Add-include-cstdint-to-compile-with-gcc-13.patch new file mode 100644 index 000000000000..82bf19b6b07f --- /dev/null +++ b/sci-libs/vtk/files/vtk-9.2.5-Add-include-cstdint-to-compile-with-gcc-13.patch @@ -0,0 +1,30 @@ +https://gitlab.kitware.com/vtk/vtk/-/merge-requests/9857 + +From ef95422b62296e4c136917095eace14f48cefb82 Mon Sep 17 00:00:00 2001 +From: Laurent Rineau +Date: Tue, 17 Jan 2023 16:18:53 +0100 +Subject: [PATCH] Add #include to compile with gcc13 + +The `vtkSEPReader` was introduced by MRs !4909 (from my former +collaborator Maxime) and !4938. Then it was highly modified by +!7516. The later MR is the one that introduced the uses of +`std::uint8_t` and `std::uint32_t`. + +Those types needs the inclusion of ``. +--- a/IO/Image/vtkSEPReader.h ++++ b/IO/Image/vtkSEPReader.h +@@ -25,8 +25,9 @@ + #include "vtkImageAlgorithm.h" + #include "vtkNew.h" // for ivars + +-#include // for std::array +-#include // for std::string ++#include // for std::array ++#include // for std::uint8_t and std::uint32_t ++#include // for std::string + + namespace details + { +-- +GitLab + diff --git a/sci-libs/vtk/vtk-9.2.5.ebuild b/sci-libs/vtk/vtk-9.2.5.ebuild index 5f5b88e80ce1..88721c38e704 100644 --- a/sci-libs/vtk/vtk-9.2.5.ebuild +++ b/sci-libs/vtk/vtk-9.2.5.ebuild @@ -161,6 +161,8 @@ PATCHES=( "${FILESDIR}"/${PN}-9.2.2-vtkGeometryFilter-add-missing-mutex-header-file.patch "${FILESDIR}"/${PN}-9.2.2-VTKm-respect-user-CXXFLAGS.patch "${FILESDIR}"/${PN}-9.2.2-link-with-glut-library-for-freeglut.patch + "${FILESDIR}"/${PN}-9.2.5-Add-include-cstdint-to-compile-with-gcc-13.patch + "${FILESDIR}"/${PN}-9.2.5-Add-include-cstdint-for-gcc-13.patch ) DOCS=( CONTRIBUTING.md README.md )