gentoo auto-resync : 30:01:2023 - 14:58:12

4 files changed, 55 insertions, 1 deletions

diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 90cb8a030ff0..a86718e8895e 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -8,6 +8,8 @@ AUX vtk-9.1.0-avoid-naming-collision-with-netcdf-4.9.0.patch 1020 BLAKE2B 96a8bc
 AUX vtk-9.2.2-VTKm-respect-user-CXXFLAGS.patch 3256 BLAKE2B d769a03237938c58ae86dd9ec8ba13af2da07551ccfe7efed9bb98068233e37b4d0cf164a72ed157cf7ee79442c82f223566c74b6fe799a66e85a940a9f14035 SHA512 9373fa9cff8c998236d6fd16271bd40029355f9fbc7c28714a98de7488784930e0878c8424eac08c9ad56546974cf8d80c515cba4bece7dd582a3a1867082e9d
 AUX vtk-9.2.2-link-with-glut-library-for-freeglut.patch 594 BLAKE2B 054c68fa27fae4b331a78a6fd54fed9c95a18d5a54b088be1a78625922dd2638394198c3a61aed4288739bf49ea10090908133f28106d0359e055bfad9d8ed0a SHA512 1b2e84c916fa1a1a28eca981a05c190f105168e8c7adbc3d8842539de90bbca9af3511c584dc500c75e9499e7d175dbcb91125e246f93d1b16bcbf97ce2ce027
 AUX vtk-9.2.2-vtkGeometryFilter-add-missing-mutex-header-file.patch 625 BLAKE2B 46c15c6e2a1fde4974e0bb79bf96d9d695e5ab10f189ce47eb0a17845a75ef58eb0f22125c8f0043463b19b8adcdea837ce10725bbd54f1b78bcdd01b807df30 SHA512 b1a4093a63d67bf0de3f2eb4c738d4cb6da315395b3f2a1d54b449e82a008c6373ce332af7e235e693e9af6cc043ed8d28e2a62a9e05177557d628ce677e1bb5
+AUX vtk-9.2.5-Add-include-cstdint-for-gcc-13.patch 664 BLAKE2B 3cb9685adda18a858c04ba6860d965b894433306c7978087db0e1fb6e2733dd3b246ad1600977bc48691d4e6b9c434d1bcaa131646ab4846f1bf4fe02c7a14cd SHA512 8ebd89eb56e412daf43c4384b36266e2534892e82529c71584f816bcb56c80e9cc1725bb9d90f3f36a6da980b04f87f5058b06985fe8a67eddc32350ea71324e
+AUX vtk-9.2.5-Add-include-cstdint-to-compile-with-gcc-13.patch 939 BLAKE2B f97780f5cb469f403615817c76862183604dcebbc40cc6024b708b6be692018654397f389d62015b2a8f0b6bf55ebe41e3d3f60f66fc74829e0cccec2d8a00b9 SHA512 6dfb504500ff35ba98e9610b1d8b868990b933c94789df3bacf155ee212cecb81132754d5b8f0bb82181638ae0d3b47478ae42d2b75fcc9cf5c51be3c2f7ff0a
 DIST VTK-9.0.3.tar.gz 34684378 BLAKE2B 6862ab2df95bbefe9d3970757af6521cfa874476f6ee8e64c4e6e279f2e0cbb8a8299bc3b0b8bb9b7254d01a169644e7927b67b11b2ce934ddc87bce0a9e4c26 SHA512 00528011f9206444d09fc6cea05c46930745bb70ea02be6244ab3eb510ae82af772157c025157b1761dc4c6a9ab538b57f814c03a708f30aa3598a421fdc6ae2
 DIST VTK-9.1.0.tar.gz 47871165 BLAKE2B 68cebc0879737a519b53e73f198356208b047c301d38ee2d62b9a14539cdb9aa76bd7174baa29592c7b1cfd1cc9700d01e98519a207d67a232d16ad37295ac31 SHA512 b2c4be8795fa082e0776e6ffdb9a3fd88dbb235841a8369a34ebe26cf4c5fcb1610fcca987be314510629da3edc74ee76c0ce2cc88d5ef4b099ac550ac892b0a
 DIST VTK-9.2.2.tar.gz 53801737 BLAKE2B 345538004a1b147f8a6812e30b6e31bdfba27d13c47e3c659ef6eb51224aa6015a44e6aaabbc6d1b127691592b4727a51c952dc565d1a12f2eddedd1536af58b SHA512 11b8203a4efaac0cda9ea46acf58c0d88c18f55bfd52e284f74ef313646913d194d3885da9d9fa7222d926502522505bfdf9d719f8c09790dab1315e2161610a
