gentoo auto-resync : 23:02:2023 - 15:45:01

5 files changed, 48 insertions, 45 deletions

diff --git a/media-gfx/netgen/Manifest b/media-gfx/netgen/Manifest
index 1a0bb67781ba..0d58ce09a18d 100644
--- a/media-gfx/netgen/Manifest
+++ b/media-gfx/netgen/Manifest
@@ -1,11 +1,11 @@
 AUX netgen-6.2.2204-disable-failing-tests.patch 612 BLAKE2B e5fad5fcc21942ece9fbc69a0a66fbcdb46dc9233000fe27c6321e4f30210c0f7951adb820a9f05f7131dab7cdd908cb315b101ac7078b036fbdce3c5c46f736 SHA512 81504313f1b7d4b317e54aa03f4c8b5a63505db8fb25e135c51b5c811fe31eeade4455efbb69053df841eba32bc0104d2f6c66791f9b59b5a9ba6c97d861942a
 AUX netgen-6.2.2204-disable-python-tests.patch 521 BLAKE2B ed98bd8c54d3a7e77fdbe3e74ad381bf6d807d47b887e4f7aa9813b65b1d6440a6429faf365a1a463f294788545c7b6aaae86aafd7c69ac4e050d31d464bcdce SHA512 af99b5b1a1d6d0b999fc524ce7d72285b30c040d25846c177c019a7bdf0d7823c3ca2457f9bc2a90a1ae6f8594e9c7513d324451cf4054f57fcb3a299607c1f7
 AUX netgen-6.2.2204-find-Tk-include-directories.patch 797 BLAKE2B b1d049ef7e05936f762bfe0b409f8c8dde4730718007fd62e4ab0ca7178336d439aa52eadabce6bd6a9ccf56c61dcbc23e416cf3e18dec68e2fe9b36b23f0d3c SHA512 cc144615fb3ef4df21aa0f39c370d716a1afdf2a35d570ab92a80a14aeebffd79b7ff24d61378a363faad2024f90a1a672441fdc2578efd45cfaefe166552b5e
-AUX netgen-6.2.2204-find-libjpeg-turbo-library.patch 1270 BLAKE2B b48245414ba9864f896a37913cb3b7268a0958c47d3d793f48a44ccfe3e60383b62419b74426f851fa2582009b297061f56775c20addebf9b3041bfda386f3b0 SHA512 ae28d6509039d027c1848530fc4bc3303a5069d7c2c2453d299f6ab839fbcd2f80ea032585a7d459364c6469e5a9fffb7b0a0e896f38d53b76059e091a82eba4
 AUX netgen-6.2.2204-link-against-ffmpeg.patch 710 BLAKE2B 28b01b18480af48c4967a25b8de303dbc21b52a63d3a441d5d8d8463c4498198868c8b96049b68ad5e1302c30d15c6d3a028a0cbd593d608d3d865a4b51abcc0 SHA512 df42aaf831ade1cb4bd36b59bcdee69f7f1b1f7c25f3e668e90fc391fccff6861cbcb58807189d5051bbfae0035c0f42a93c144caf44c89a636fa43c802d02ab
-AUX netgen-6.2.2204-use-external-pybind11.patch 1209 BLAKE2B f1fbb7ecc9f07d5d0ccb6cef5ff8a5e6cd0866e12c47ad005f34b088d78d43f400a2b40543e6d34273b88f327dd11d46825c28a40655e608fb3692bee90319e1 SHA512 ca755f4074424feba97b5882e86b2645c7edb24bcb163594eb2dbb98fbcd38f86713e66d0f3b249adc50e896f4ae8c55ebe1a01937b79e94910cdfe7e2156232
 AUX netgen-6.2.2204-use-system-catch.patch 1521 BLAKE2B 34ee6fedced5381a1e2152fdd215774ac4dfd5d349ca4f342030cc98cd8370de4db260e7c4a6091785056766f652d4cd621964c0b68134bea56b6cd56903dcb8 SHA512 973fa6e6ce38567343548db09d1f7d56b2ef78b3c77aa11c94eda72f03e2c97ab495d9975df15bbdd3545fc3346059ef6d91a1cf1632744459c08bc4a8ac7d40
 AUX netgen-6.2.2204-use-system-spdlog.patch 1390 BLAKE2B 541725d179a0b3f9f9430f1268478adfdf378940b4503e962dd59071e8ac0dba60c5445d036d73103f6ec25017a1335f6eb7bfc38debb0ccff810229d5466890 SHA512 1519ce3628f2c5f17afea34bd4ebf102f2688c9440504f6828c611b749b0ae5b7d80b2b688c13769f6bd911faeb3d9d4f83e1ba663d8d5bdb2ef5bc2076f873c
