[packages/netgen-mesher] - updated to 6.2.2607
qboosh
qboosh at pld-linux.org
Wed Sep 23 20:17:36 CEST 2026
commit b00906f49bc61a0d027be42b18bf63604a928661
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Wed Sep 23 20:17:55 2026 +0200
- updated to 6.2.2607
0002-Rename-libraries-add-library-versions.patch | 9 +++---
link-libraries.patch | 13 ---------
netgen-mesher-arch.patch | 31 ++++++---------------
netgen-mesher.spec | 11 ++++----
netgen-mesher_egg-info-version.patch | 35 ++++++++++++++++--------
netgen_fallback-version.patch | 9 +++---
6 files changed, 46 insertions(+), 62 deletions(-)
---
diff --git a/netgen-mesher.spec b/netgen-mesher.spec
index 22dd0a7..edca7d5 100644
--- a/netgen-mesher.spec
+++ b/netgen-mesher.spec
@@ -8,12 +8,12 @@
Summary: Automatic mesh generation tool
Summary(pl.UTF-8): Narzędzie do automatycznego generowania siatek
Name: netgen-mesher
-Version: 6.2.2404
-Release: 6
+Version: 6.2.2607
+Release: 1
License: LGPL v2
Group: Applications/Science
Source0: https://github.com/NGSolve/netgen/archive/v%{version}/netgen-%{version}.tar.gz
-# Source0-md5: 0d1dd5b8858e35ed2564ec86703ff602
+# Source0-md5: b7602cadeb38e27fe6f93d7d4581ede1
Source1: %{name}.png
Source2: %{name}.desktop
# Set a default NETGENDIR appropriate for the fedora packaging
@@ -61,8 +61,9 @@ Requires: %{name}-libs = %{version}-%{release}
ExclusiveArch: %{x8664} %{arm} aarch64 i686 pentium2 pentium3 pentium4 athlon x32
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-# false negative _ZN6ngcore11TaskManager9thread_idE from libngcore
-%define skip_post_check_so libnglib.so.*
+# libnggui: non-function symbols _ZN6ngcore11TaskManager15timer_thread_idE, _ZN6ngcore11TaskManager11worker_dataE from libngcore
+# libnglib: non-function symbols _ZN6ngcore11TaskManager15timer_thread_idE, _ZN6ngcore11TaskManager11worker_dataE, _ZN6ngcore11TaskManager9thread_idE, _ZN6ngcore12task_managerE from libngcore
+%define skip_post_check_so libnggui.so.* libnglib.so.*
%description
NETGEN is an automatic 3D tetrahedral mesh generator. It accepts input
diff --git a/0002-Rename-libraries-add-library-versions.patch b/0002-Rename-libraries-add-library-versions.patch
index 4a99e91..52265fd 100644
--- a/0002-Rename-libraries-add-library-versions.patch
+++ b/0002-Rename-libraries-add-library-versions.patch
@@ -12,12 +12,11 @@ diff -rupN --no-dereference netgen-6.2.2406/CMakeLists.txt netgen-6.2.2406-new/C
if(WIN32)
set_target_properties( nggui PROPERTIES OUTPUT_NAME "libnggui")
endif(WIN32)
-diff -rupN --no-dereference netgen-6.2.2406/libsrc/core/CMakeLists.txt netgen-6.2.2406-new/libsrc/core/CMakeLists.txt
---- netgen-6.2.2406/libsrc/core/CMakeLists.txt 2024-11-25 17:25:40.000000000 +0100
-+++ netgen-6.2.2406-new/libsrc/core/CMakeLists.txt 2024-12-03 18:26:10.964477186 +0100
-@@ -14,6 +14,7 @@ add_library(ngcore ${NGCORE_LIBRARY_TYPE
- version.cpp
+--- netgen-6.2.2607/libsrc/core/CMakeLists.txt.orig 2026-09-07 10:52:07.000000000 +0200
++++ netgen-6.2.2607/libsrc/core/CMakeLists.txt 2026-09-23 17:08:41.017721616 +0200
+@@ -16,6 +16,7 @@ add_library(ngcore ${NGCORE_LIBRARY_TYPE
ng_mpi_wrapper.cpp
+ statushandler.cpp
)
+set_target_properties(ngcore PROPERTIES VERSION ${NETGEN_VERSION_MAJOR}.${NETGEN_VERSION_MINOR})
diff --git a/link-libraries.patch b/link-libraries.patch
index 2e1cab6..c31074a 100644
--- a/link-libraries.patch
+++ b/link-libraries.patch
@@ -10,16 +10,3 @@ diff -rupN --no-dereference netgen-6.2.2406/CMakeLists.txt netgen-6.2.2406-new/C
if(WIN32)
target_compile_definitions(netgen_gui INTERFACE -DTOGL_WGL)
-@@ -417,9 +417,9 @@
- target_link_libraries(occ_libs INTERFACE Threads::Threads)
- endif()
- message(STATUS "OCC DIRS ${OpenCASCADE_INCLUDE_DIR}")
-- if(WIN32 AND USE_GUI)
-- target_link_libraries(nggui PRIVATE occ_libs Ws2_32.lib)
-- endif(WIN32 AND USE_GUI)
-+ if(USE_GUI)
-+ target_link_libraries(nggui PRIVATE occ_libs)
-+ endif(USE_GUI)
- endif (USE_OCC)
-
- #######################################################################
diff --git a/netgen-mesher-arch.patch b/netgen-mesher-arch.patch
index 6facc34..89372f9 100644
--- a/netgen-mesher-arch.patch
+++ b/netgen-mesher-arch.patch
@@ -1,18 +1,5 @@
---- netgen-6.2.2404/libsrc/core/table.hpp.orig 2024-06-12 20:10:06.000000000 +0200
-+++ netgen-6.2.2404/libsrc/core/table.hpp 2026-09-19 21:17:18.232517429 +0200
-@@ -103,8 +103,10 @@ namespace ngcore
- { return TablePrefixSum32 (FlatArray<unsigned> (entrysize.Size(), (unsigned int*)(int*)(entrysize.Addr(0)))); }
- NETGEN_INLINE size_t * TablePrefixSum (FlatArray<std::atomic<int>> entrysize)
- { return TablePrefixSum32 (FlatArray<unsigned> (entrysize.Size(), (unsigned int*)(std::atomic<int>*)entrysize.Addr(0))); }
-+#ifdef __LP64__
- NETGEN_INLINE size_t * TablePrefixSum (FlatArray<size_t> entrysize)
- { return TablePrefixSum64 (entrysize); }
-+#endif
-
-
- /**
---- netgen-6.2.2404/libsrc/core/utils.hpp.orig 2024-06-12 20:10:06.000000000 +0200
-+++ netgen-6.2.2404/libsrc/core/utils.hpp 2026-09-19 21:18:32.285449583 +0200
+--- netgen-6.2.2607/libsrc/core/utils.hpp.orig 2026-09-07 10:52:07.000000000 +0200
++++ netgen-6.2.2607/libsrc/core/utils.hpp 2026-09-23 17:20:08.130665873 +0200
@@ -16,7 +16,7 @@
#include <mach/mach_time.h>
#endif
@@ -22,15 +9,15 @@
#ifdef WIN32
#include <intrin.h> // for __rdtsc() CPU time step counter
#else
-@@ -65,7 +65,7 @@ namespace ngcore
+@@ -63,7 +63,7 @@ namespace ngcore
+
+ inline TTimePoint GetTimeCounter() noexcept
{
- #if defined(__APPLE__) && defined(NETGEN_ARCH_ARM64)
- return mach_absolute_time();
--#elif defined(NETGEN_ARCH_AMD64)
-+#elif defined(NETGEN_ARCH_AMD64) || defined(__i686__)
+-#if defined(NETGEN_ARCH_AMD64)
++#if defined(NETGEN_ARCH_AMD64) || defined(__i686__)
return __rdtsc();
- #elif defined(NETGEN_ARCH_ARM64) && defined(__GNUC__)
- // __GNUC__ is also defined by CLANG. Use inline asm to read Generic Timer
+ #elif defined(NETGEN_ARCH_ARM64)
+ unsigned long long tics;
--- netgen-6.2.2404/libsrc/core/python_ngcore.hpp.orig 2024-06-12 20:10:06.000000000 +0200
+++ netgen-6.2.2404/libsrc/core/python_ngcore.hpp 2026-09-19 21:23:45.953750296 +0200
@@ -182,10 +182,12 @@ namespace ngcore
diff --git a/netgen-mesher_egg-info-version.patch b/netgen-mesher_egg-info-version.patch
index 8505146..e8679b4 100644
--- a/netgen-mesher_egg-info-version.patch
+++ b/netgen-mesher_egg-info-version.patch
@@ -1,12 +1,23 @@
-diff -rupN --no-dereference netgen-6.2.2406/CMakeLists.txt netgen-6.2.2406-new/CMakeLists.txt
---- netgen-6.2.2406/CMakeLists.txt 2024-12-03 18:26:11.508462171 +0100
-+++ netgen-6.2.2406-new/CMakeLists.txt 2024-12-03 18:26:11.752455437 +0100
-@@ -641,7 +641,7 @@ if(USE_PYTHON AND NOT SKBUILD)
- file( WRITE "netgen_mesher-py3.egg-info"
- "Metadata-Version: 2.1
- Name: netgen-mesher
--Version: ${NETGEN_VERSION_MAJOR}.${NETGEN_VERSION_MINOR}.${NETGEN_VERSION_PATCH}.post${NETGEN_VERSION_TWEAK}
-+Version: ${NETGEN_VERSION_MAJOR}.${NETGEN_VERSION_MINOR}.${NETGEN_VERSION_PATCH}
- ")
- install(FILES netgen_mesher-py3.egg-info DESTINATION ${NG_INSTALL_DIR_PYTHON} COMPONENT netgen)
- endif()
+--- netgen-6.2.2607/cmake/generate_version_file.cmake.orig 2026-09-23 17:20:32.073869494 +0200
++++ netgen-6.2.2607/cmake/generate_version_file.cmake 2026-09-23 19:20:38.958159784 +0200
+@@ -33,8 +33,18 @@ string(STRIP ${git_version_string} git_v
+ string(REGEX REPLACE "^v([0-9]+)\\..*" "\\1" NETGEN_VERSION_MAJOR "${git_version_string}")
+ string(REGEX REPLACE "^v[0-9]+\\.([0-9]+).*" "\\1" NETGEN_VERSION_MINOR "${git_version_string}")
+ string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" NETGEN_VERSION_PATCH "${git_version_string}")
+-string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.[0-9]+\\-([0-9]+).*" "\\1" NETGEN_VERSION_TWEAK "${git_version_string}")
+-string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.[0-9]+\\-[0-9]+\\-([0-9a-z]+).*" "\\1" NETGEN_VERSION_HASH "${git_version_string}")
++string(REGEX MATCH "^v[0-9]+\\.[0-9]+\\.[0-9]+\\-([0-9]+).*" match_tweak "${git_version_string}")
++if(match_tweak)
++ set(NETGEN_VERSION_TWEAK "${CMAKE_MATCH_1}")
++else()
++ set(NETGEN_VERSION_TWEAK "")
++endif()
++string(REGEX MATCH "^v[0-9]+\\.[0-9]+\\.[0-9]+\\-[0-9]+\\-([0-9a-z]+).*" match_hash "${git_version_string}")
++if(match_hash)
++ set(NETGEN_VERSION_HASH "${CMAKE_MATCH_1}")
++else()
++ set(NETGEN_VERSION_HASH "")
++endif()
+
+ set(NETGEN_VERSION_SHORT ${NETGEN_VERSION_MAJOR}.${NETGEN_VERSION_MINOR}.${NETGEN_VERSION_PATCH})
+ set(NETGEN_VERSION_LONG ${NETGEN_VERSION_SHORT}-${NETGEN_VERSION_TWEAK}-${NETGEN_VERSION_HASH})
diff --git a/netgen_fallback-version.patch b/netgen_fallback-version.patch
index 81e1388..e2d1d4c 100644
--- a/netgen_fallback-version.patch
+++ b/netgen_fallback-version.patch
@@ -1,14 +1,13 @@
-diff -rupN --no-dereference netgen-6.2.2406/cmake/generate_version_file.cmake netgen-6.2.2406-new/cmake/generate_version_file.cmake
---- netgen-6.2.2406/cmake/generate_version_file.cmake 2024-11-25 17:25:40.000000000 +0100
-+++ netgen-6.2.2406-new/cmake/generate_version_file.cmake 2024-12-03 18:26:11.523461757 +0100
+--- netgen-6.2.2607/cmake/generate_version_file.cmake 2024-11-25 17:25:40.000000000 +0100
++++ netgen-6.2.2607-new/cmake/generate_version_file.cmake 2024-12-03 18:26:11.523461757 +0100
@@ -24,8 +24,8 @@ if(status AND NOT status EQUAL 0)
string(REGEX REPLACE "^netgen(.*)" "\\1" git_version_string "${git_version_string}")
endif()
else()
- MESSAGE(WARNING "Could not determine git-version from source code - assuming 6.2.0-0")
- set(git_version_string "v6.2.0-0")
-+ MESSAGE(WARNING "Could not determine git-version from source code - assuming v6.2.2402")
-+ set(git_version_string "v6.2.2402")
++ MESSAGE(WARNING "Could not determine git-version from source code - assuming v6.2.2607")
++ set(git_version_string "v6.2.2607")
endif()
endif()
string(STRIP ${git_version_string} git_version_string)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/netgen-mesher.git/commitdiff/b00906f49bc61a0d027be42b18bf63604a928661
More information about the pld-cvs-commit
mailing list