gentoo auto-resync : 01:09:2022 - 19:24:10

3 files changed, 130 insertions, 1 deletions

diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 0e6edfa24d04..f8881f43d5ed 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -2,6 +2,7 @@ AUX vtk-8.2.0-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch 634 BLAKE2B c143e943
 AUX vtk-9.0.1-0001-fix-kepler-compute_arch-if-CUDA-toolkit-11-is-used.patch 1529 BLAKE2B 6e3890d824cd3362439f3fdea0f3d01a37d7a5c1e871ed6ecbcecfb4e6e425ce4caf6176b122df4b80fbe1b95661a729428be0e3302205309949080894be7563 SHA512 1177b4815a800afbbaf8ee92a4d52df513c702fcc965cd0c12ba7f91cf58b2ed035277138ef2a091a4649eaf84e6f9b9275f8875385d4cfb89f6d3262c5eef4a
 AUX vtk-9.0.1-limits-include-gcc11.patch 2654 BLAKE2B 69eae5782234e46c2a38dbc3bf3d01082518314c62742996b953a6b17ceca9d85ca9a83a907c6820210bc0ff406640476dcafc1a533d90071e1c0517a06cc938 SHA512 ef16b3dea49f29d537bfbef26e62f91e59056288eac5c0c41191fee6c2181336dcceaa27b84a541c442d986b8ce1cdf3a9effdedcab1e1a1e242efad34954d00
 AUX vtk-9.0.3-IO-FFMPEG-support-FFmpeg-5.0-API-changes.patch 4152 BLAKE2B 7f757ed934e5684bdbe17e6214ac1ab55b024359cb3a4819ea11c086bbb5abcafc787fd37433cb1cae77d9284aa206b43fb5dc8fe5b8923c4d1944c4fc39d748 SHA512 dfe9c8651fc6b6e5c5c8aa81b0821fd5ceee73c728bee5add29cd28b2c19fd79dbe9f14124f789eb647975693679b80d7219ac0a3189b5b78c2818d5055a4b7b
+AUX vtk-9.1.0-Change-or-scope-struct-names-to-avoid-conflicts.patch 4211 BLAKE2B 09af898d63f99ba36b664c2aa47e205db0a48d3956d7e5eeecf75537c65b9f14059bf217b9102a61f0c4c6fd3f9e9ea25ee4d2ec6e01b7ef0f3469a2cd5a992a SHA512 0a3090fbc736edf7791a0d863290d6673be62168341876425e8fb94803cf19adff72f54985c781575c4bd302b9316c94e8d32d335399f4f691d0bcbffa6b78bd
 AUX vtk-9.1.0-adjust-to-find-binaries.patch 998 BLAKE2B 2e2338aa0e918173776a6684ae344d8b75eac8bd514d38e7e1ba5ebfeede9b170f6ab76a2d2c003448673bfbf8c3a1aea58659580aa5e85cb0c5f0d1921233a1 SHA512 259953569d3e03b920783c882ee201b8eeb8c796103bbae25f2915084c26707b9d85e886874b61264da885506ee269edf839ea2da24aa5640ea46aeb8e6dbf5a
 AUX vtk-9.1.0-avoid-naming-collision-with-netcdf-4.9.0.patch 1020 BLAKE2B 96a8bcba9bc8d10fa3a929b988d936fc95e53e47621d5bcbf872aded3aefb8f40f1a4bef74b6f14f27d18e336bfa9c755c6a6d4235d347f97fb21b021149e0ce SHA512 caddb5f15f665748f652d7036798fe4d060d772473f52350bf2db6f3b468bd56011ad34c78306a57469ef4ad6943d7ed0b60762b3c43b54f98258d0d3639fd5e
 DIST VTK-9.0.3.tar.gz 34684378 BLAKE2B 6862ab2df95bbefe9d3970757af6521cfa874476f6ee8e64c4e6e279f2e0cbb8a8299bc3b0b8bb9b7254d01a169644e7927b67b11b2ce934ddc87bce0a9e4c26 SHA512 00528011f9206444d09fc6cea05c46930745bb70ea02be6244ab3eb510ae82af772157c025157b1761dc4c6a9ab538b57f814c03a708f30aa3598a421fdc6ae2