-DIST netgen-6.2.2204.tar.gz 3394806 BLAKE2B 2b99854cab0890662f1ab7ffee6fb444b60a28ba0bfe9970a89c80c0e4c930c40b8034f9c600ddd61c9b60f542d1cae758a8c220a1ba76949bf9f97fb2fe9020 SHA512 964c40753613c111b0372b0e403b19734cc0c559d1e7e45bbe6b452f4daba10c6bde8abaa5c9541c92b4bccff02d32ea6ba8e8e06ba64f11fec1733f2e374cbf
-EBUILD netgen-6.2.2204.ebuild 3974 BLAKE2B d57636eef686e9bcc95d48b54d4a37d1879bfa96d005e24fff43777f71a422c207f14e660dd1bfcba73cf89d62eb541a164cd7021d0e6cc84c16bb7023043196 SHA512 18aac8d8f61e9c6e2d53273cad48254707bda9d7af4aa64bdb301350a077669997de18257e39f8ffbb9887b8755b1b4b3abf52c8c5e2aae7def7c21065866f39
+AUX netgen-6.2.2301-find-libjpeg-turbo-library.patch 1280 BLAKE2B 47cbb27914badd316078acbf57d0ec13da80ade19c6f20602dec1bb42d9b6929cd017ee9120c651dfffcfb2e9c925798a327bd07561823f50702536487343a06 SHA512 c0c774d47bc405357c09454c528391062cec9d2f4a39757409894407bca28a8bf2332bfa60bdba3f99948d5d8871833cc56123ba212e97862f6cc7d09dedb3a8
+AUX netgen-6.2.2301-fix-nullptr-deref-in-archive.patch 1012 BLAKE2B 2de4195438ce6dec88d1bc0d05f841bb959690b271cb1a40464ae81cc056e4520246c49533a2dc90ee88a29f450b9bf89a285342f9e8a08f0b9a44cee1933ec2 SHA512 3f28bce676c3db1d0dd05ff21716745dfc01b8d9f5cc6c278baed76f10514d283e78012f04fca956f71337f4a34287f949b06881a12cb84ae812a61bd1ff79ea
+DIST netgen-6.2.2301.tar.gz 3394480 BLAKE2B 358b0cf7ff4d372a9ede8ab9b7df24435a75bcad880cc83607443707ae096f2bafa35d8cd581533917d1aae85a18ac0ca902876a1c68f11664a0a3ef1ae00593 SHA512 7aebbc5cc3e3227b455ac9c5538e1f0110d5621e6ca7315f6811733bd93e88ccca467296b7915894a45202ed375b45d9387a1d113a720d4199eff782afb43070
+EBUILD netgen-6.2.2301.ebuild 4089 BLAKE2B 3eaa6a00dfc3a6f4ff173fd2455e34e0c58901e4f9afe41f3a95d57080d9fd2271419eea6814cb6f6ca1c36a59760bdaa0bf94689b93e39feddc306df796b72e SHA512 c3f52aafaf1bc63f103d88e39a7a36bd26b6f856ea6b864856cd42429818810401b98762caa57718c922f1c35eeaeda2af51c263bbd32fec330051635475685c
 MISC metadata.xml 647 BLAKE2B bbd454b748f78fe5a95e956b00a4ada9d46ba38c98f6d763c63d2c09541fe8243f6d7d033ff7b96dd2a00ae14e2d9dbac5150015d950ba74c5c1b69a68678f2a SHA512 334ef398fa5da9f565c1a8b53c67b223fb710ce4b47b2bae5561695ff46c159c56ccaf43afc0ac7810e651e73953f609f04909ae3a1300cd411b8125341222a2
