[med-svn] [Git][med-team/libminc][master] 5 commits: Code fixes to allow building with GCC 15.
Steven Robbins (@smr)
gitlab at salsa.debian.org
Fri Sep 5 04:03:57 BST 2025
Steven Robbins pushed to branch master at Debian Med / libminc
Commits:
2159d0a8 by Steve Robbins at 2025-09-04T21:41:27-05:00
Code fixes to allow building with GCC 15.
- - - - -
0e417227 by Steve Robbins at 2025-09-04T21:46:18-05:00
Ready for release.
- - - - -
55b7170c by Steve Robbins at 2025-09-04T21:58:51-05:00
Renumber patches.
- - - - -
345008c9 by Steve Robbins at 2025-09-04T21:59:44-05:00
Harmonize all patch files to end with ".patch".
- - - - -
38fa76ad by Steve Robbins at 2025-09-04T22:01:28-05:00
Ready for release
- - - - -
8 changed files:
- debian/changelog
- debian/patches/build-using-system-find-dot-cmake → debian/patches/0001-build-using-system-find-dot-cmake.patch
- debian/patches/initialize_arrays_in_tests.patch → debian/patches/0002-initialize_arrays_in_tests.patch
- debian/patches/disable-dimension-test.patch → debian/patches/0003-disable-dimension-test.patch
- debian/patches/0005-Fix-setting-of-LIBMINC_USE_FILE_CONFIG-to-be-correct.patch → debian/patches/0004-Fix-setting-of-LIBMINC_USE_FILE_CONFIG-to-be-correct.patch
- debian/patches/0005-Disable-setting-RPATH.patch
- + debian/patches/0006-fixes-gcc-15.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+libminc (2.4.06-3) unstable; urgency=medium
+
+ * [2159d0a] Code fixes to allow building with GCC 15.
+ Closes: #1097231.
+ * [55b7170] Renumber patches.
+ * [345008c] Harmonize all patch files to end with ".patch".
+
+ -- Steve M. Robbins <smr at debian.org> Thu, 04 Sep 2025 22:00:47 -0500
+
libminc (2.4.06-2.1) unstable; urgency=medium
* Non-maintainer upload.
=====================================
debian/patches/build-using-system-find-dot-cmake → debian/patches/0001-build-using-system-find-dot-cmake.patch
=====================================
@@ -14,10 +14,10 @@ variable HDF5_C_LIBRARIES is used.
1 file changed, 1 insertion(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 708fc78..2d80291 100644
+index caf681a..63292fe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -82,6 +82,7 @@ IF(NOT LIBMINC_EXTERNALLY_CONFIGURED)
+@@ -84,6 +84,7 @@ IF(NOT LIBMINC_EXTERNALLY_CONFIGURED)
ENDIF()
SET(HAVE_ZLIB ON)
=====================================
debian/patches/initialize_arrays_in_tests.patch → debian/patches/0002-initialize_arrays_in_tests.patch
=====================================
=====================================
debian/patches/disable-dimension-test.patch → debian/patches/0003-disable-dimension-test.patch
=====================================
@@ -12,10 +12,10 @@ anyway.
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/testdir/CMakeLists.txt b/testdir/CMakeLists.txt
-index 493d080..5637880 100644
+index 68f7191..45b0820 100644
--- a/testdir/CMakeLists.txt
+++ b/testdir/CMakeLists.txt
-@@ -134,7 +134,7 @@ ADD_EXECUTABLE(minc2-create-test-images-2 minc2-create-test-images-2.c)
+@@ -160,7 +160,7 @@ ADD_EXECUTABLE(minc2-create-test-images-2 minc2-create-test-images-2.c)
ADD_EXECUTABLE(minc2-create-test-images minc2-create-test-images.c)
ADD_EXECUTABLE(minc2-datatype-test minc2-datatype-test.c)
ADD_EXECUTABLE(minc2-large-attribute minc2-large-attribute.c)
@@ -24,7 +24,7 @@ index 493d080..5637880 100644
ADD_EXECUTABLE(minc2-full-test minc2-full-test.c)
ADD_EXECUTABLE(minc2-grpattr-test minc2-grpattr-test.c)
ADD_EXECUTABLE(minc2-hyper-test-2 minc2-hyper-test-2.c)
-@@ -171,7 +171,7 @@ add_minc_test(minc2-large-attribute-1m minc2-large-attribute 1000000)
+@@ -197,7 +197,7 @@ add_minc_test(minc2-large-attribute-1m minc2-large-attribute 1000000 ${CMAKE_
add_minc_test(minc2-datatype-test minc2-datatype-test
${CMAKE_CURRENT_BINARY_DIR}/datatype_minc2.mnc)
=====================================
debian/patches/0005-Fix-setting-of-LIBMINC_USE_FILE_CONFIG-to-be-correct.patch → debian/patches/0004-Fix-setting-of-LIBMINC_USE_FILE_CONFIG-to-be-correct.patch
=====================================
@@ -7,10 +7,10 @@ Subject: Fix setting of LIBMINC_USE_FILE_CONFIG to be correct for Debian.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2d80291..584dde7 100644
+index 63292fe..82ddcd2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -525,7 +525,7 @@ ENDIF()
+@@ -534,7 +534,7 @@ ENDIF()
# config for install dir
=====================================
debian/patches/0005-Disable-setting-RPATH.patch
=====================================
@@ -7,10 +7,10 @@ Subject: Disable setting RPATH.
1 file changed, 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 584dde7..3a8500d 100644
+index 82ddcd2..efa9e2b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -448,7 +448,6 @@ ENDIF(LIBMINC_MINC1_SUPPORT)
+@@ -457,7 +457,6 @@ ENDIF(LIBMINC_MINC1_SUPPORT)
# Keep this variable for compatibility
SET(VOLUME_IO_LIBRARY minc2)
=====================================
debian/patches/0006-fixes-gcc-15.patch
=====================================
@@ -0,0 +1,32 @@
+From: Steve M. Robbins <smr at debian.org>
+Date: Thu, 4 Sep 2025 21:50:26 -0500
+Subject: fixes-gcc-15
+
+Add argument types to function declarators, required for C23.
+
+---
+ libcommon/ParseArgv.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libcommon/ParseArgv.c b/libcommon/ParseArgv.c
+index 260f574..0bb111a 100644
+--- a/libcommon/ParseArgv.c
++++ b/libcommon/ParseArgv.c
+@@ -315,7 +315,7 @@ ParseArgv(argcPtr, argv, argTable, flags)
+ }
+ break;
+ case ARGV_FUNC: {
+- int (*handlerProc)() = (int (*)())(uintptr_t)infoPtr->src;
++ int (*handlerProc)(void*,const char*,char*) = (int (*)(void*,const char*,char*))(uintptr_t)infoPtr->src;
+
+ if ((*handlerProc)(infoPtr->dst, infoPtr->key,
+ argv[srcIndex])) {
+@@ -325,7 +325,7 @@ ParseArgv(argcPtr, argv, argTable, flags)
+ break;
+ }
+ case ARGV_GENFUNC: {
+- int (*handlerProc)() = (int (*)())(uintptr_t)infoPtr->src;
++ int (*handlerProc)(void*,const char*,int,char**) = (int (*)(void*,const char*,int,char**))(uintptr_t)infoPtr->src;
+
+ argc = (*handlerProc)(infoPtr->dst, infoPtr->key,
+ argc, argv+srcIndex);
=====================================
debian/patches/series
=====================================
@@ -1,5 +1,6 @@
-build-using-system-find-dot-cmake
-initialize_arrays_in_tests.patch
-disable-dimension-test.patch
-0005-Fix-setting-of-LIBMINC_USE_FILE_CONFIG-to-be-correct.patch
+0001-build-using-system-find-dot-cmake.patch
+0002-initialize_arrays_in_tests.patch
+0003-disable-dimension-test.patch
+0004-Fix-setting-of-LIBMINC_USE_FILE_CONFIG-to-be-correct.patch
0005-Disable-setting-RPATH.patch
+0006-fixes-gcc-15.patch
View it on GitLab: https://salsa.debian.org/med-team/libminc/-/compare/c5b9335cb091ec7e5f00c6a7da7ea588596c84a6...38fa76ad277555d8d97759b9c98f64aca5b5c280
--
View it on GitLab: https://salsa.debian.org/med-team/libminc/-/compare/c5b9335cb091ec7e5f00c6a7da7ea588596c84a6...38fa76ad277555d8d97759b9c98f64aca5b5c280
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20250905/ab0dffe0/attachment-0001.htm>
More information about the debian-med-commit
mailing list