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 F319115ACFC for ; Wed, 3 May 2023 22:23:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 121B0E0FC0; Wed, 3 May 2023 22:23:43 +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 BCC55E0FC1 for ; Wed, 3 May 2023 22:23:42 +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 8B5EA3416C9 for ; Wed, 3 May 2023 22:23:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D4AE6A55 for ; Wed, 3 May 2023 22:23:39 +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: <1683152599.86a9526ce8490c8689d8dad8c5c82a2f903e8ffa.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/, sci-libs/vtk/files/ 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-More-include-cstdint-to-compile-with-gcc13.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: 86a9526ce8490c8689d8dad8c5c82a2f903e8ffa X-VCS-Branch: master Date: Wed, 3 May 2023 22:23:39 +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: 6d8cdeba-c696-4ebd-9caa-02a4ab47371f X-Archives-Hash: 2b4192b4ee52a0c71eeecab31b26bd9f commit: 86a9526ce8490c8689d8dad8c5c82a2f903e8ffa Author: Bernd Waibel posteo net> AuthorDate: Wed May 3 16:14:18 2023 +0000 Commit: Sam James gentoo org> CommitDate: Wed May 3 22:23:19 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86a9526c sci-libs/vtk: fix build with gcc-13 add upstream patch with gcc-13 related fixes Closes: https://bugs.gentoo.org/905387 Signed-off-by: Bernd Waibel posteo.net> Closes: https://github.com/gentoo/gentoo/pull/30859 Signed-off-by: Sam James gentoo.org> .../vtk-9.2.5-Add-include-cstdint-for-gcc-13.patch | 20 ------------- ...ore-include-cstdint-to-compile-with-gcc13.patch | 33 ++++++++++++++++++++++ sci-libs/vtk/vtk-9.2.5.ebuild | 2 +- 3 files changed, 34 insertions(+), 21 deletions(-) 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 deleted file mode 100644 index 3ab71521b6b5..000000000000 --- a/sci-libs/vtk/files/vtk-9.2.5-Add-include-cstdint-for-gcc-13.patch +++ /dev/null @@ -1,20 +0,0 @@ -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-More-include-cstdint-to-compile-with-gcc13.patch b/sci-libs/vtk/files/vtk-9.2.5-More-include-cstdint-to-compile-with-gcc13.patch new file mode 100644 index 000000000000..356efbb4da9a --- /dev/null +++ b/sci-libs/vtk/files/vtk-9.2.5-More-include-cstdint-to-compile-with-gcc13.patch @@ -0,0 +1,33 @@ +https://bugs.gentoo.org/905387 +https://github.com/Kitware/VTK/commit/4d8283bcb460ff60d8df1b7b67b5db19876a5ca3 + +From 890f7574f01cf58cb1522772a62ca07deb438479 Mon Sep 17 00:00:00 2001 +From: Mathieu Westphal +Date: Thu, 23 Feb 2023 18:06:07 +0100 +Subject: [PATCH 1580/2105] More #include to compile with gcc13 + +--- a/IO/PIO/PIOData.h ++++ b/IO/PIO/PIOData.h +@@ -1,6 +1,7 @@ + #if !defined(_PIODATA_H) + #define _PIODATA_H + ++#include + #include + #include + #include +--- a/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h ++++ b/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h +@@ -49,7 +49,8 @@ + #include "vtkMathTextUtilities.h" + #include "vtkRenderingMatplotlibModule.h" // For export macro + +-#include // for std::vector ++#include // for std::uint64_t ++#include // for std::vector + + struct _object; + typedef struct _object PyObject; +-- +2.40.1 + diff --git a/sci-libs/vtk/vtk-9.2.5.ebuild b/sci-libs/vtk/vtk-9.2.5.ebuild index e4fc6333d5f8..23a48458dd3a 100644 --- a/sci-libs/vtk/vtk-9.2.5.ebuild +++ b/sci-libs/vtk/vtk-9.2.5.ebuild @@ -162,8 +162,8 @@ PATCHES=( "${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 "${FILESDIR}"/${PN}-9.2.5-Fix-compilation-error-with-CUDA-12.patch + "${FILESDIR}"/${PN}-9.2.5-More-include-cstdint-to-compile-with-gcc13.patch ) DOCS=( CONTRIBUTING.md README.md )