diff --git a/media-gfx/netgen/files/netgen-6.2.2204-use-external-pybind11.patch b/media-gfx/netgen/files/netgen-6.2.2204-use-external-pybind11.patch
deleted file mode 100644
index ef11c8b0821a..000000000000
--- a/media-gfx/netgen/files/netgen-6.2.2204-use-external-pybind11.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From c3c55fe646ad6934e429edd080aceae54260551c Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Sun, 30 Oct 2022 14:50:48 +0100
-Subject: [PATCH] use external pybind11
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -302,7 +302,7 @@ else()
- endif()
- 
- if (USE_PYTHON)
--    add_subdirectory(external_dependencies/pybind11)
-+    find_package(pybind11)
-     find_path(PYBIND_INCLUDE_DIR pybind11/pybind11.h HINTS ${PYTHON_INCLUDE_DIR})
-     if( PYBIND_INCLUDE_DIR )
-         message(STATUS "Found Pybind11: ${PYBIND_INCLUDE_DIR}")
---- a/cmake/SuperBuild.cmake
-+++ b/cmake/SuperBuild.cmake
-@@ -154,7 +154,6 @@ endif()
- #######################################################################
- if (USE_PYTHON)
-   find_path(PYBIND_INCLUDE_DIR pybind11/pybind11.h PATHS ${CMAKE_CURRENT_SOURCE_DIR}/external_dependencies/pybind11/include NO_DEFAULT_PATH)
--    set(NG_INSTALL_PYBIND ON)
-     if( NOT PYBIND_INCLUDE_DIR )
-       # if the pybind submodule is missing, try to initialize and update all submodules
-       execute_process(COMMAND git submodule update --init --recursive WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
--- 
-2.38.1
-
diff --git a/media-gfx/netgen/files/netgen-6.2.2204-find-libjpeg-turbo-library.patch b/media-gfx/netgen/files/netgen-6.2.2301-find-libjpeg-turbo-library.patch
index c45f5a4e4bdb..3b01321f7ced 100644
--- a/media-gfx/netgen/files/netgen-6.2.2204-find-libjpeg-turbo-library.patch
+++ b/media-gfx/netgen/files/netgen-6.2.2301-find-libjpeg-turbo-library.patch
@@ -1,6 +1,6 @@
-From 39160b692fd051f2638f1a6e1df38eb616b6d6cb Mon Sep 17 00:00:00 2001
+From d8a654a61452c39e3e611493ad70b8c6e818130e Mon Sep 17 00:00:00 2001
 From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Sun, 30 Oct 2022 16:09:43 +0100
+Date: Wed, 15 Feb 2023 12:28:00 +0100
 Subject: [PATCH] find libjpeg-turbo library
 
 Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
@@ -10,8 +10,8 @@ Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
      vssolution.cpp
      visualpkg.cpp
  )
