diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-01-30 14:58:12 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-01-30 14:58:12 +0000 |
commit | 268511f85b0606dd23fda1991345568dd3e1976b (patch) | |
tree | 6db33fa4a4774e1e23c22fb636b6d8717f28f2c8 /sci-libs | |
parent | 552fc3ba95eab5c2c1a8b2b55ab432a1019739a0 (diff) |
gentoo auto-resync : 30:01:2023 - 14:58:12
Diffstat (limited to 'sci-libs')
-rw-r--r-- | sci-libs/Manifest.gz | bin | 43605 -> 43607 bytes | |||
-rw-r--r-- | sci-libs/cantera/Manifest | 5 | ||||
-rw-r--r-- | sci-libs/cantera/cantera-2.6.0-r2.ebuild (renamed from sci-libs/cantera/cantera-2.5.1-r4.ebuild) | 26 | ||||
-rw-r--r-- | sci-libs/cantera/files/cantera-2.5.1_env.patch | 130 | ||||
-rw-r--r-- | sci-libs/cantera/files/cantera-2.6.0_drop_deprecated_open_U_option.patch | 49 | ||||
-rw-r--r-- | sci-libs/vtk/Manifest | 4 | ||||
-rw-r--r-- | sci-libs/vtk/files/vtk-9.2.5-Add-include-cstdint-for-gcc-13.patch | 20 | ||||
-rw-r--r-- | sci-libs/vtk/files/vtk-9.2.5-Add-include-cstdint-to-compile-with-gcc-13.patch | 30 | ||||
-rw-r--r-- | sci-libs/vtk/vtk-9.2.5.ebuild | 2 |
9 files changed, 122 insertions, 144 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz Binary files differindex 69a10efb700c..1d3e9800325b 100644 --- a/sci-libs/Manifest.gz +++ b/sci-libs/Manifest.gz diff --git a/sci-libs/cantera/Manifest b/sci-libs/cantera/Manifest index 0b4adc5be0e4..3c9fa5f2c920 100644 --- a/sci-libs/cantera/Manifest +++ b/sci-libs/cantera/Manifest @@ -1,7 +1,6 @@ -AUX cantera-2.5.1_env.patch 5928 BLAKE2B d6d0792527a5f50c34d4d6a05c651992a82af7ed864b68178023d6a7c44632f124851fe5e79306d0b91fde82336d72f8600bd9a2ccfc9a719b07ad44da63913d SHA512 5a1d0e238cfb5f24731acfb59cd66d1dc564a9e2485405e64771735ae72b529ef64475692394cb06c68f447bffc106d73edb901df26587e4203a8c59efea3dfc +AUX cantera-2.6.0_drop_deprecated_open_U_option.patch 1363 BLAKE2B 236dc4ee368d0c172e372d9e263318460a8b7a3c6fca02e97a0d71fb1852a2bef00c8375e72957d9a5fff2091f3aae968bd73a872509e3890ab91871eb90ae81 SHA512 4f9f18874bab308462261e0efdfdbb1c1f7ad35382aed5a594da45190e18d9264ed314ca4f7cab29d16a83b5c30ba8fdc213461a549ec84bd201211848d63f1e AUX cantera-2.6.0_env.patch 3119 BLAKE2B 16844230d86a292c764da1aa4043b2eff177f2b8a94ed154c3f6a69c1737e85f6ddc9330d5ba6f26936994306381dcb40ab4e70c7b7b44bdbaf7d920ee1ef902 SHA512 12cdabc7cee106ee17050918b483245b39f927b5a5bb8f92bd6177c1d660cc18cd3a91b2710991fa09c44f58aaac464495b15ceb7ae13bf235d34a6caabe7bc4 -DIST cantera-2.5.1.tar.gz 2492422 BLAKE2B b48c5d12fc2b69d309759afd20b55dc2533c23ccba840109cf7a85c4ebb8306eb48d9f007914184a9d409f7bf296814fe09e6e62a29cf8384edd954fdff2af4e SHA512 8cd65f6b86b3009f22ec243cb7cb833e26919c4925fd15fba8fb98aad2180d8c0fe7550e13efeb7cce55abab06d9400230d59c9c43b4d3be6b0575b1164a56bc DIST cantera-2.6.0.tar.gz 2586243 BLAKE2B 3562dc3641c70cdbd5e07062ecee56c0658b098c20bb477c3e741731db01e38fccf624e6769377420b01dd4bac72a0608cf226cce40ac12f13e71081090e06bc SHA512 74e12c89af38236bcc064034f74edcc690895151a9e453e728d130b83f5f527e675750c68a3fe36eea3c6aec6969685aa8828ae740a2e27b5df72a8ccc4d2856 -EBUILD cantera-2.5.1-r4.ebuild 3470 BLAKE2B 346437c80174796a555d02f51beb6800cbad13b02ab04c482b35b4e73d0240d00be08bf4465844f3b200669cbe4ba4ade41afefbca1d2dde424bcc767c4bf27a SHA512 779bf4da112fc984ace4dfa8d6ee5be1ff4e05ec91892d4d4c507b620d1cd05c7e595e914d5546664742cee2b85813fcea0aa871e523f6a1821b9d6e80883ffc EBUILD cantera-2.6.0-r1.ebuild 3542 BLAKE2B 212ea3d12fa2aa83430abdd2c700859d59a7ab0e540bd0e32dbd486370d2c98233e071e80e505eaf3bdc5722c953e6d83815d6985411db531d182551124e974f SHA512 62fee7f0d26c328786732ce3f76493d96dac4db944af3d585291be8bb10e1a8de88c24d2e60a3145e67877b568d2963092a09deeea0e6f17b982fe87f849a84b +EBUILD cantera-2.6.0-r2.ebuild 3603 BLAKE2B b067bc62850c4b74e56cbea1cb9929fbc91ae8a45af353cb69c8cd6aac76aae6a1b52c92f7f8c00118420eef9ac04a68edac45c97e7ac725d8734e5108d09caa SHA512 c33fd8b9185ea4fadc4e32a7ae60063166545fcd56036af66816548ca1c9568b7a1633603a50b90b3acaabbbeb7928b545dd60872513481d1190c4926a8b3904 MISC metadata.xml 842 BLAKE2B 85e2a5268aa13a8a92e9f04212c3bcd66252a77c88dd2ddb7d81a34f486754c7faa352998484d4362b16a2bdccb85325337c13cc272a434be463a037eab846a1 SHA512 a9edb0347dc3b1510d3d2b767e7a0e96cd1d6cc50dd4e5c2830d29438dd25a0bdfa41994dbb43bbb7dc70ba3537f783b2d0a143723908dd91d434e1edb11a704 diff --git a/sci-libs/cantera/cantera-2.5.1-r4.ebuild b/sci-libs/cantera/cantera-2.6.0-r2.ebuild index 9d87e7aa5b6f..31d393df1c40 100644 --- a/sci-libs/cantera/cantera-2.5.1-r4.ebuild +++ b/sci-libs/cantera/cantera-2.6.0-r2.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) FORTRAN_NEEDED=fortran FORTRAN_STANDARD="77 90" @@ -16,7 +16,7 @@ SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="~amd64 ~x86" IUSE="+cti fortran lapack +python test" RESTRICT="!test? ( test )" @@ -39,32 +39,38 @@ RDEPEND=" ') ) dev-cpp/yaml-cpp - !lapack? ( <sci-libs/sundials-5.9.0:0= ) - lapack? ( <sci-libs/sundials-5.3.0:0=[lapack] ) + !lapack? ( sci-libs/sundials:0= ) + lapack? ( >=sci-libs/sundials-6.5.0:0=[lapack?] ) " DEPEND=" ${RDEPEND} dev-cpp/eigen:3 - dev-libs/boost + dev-libs/boost:= dev-libs/libfmt python? ( $(python_gen_cond_dep ' dev-python/cython[${PYTHON_USEDEP}] + dev-python/pip[${PYTHON_USEDEP}] ') ) test? ( - >=dev-cpp/gtest-1.8.0 + >=dev-cpp/gtest-1.11.0 python? ( $(python_gen_cond_dep ' dev-python/h5py[${PYTHON_USEDEP}] dev-python/pandas[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}] ') ) ) " -PATCHES=( "${FILESDIR}/${P}_env.patch" ) +PATCHES=( + "${FILESDIR}/${P}_env.patch" + "${FILESDIR}/${P}_drop_deprecated_open_U_option.patch" +) pkg_setup() { fortran-2_pkg_setup @@ -79,7 +85,7 @@ src_configure() { CC="$(tc-getCC)" CXX="$(tc-getCXX)" cc_flags="${CXXFLAGS}" - cxx_flags="-std=c++11" + cxx_flags="-std=c++14" debug="no" FORTRAN="$(tc-getFC)" FORTRANFLAGS="${FCFLAGS}" @@ -118,7 +124,7 @@ src_test() { } src_install() { - escons install stage_dir="${D}" libdirname="$(get_libdir)" python_prefix="$(python_get_sitedir)" + escons install stage_dir="${D}" libdirname="$(get_libdir)" if ! use cti ; then rm -r "${D}/usr/share/man" || die "Can't remove man files." else diff --git a/sci-libs/cantera/files/cantera-2.5.1_env.patch b/sci-libs/cantera/files/cantera-2.5.1_env.patch deleted file mode 100644 index 77004803b127..000000000000 --- a/sci-libs/cantera/files/cantera-2.5.1_env.patch +++ /dev/null @@ -1,130 +0,0 @@ -diff -Naur old/SConstruct new/SConstruct ---- old/SConstruct 2021-03-21 01:18:43.000000000 +0300 -+++ new/SConstruct 2021-03-21 01:27:06.000000000 +0300 -@@ -193,7 +193,7 @@ - toolchain = ['default'] - - env = Environment(tools=toolchain+['textfile', 'subst', 'recursiveInstall', 'wix', 'gch'], -- ENV={'PATH': os.environ['PATH']}, -+ ENV={'PATH': os.environ['PATH'], 'CCACHE_DIR': os.environ.get('CCACHE_DIR','')}, - toolchain=toolchain, - **extraEnvArgs) - -@@ -239,6 +239,9 @@ - sys.exit(1) - - compiler_options = [ -+ ('AR', -+ """The archiver to use.""", -+ env['AR']), - ('CXX', - """The C++ compiler to use.""", - env['CXX']), -@@ -734,10 +734,7 @@ - env['cantera_pure_version'] = re.match(r'(\d+\.\d+\.\d+)', env['cantera_version']).group(0) - env['cantera_short_version'] = re.match(r'(\d+\.\d+)', env['cantera_version']).group(0) - --try: -- env['git_commit'] = getCommandOutput('git', 'rev-parse', '--short', 'HEAD') --except Exception: -- env['git_commit'] = 'unknown' -+env['git_commit'] = 'unknown' - - # Print values of all build options: - print("Configuration variables read from 'cantera.conf' and command line:") -@@ -1149,10 +1149,24 @@ - if retcode == 0: - config_error("Failed to determine Sundials BLAS/LAPACK.") - env['has_sundials_lapack'] = int(has_sundials_lapack.strip()) -- else: -- # In Sundials 2.6, SUNDIALS_BLAS_LAPACK is either defined or undefined -+ elif sundials_ver < parse_version('5.5'): -+ # In Sundials 2.6-5.5, SUNDIALS_BLAS_LAPACK is either defined or undefined - env['has_sundials_lapack'] = conf.CheckDeclaration('SUNDIALS_BLAS_LAPACK', - '#include "sundials/sundials_config.h"', 'C++') -+ else: -+ # In Sundials 5.5 and higher, two defines are included specific to the -+ # SUNLINSOL packages indicating whether SUNDIALS has been built with LAPACK -+ lapackband = conf.CheckDeclaration( -+ "SUNDIALS_SUNLINSOL_LAPACKBAND", -+ '#include "sundials/sundials_config.h"', -+ "C++", -+ ) -+ lapackdense = conf.CheckDeclaration( -+ "SUNDIALS_SUNLINSOL_LAPACKDENSE", -+ '#include "sundials/sundials_config.h"', -+ "C++", -+ ) -+ env["has_sundials_lapack"] = lapackband and lapackdense - - # In the case where a user is trying to link Cantera to an external BLAS/LAPACK - # library, but Sundials was configured without this support, print a Warning. -diff -Naur old/interfaces/cython/SConscript new/interfaces/cython/SConscript ---- old/interfaces/cython/SConscript 2021-03-21 01:18:43.000000000 +0300 -+++ new/interfaces/cython/SConscript 2021-03-21 01:59:29.000000000 +0300 -@@ -108,8 +108,7 @@ - elif localenv['libdirname'] != 'lib': - # 64-bit RHEL / Fedora etc. or e.g. x32 Gentoo profile - extra = localenv.subst( -- ' --prefix=${{python_prefix}}' -- ' --install-lib=${{python_prefix}}/${{libdirname}}/python{}/site-packages'.format(py_version)) -+ ' --prefix=${stage_dir}${prefix} --install-lib=${python_prefix}') - else: - extra = '--user' - localenv.AppendENVPath( -diff -Naur old/interfaces/python_minimal/SConscript new/interfaces/python_minimal/SConscript ---- old/interfaces/python_minimal/SConscript 2021-02-13 00:57:15.000000000 +0300 -+++ new/interfaces/python_minimal/SConscript 2021-04-09 23:26:28.000000000 +0300 -@@ -8,7 +8,7 @@ - make_setup = build(localenv.SubstFile('setup.py', 'setup.py.in')) - - # copy scripts from the full Cython module --for script in ['ctml_writer', 'ck2cti']: -+for script in ['ctml_writer', 'ck2cti', 'ck2yaml', 'cti2yaml', 'ctml2yaml']: - # The actual script - s = build(env.Command('cantera/{}.py'.format(script), - '#interfaces/cython/cantera/{}.py'.format(script), -@@ -38,8 +38,7 @@ - elif localenv['libdirname'] != 'lib': - # 64-bit RHEL / Fedora etc. or e.g. x32 Gentoo profile - extra = localenv.subst( -- ' --prefix=${{python_prefix}}' -- ' --install-lib=${{python_prefix}}/${{libdirname}}/python{}/site-packages'.format(py_version)) -+ ' --prefix=${stage_dir}${prefix} --install-lib=${python_prefix}') - else: - extra = '--user' - localenv.AppendENVPath( -diff -Naur old/interfaces/python_minimal/cantera/__init__.py new/interfaces/python_minimal/cantera/__init__.py ---- old/interfaces/python_minimal/cantera/__init__.py 2021-02-13 00:57:15.000000000 +0300 -+++ new/interfaces/python_minimal/cantera/__init__.py 2021-04-10 00:07:38.000000000 +0300 -@@ -1,2 +1,5 @@ - from . import ck2cti - from . import ctml_writer -+from . import ck2yaml -+from . import cti2yaml -+from . import ctml2yaml -diff -Naur old/interfaces/python_minimal/setup.py.in new/interfaces/python_minimal/setup.py.in ---- old/interfaces/python_minimal/setup.py.in 2021-02-13 00:57:15.000000000 +0300 -+++ new/interfaces/python_minimal/setup.py.in 2021-04-09 23:32:09.000000000 +0300 -@@ -12,6 +12,9 @@ - 'console_scripts': [ - 'ck2cti=cantera.ck2cti:script_entry_point', - 'ctml_writer=cantera.ctml_writer:main', -+ 'ck2yaml=cantera.ck2yaml:script_entry_point', -+ 'cti2yaml=cantera.cti2yaml:main', -+ 'ctml2yaml=cantera.ctml2yaml:main', - ], - }, - ) -diff -Naur old/test_problems/SConscript new/test_problems/SConscript ---- old/test_problems/SConscript 2021-03-21 01:18:43.000000000 +0300 -+++ new/test_problems/SConscript 2021-03-21 01:42:19.000000000 +0300 -@@ -222,7 +222,7 @@ - CompileAndTest('VPsilane_test') - - CompileAndTest('clib', 'clib_test', 'clib_test', -- extensions=['^clib_test.c'], libs=['cantera_shared']) -+ extensions=['^clib_test.c']) - - # C++ Samples - Test('cxx-bvp', 'cxx_samples', '#build/samples/cxx/bvp/blasius', None, diff --git a/sci-libs/cantera/files/cantera-2.6.0_drop_deprecated_open_U_option.patch b/sci-libs/cantera/files/cantera-2.6.0_drop_deprecated_open_U_option.patch new file mode 100644 index 000000000000..41243da82f68 --- /dev/null +++ b/sci-libs/cantera/files/cantera-2.6.0_drop_deprecated_open_U_option.patch @@ -0,0 +1,49 @@ +From 0b407e11fe0bae4707286ab3cbf6a7a72a906817 Mon Sep 17 00:00:00 2001 +From: "Mark E. Fuller" <mark.e.fuller@gmx.de> +Date: Thu, 23 Jun 2022 00:04:22 +0300 +Subject: [PATCH] drop deprecated 'U' open option + +--- + site_scons/site_tools/subst.py | 15 +++------------ + 1 file changed, 3 insertions(+), 12 deletions(-) + +diff --git a/site_scons/site_tools/subst.py b/site_scons/site_tools/subst.py +index 3a1c4f6fb8..05d520491b 100644 +--- a/site_scons/site_tools/subst.py ++++ b/site_scons/site_tools/subst.py +@@ -12,7 +12,7 @@ + + from SCons.Script import * + import SCons.Errors +- ++from pathlib import Path + + # Helper/core functions + ############################################################################## +@@ -20,12 +20,7 @@ + # Do the substitution + def _subst_file(target, source, env, pattern, replace): + # Read file +- #print 'CALLING SUBST_FILE' +- f = open(source, "rU") +- try: +- contents = f.read() +- finally: +- f.close() ++ contents = Path(source).read_text() + + # Substitute, make sure result is a string + def subfn(mo): +@@ -46,11 +41,7 @@ def subfn(mo): + # Determine which keys are used + def _subst_keys(source, pattern): + # Read file +- f = open(source, "rU") +- try: +- contents = f.read() +- finally: +- f.close() ++ contents = Path(source).read_text() + + # Determine keys + keys = [] 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 ) |