@@ -33,5 +35,5 @@ DIST vtkDocHtml-9.2.5.tar.gz 158865725 BLAKE2B ccfb6276955bda567e7f2b6fdc5e3e601
 EBUILD vtk-9.0.3-r7.ebuild 14954 BLAKE2B 09b60e3ae85660af76b714772bf71dfe0d2c8d68bf85d7456504fbeaf090fd9c0bf468a1da02110621e5f328d5478fcc88b04f8bd68cc26ec790ef6583928108 SHA512 96b32c0ebd13e7d8bc89a1d14332ce282a73f4a358f9617bfeb5acd066f94abbbee74d120551bd0e866865fda0e866381eb2bf8b0a624b3081085ce5f65fdcdd
 EBUILD vtk-9.1.0-r6.ebuild 17565 BLAKE2B 70a9f39e1d0a13d9c646915fe2788ee1a8bfd3a0d441476d5a9d5236937e5305d3ab13a1d34341c87a22390de38952ad102503e6242d91cfd7e27282a1b41750 SHA512 098b76a6add2cf6a6c355bf9998fc79a5b9f100c5dc6b6ccd80ed912f91752eecfe15d12c7dd4bff61988a3683ba821dbc7ddcc57fb87db3c82b724fd22d2892
 EBUILD vtk-9.2.2-r1.ebuild 22534 BLAKE2B 067856da05db7ad7a18c35c10026f2f52ff85845fb103816f5c77d9ea0133b16d22847ea53e9bc7fd1ccd6262da8731e22b57d101bf227b26f03a8cd135e8bba SHA512 5306fe9b66dfb17a252d26086ca2f29df1249a841756e4aa5a8b646ca87f52d71264b81cd62293e6ab0465f204cf06e454b9af052c0266202ae74013d0aaf45e
-EBUILD vtk-9.2.5.ebuild 22473 BLAKE2B ea9da0305870481303028eaa5911a7d3014d94a009e5fd24cfd83379e0210b305500e657cda5058cc6c5c53ebf00187ef034349da85dbd95b249448482a61f67 SHA512 252408804188d2e0975f9754a0db670fe5fe894c23f5ed0a442729c989a19493cd299cacaaf935015504d8096123554222755d21b8c80f16469b76a90cc2b3e6
+EBUILD vtk-9.2.5.ebuild 22613 BLAKE2B 2e23fbe9c711ec219b2c8d24b7ec29bfc8628ab735a9ec26c4e3f9dc3b237dc77a449d8817f4b41b02dfc31df1671ac65cf2d3217cc8ecf56b633d71f6fc36c7 SHA512 55901114567197fb82d9273a84120ffc0fd135a0ff1c7e3c9cf5614adc8f6f234f45646bd467a7e4dd8e6aa00c3a6582002b548bb8fd5884e2ef9297247ac2de
 MISC metadata.xml 1953 BLAKE2B 35f57e027a7dd2baa4cc25d72441ea0b3a8e62604f548511da80b3bd5dfbf545020d89f32e3daf0264cb903a1ddfd2d35bd6050ccb106c3ebd1214cb0cf08623 SHA512 1866c59f60ee8637c3238d5faf5c51a3e3a40866a01304d6c325ab46744447ea45acf84e5538cef452fed381679c02e75437459004542f7b978af3741b47db29
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 <waebbl-gentoo@posteo.net>
+Date: Sun, 29 Jan 2023 12:17:36 +0100
+Subject: [PATCH] Add #include <cstdint> for gcc-13
+
+Bug: https://gitlab.kitware.com/vtk/vtk/-/issues/18782
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
++++ b/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
+@@ -50,6 +50,7 @@
+ #include "vtkRenderingMatplotlibModule.h" // For export macro
+ 
+ #include <vector> // for std::vector
++#include <cstdint> // 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 <laurent.rineau@cgal.org>
+Date: Tue, 17 Jan 2023 16:18:53 +0100
+Subject: [PATCH] Add #include <cstdint> 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 `<cstdint>`.
+--- a/IO/Image/vtkSEPReader.h
++++ b/IO/Image/vtkSEPReader.h
+@@ -25,8 +25,9 @@
+ #include "vtkImageAlgorithm.h"
+ #include "vtkNew.h" // for ivars
+ 
+-#include <array>  // for std::array
+-#include <string> // for std::string
++#include <array>   // for std::array
++#include <cstdint> // for std::uint8_t and std::uint32_t
++#include <string>  // 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 )