--target_link_libraries( nggui PUBLIC "$<BUILD_INTERFACE:netgen_python>" ${MPI_CXX_LIBRARIES} ${OPENGL_LIBRARIES} )
-+target_link_libraries( nggui PUBLIC "$<BUILD_INTERFACE:netgen_python>" ${MPI_CXX_LIBRARIES} ${OPENGL_LIBRARIES} ${JPEG_LIBRARIES} )
+-target_link_libraries( nggui PUBLIC "$<BUILD_INTERFACE:netgen_python>" ${MPI_CXX_LIBRARIES} ${OPENGL_LIBRARIES} nglib)
++target_link_libraries( nggui PUBLIC "$<BUILD_INTERFACE:netgen_python>" ${MPI_CXX_LIBRARIES} ${OPENGL_LIBRARIES} ${JPEG_LIBRARIES} nglib)
  
  install(FILES
    meshdoc.hpp mvdraw.hpp visual_api.hpp
@@ -30,5 +30,5 @@ Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
  
  install(TARGETS nglib netgen_cgns ${NG_INSTALL_DIR})
 -- 
-2.38.1
+2.39.1
 
diff --git a/media-gfx/netgen/files/netgen-6.2.2301-fix-nullptr-deref-in-archive.patch b/media-gfx/netgen/files/netgen-6.2.2301-fix-nullptr-deref-in-archive.patch
new file mode 100644
index 000000000000..b05d71221ca5
--- /dev/null
+++ b/media-gfx/netgen/files/netgen-6.2.2301-fix-nullptr-deref-in-archive.patch
@@ -0,0 +1,31 @@
+https://github.com/NGSolve/netgen/pull/123/commits/5ee4e43393936ab4c00feb58c48bc3a10e6bcbdb
+
+From 76276c5a3b0e70b27d44f7ce0a3ea064b23909da Mon Sep 17 00:00:00 2001
+From: Christopher Montgomery <monty@xiph.org>
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sun, 19 Feb 2023 12:18:12 +0100
+Subject: [PATCH] fix nullptr deref in archive
+
+Hardened toolchains (eg, mainline Fedora) no longer tolerate null
+derefs that were silently trapped/ignored in earlier versions.  This
+eliminates a nullptr deref in archive.hpp that was failing several
+unit tests (and causing crashes) when trying to manipulate
+default-constructed archive objects.
+
+Adapted original patch according the comment in the PR.
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/libsrc/core/archive.hpp
++++ b/libsrc/core/archive.hpp
+@@ -225,7 +225,7 @@ namespace ngcore
+       (*this) & size;
+       if(Input())
+         v.resize(size);
+-      Do(&v[0], size);
++      Do(v.data(), size);
+       return (*this);
+     }
+  
+-- 
+2.39.2
+
diff --git a/media-gfx/netgen/netgen-6.2.2204.ebuild b/media-gfx/netgen/netgen-6.2.2301.ebuild
index f4a8413a9832..bd9fbd4c967b 100644
--- a/media-gfx/netgen/netgen-6.2.2204.ebuild
+++ b/media-gfx/netgen/netgen-6.2.2301.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_10 )
+PYTHON_COMPAT=( python3_{10,11} )
 inherit cmake desktop python-single-r1 xdg
 
 DESCRIPTION="Automatic 3d tetrahedral mesh generator"
@@ -66,14 +66,14 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-6.2.2204-use-external-pybind11.patch"
 	"${FILESDIR}/${PN}-6.2.2204-find-Tk-include-directories.patch"
-	"${FILESDIR}/${PN}-6.2.2204-find-libjpeg-turbo-library.patch"
 	"${FILESDIR}/${PN}-6.2.2204-link-against-ffmpeg.patch"
 	"${FILESDIR}/${PN}-6.2.2204-use-system-spdlog.patch"
 	"${FILESDIR}/${PN}-6.2.2204-use-system-catch.patch"
 	"${FILESDIR}/${PN}-6.2.2204-disable-failing-tests.patch"
 	"${FILESDIR}/${PN}-6.2.2204-disable-python-tests.patch"
+	"${FILESDIR}/${PN}-6.2.2301-find-libjpeg-turbo-library.patch"
+	"${FILESDIR}/${PN}-6.2.2301-fix-nullptr-deref-in-archive.patch"
 )
 
 pkg_setup() {
@@ -82,8 +82,9 @@ pkg_setup() {
 
 src_prepare() {
 	# NOTE: need to manually check and update this string on version bumps!
+	# git describe --tags --match "v[0-9]*" --long --dirty
 	cat <<- EOF > "${S}/version.txt" || die
-		v${PV}-0-gde0d706e
+		v${PV}-0-g26d12898
 	EOF
 	cmake_src_prepare
 }
@@ -119,8 +120,9 @@ src_configure() {
 	fi
 	if use python; then
 		mycmakeargs+=(
-			-DPYBIND_INCLUDE_DIR="/usr/lib/${EPYTHON}/site-packages/pybind11/include/"
-			-DNG_INSTALL_PYBIND=OFF
+			-DPREFER_SYSTEM_PYBIND11=ON
+			# needed, so the value gets passed to NetgenConfig.cmake instead of ${T}/pythonX.Y
+			-DPYTHON_EXECUTABLE="${PYTHON}"
 		)
 	fi
 	if use mpi && use python; then