@@ -15,5 +16,5 @@ DIST VTKLargeDataFiles-9.1.0.tar.gz 247504557 BLAKE2B a05892347a1a5cf5cb0df3f1c1
 DIST vtkDocHtml-9.0.3.tar.gz 132650096 BLAKE2B 45fc1a6942df3e79e500a552c3b3cda2099b9451191559d471e3a2e785a8c52b2c6273cfd2cc4a3f3f65582e607d9414475f58d243fde96a4f985bed479e53db SHA512 9b5fef43f3c2b92aa1fe6a9ba9458d6677874b09b167654db7f26df6feffdc34ed1a8fb4e59d64b75625063a774af77fe57f275903602a5f7daa74e1a2e71800
 DIST vtkDocHtml-9.1.0.tar.gz 152767166 BLAKE2B 9163b6b1bf55810a310ca8bc211e067827b1f9907efd2a378363d8e6296d4bf07b25371b66c00cab3576fb06f0cb63fdf2ffea044033e2c42e9087819a3736ba SHA512 036daba5eb6503b5eb3e9323a4ab3ea0f27c09d8fef411dd2ed154c24d5a37d9f19d57db07576c8af404bfdb7178e95b137a3c27bfedb3f9cb72c04f717da80a
 EBUILD vtk-9.0.3-r5.ebuild 14400 BLAKE2B 0d63f7c28132d1486ac3b14b680d7cf730ec1f4572105870fa3d52096982a9dbe4d05b3955b9f4d0114dae5668698a398619bc38bd27fe02e22ca90e2a2f0e1d SHA512 146892890bf9b28dd2d5a00e3ac406814439d87ab4803014a56fce3281b124c48b02e19492a56aa474a4f0f175e39355dc17f437a23603901b04db1cf88c117b
-EBUILD vtk-9.1.0-r2.ebuild 16506 BLAKE2B 2d062d78c6857dacd0ded4d7fd7a2a0f6544d0572646a6f68f8701e42ebeb6efbb965eb02521fd9b49ec269ea3715e6c6bcf6c22050f8e0620d15f236ba2e5c6 SHA512 5dad4530e8821ecc0b68b9420025a8c18b0c865683092d2d8dd16ef87d9c6cc4bcf31002186535d79cff939afbef26841719c310177c06411d31c1761b67b50b
+EBUILD vtk-9.1.0-r2.ebuild 16580 BLAKE2B 5b53521c60a8e8a8f9909aa9c8dbea45992ebc94f395d7fcd30a0974c9a5f2c3b453b85d0213ae7695c02eac446a757da6452284313b47096b7c11c142b3c477 SHA512 9d3668029d6b7170e80deb3e83d5482c696a273171bc724116e20d604bff0eb6e50efe08954ba920f6a10ddb0e34fb430b2c3ddd1ef330c1b09fb425da1dfe35
 MISC metadata.xml 1349 BLAKE2B 778c471328fddbece653650c6a54b002dc9a48f5de3eb391bd0a84c9e0720ab1b2715b8013af55e60aac11a244090fc6e1d152c57a2c7f16b0b5306043e71731 SHA512 f55cac1ad724a7440bae4e7c364d3869ba25e4668463d0757ca8eb14469b539471c2bd31bb2e874c3a7982df490d9fc1c43c8d854dd4c511d0bde43ec0dc4a0c
diff --git a/sci-libs/vtk/files/vtk-9.1.0-Change-or-scope-struct-names-to-avoid-conflicts.patch b/sci-libs/vtk/files/vtk-9.1.0-Change-or-scope-struct-names-to-avoid-conflicts.patch
new file mode 100644
index 000000000000..24804ca2dc0a
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-9.1.0-Change-or-scope-struct-names-to-avoid-conflicts.patch
@@ -0,0 +1,127 @@
+From https://gitlab.kitware.com/vtk/vtk/-/commit/0322b938968eebee585ad7efb93bbdade7106355
+
+https://bugs.gentoo.org/863038
+https://gitlab.kitware.com/vtk/vtk/-/issues/18638
+
+From: Aron Helser <aron.helser@kitware.com>
+Date: Mon, 15 Aug 2022 10:06:13 -0400
+Subject: [PATCH 16/30] Change or scope struct names to avoid conflicts.
+
+(cherry picked from commit b79eb46bf5a4277cafc1ed2bd47fd3ffc28a5b3f)
+--- a/IO/AMR/vtkAMRFlashReader.cxx
++++ b/IO/AMR/vtkAMRFlashReader.cxx
+@@ -153,7 +153,7 @@ void vtkAMRFlashReader::ComputeStats(
+ 
+   for (int i = 0; i < internal->NumberOfBlocks; ++i)
+   {
+-    Block& theBlock = internal->Blocks[i];
++    FlashReaderBlock& theBlock = internal->Blocks[i];
+     double* gridMin = theBlock.MinBounds;
+     if (gridMin[0] < min[0])
+     {
+@@ -193,7 +193,7 @@ int vtkAMRFlashReader::FillMetaData()
+ 
+   for (int i = 0; i < this->Internal->NumberOfBlocks; ++i)
+   {
+-    Block& theBlock = this->Internal->Blocks[i];
++    FlashReaderBlock& theBlock = this->Internal->Blocks[i];
+ 
+     // Start numbering levels from 0!
+     int level = this->Internal->Blocks[i].Level - 1;
+--- a/IO/AMR/vtkAMRFlashReaderInternal.cxx
++++ b/IO/AMR/vtkAMRFlashReaderInternal.cxx
+@@ -692,7 +692,7 @@ void vtkFlashReaderInternal::GetBlockMinMaxGlobalDivisionIds()
+ 
+   for (int b = 0; b < this->NumberOfBlocks; b++)
+   {
+-    Block& B = this->Blocks[b];
++    FlashReaderBlock& B = this->Blocks[b];
+ 
+     for (int d = 0; d < 3; d++)
+     {
+--- a/IO/AMR/vtkAMRFlashReaderInternal.h
++++ b/IO/AMR/vtkAMRFlashReaderInternal.h
+@@ -74,7 +74,7 @@ typedef struct tagFlashReaderSimulationParameters
+   double RedShift;
+ } FlashReaderSimulationParameters;
+ 
+-typedef struct tagBlock
++typedef struct tagFlashReaderBlock
+ {
+   int Index;                   // Id of the block
+   int Level;                   // LOD level
+@@ -88,7 +88,7 @@ typedef struct tagBlock
+   double Center[3];            // center of the block
+   double MinBounds[3];         // lower left  of the bounding box
+   double MaxBounds[3];         // upper right of the bounding box
+-} Block;
++} FlashReaderBlock;
+ 
+ typedef struct tagFlashReaderSimulationInformation
+ {
+@@ -152,7 +152,7 @@ public:
+   FlashReaderSimulationInformation SimulationInformation; // CFD simulation
+ 
+   // blocks
+-  std::vector<Block> Blocks;
++  std::vector<FlashReaderBlock> Blocks;
+   std::vector<int> LeafBlocks;
+   std::vector<std::string> AttributeNames;
+ 
+--- a/IO/AMR/vtkAMRVelodyneReader.cxx
++++ b/IO/AMR/vtkAMRVelodyneReader.cxx
+@@ -219,7 +219,7 @@ int vtkAMRVelodyneReader::FillMetaData()
+   double spacing[3];
+   for (int i = 0; i < this->Internal->nBlocks; i++)
+   {
+-    Block& theBlock = this->Internal->Blocks[i];
++    vtkAMRVelodyneReaderInternal::Block& theBlock = this->Internal->Blocks[i];
+     int level = theBlock.Level;
+     int id = theBlock.Index;
+     CalculateBlockDims(this->Internal->blockDims.data(), theBlock.isFull, dims);
+@@ -243,7 +243,7 @@ vtkUniformGrid* vtkAMRVelodyneReader::GetAMRGrid(const int blockIdx)
+   {
+     return nullptr;
+   }
+-  Block& theBlock = this->Internal->Blocks[blockIdx];
++  vtkAMRVelodyneReaderInternal::Block& theBlock = this->Internal->Blocks[blockIdx];
+   int dims[3];
+   CalculateBlockDims(this->Internal->blockDims.data(), theBlock.isFull, dims);
+   vtkUniformGrid* ug = vtkUniformGrid::New();
+--- a/IO/AMR/vtkAMRVelodyneReaderInternal.h
++++ b/IO/AMR/vtkAMRVelodyneReaderInternal.h
+@@ -48,24 +48,20 @@
+ //================================================================================
+ //                          INTERNAL VELODYNE READER
+ //================================================================================
+-typedef struct tagVelodyneSimParameters
+-{
+-  double Time;
+-  int CycleTime;
+-} VelodneSimParameters;
+ 
+-typedef struct tagBlock
+-{
+-  int Index;
+-  int dSetLoc;
+-  int Level;
+-  double Origin[3];
+-  bool isFull;
+-  bool isLeaf;
+-} Block;
+ class vtkAMRVelodyneReaderInternal
+ {
+ public:
++  typedef struct tagVelodyneBlock
++  {
++    int Index;
++    int dSetLoc;
++    int Level;
++    double Origin[3];
++    bool isFull;
++    bool isLeaf;
++  } Block;
++
+   vtkAMRVelodyneReaderInternal();
+   ~vtkAMRVelodyneReaderInternal();
+   void SetFileName(VTK_FILEPATH VTK_FUTURE_CONST char* fileName);
diff --git a/sci-libs/vtk/vtk-9.1.0-r2.ebuild b/sci-libs/vtk/vtk-9.1.0-r2.ebuild
index 1e80b96b80b4..e9034c50bbb0 100644
--- a/sci-libs/vtk/vtk-9.1.0-r2.ebuild
+++ b/sci-libs/vtk/vtk-9.1.0-r2.ebuild
@@ -145,6 +145,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-9.0.3-IO-FFMPEG-support-FFmpeg-5.0-API-changes.patch
 	"${FILESDIR}"/${P}-adjust-to-find-binaries.patch
 	"${FILESDIR}"/${P}-avoid-naming-collision-with-netcdf-4.9.0.patch
+	"${FILESDIR}"/${P}-Change-or-scope-struct-names-to-avoid-conflicts.patch
 )
 
 DOCS=( CONTRIBUTING.md README.md )