public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur@gmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/libminc] rawhide: fix: update to 2.5.0, fix ftbfs
Date: Sun, 09 Aug 2026 09:53:35 GMT [thread overview]
Message-ID: <178626921589.1.8075508983666909915.rpms-libminc-3e6f6a26e240@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/libminc
Branch : rawhide
Commit : 3e6f6a26e2406b37d15edc4c353f7597db147726
Author : Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur@gmail.com>
Date : 2026-08-09T10:52:21+01:00
Stats : +89/-143 in 7 file(s)
URL : https://src.fedoraproject.org/rpms/libminc/c/3e6f6a26e2406b37d15edc4c353f7597db147726?branch=rawhide
Log:
fix: update to 2.5.0, fix ftbfs
- Fixes rhbz#2381263
- Fixes rhbz#2405176
---
diff --git a/.gitignore b/.gitignore
index 86f68c0..9fa219a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/libminc-2.3.00.tar.gz
/libminc-2.4.03.tar.gz
+/libminc-2.5.0.tar.gz
diff --git a/0001-install-cmake-files-in-private-directory.patch b/0001-install-cmake-files-in-private-directory.patch
deleted file mode 100644
index 16dcd69..0000000
--- a/0001-install-cmake-files-in-private-directory.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 44be2c83f8f7cd285ee0fd946853b98ffed6bd14 Mon Sep 17 00:00:00 2001
-From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
-Date: Sat, 7 Nov 2015 14:13:47 +0100
-Subject: [PATCH 1/2] install cmake files in private directory
-
-Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
----
- CMakeLists.txt | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fcf1bb4..349ee66 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -50,6 +50,7 @@ IF(NOT LIBMINC_EXTERNALLY_CONFIGURED)
- SET (LIBMINC_EXPORTED_TARGETS "LIBMINC-targets")
- SET (LIBMINC_INSTALL_BIN_DIR bin)
- SET (LIBMINC_INSTALL_LIB_DIR lib${LIB_SUFFIX})
-+ SET (LIBMINC_INSTALL_CMAKE_DIR lib${LIB_SUFFIX}/cmake/LIBMINC)
- SET (LIBMINC_INSTALL_INCLUDE_DIR include)
- SET (LIBMINC_INSTALL_DATA_DIR share)
-
-@@ -419,7 +420,7 @@ configure_file(UseLIBMINC.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/UseLIBMINC.cmake @ONLY)
-
- # config for install dir
--SET(LIBMINC_USE_FILE_CONFIG "${CMAKE_INSTALL_PREFIX}/${LIBMINC_INSTALL_LIB_DIR}/Use${LIBMINC_EXTERNAL_LIB_PREFIX}LIBMINC.cmake")
-+SET(LIBMINC_USE_FILE_CONFIG "${CMAKE_INSTALL_PREFIX}/${LIBMINC_INSTALL_CMAKE_DIR}/Use${LIBMINC_EXTERNAL_LIB_PREFIX}LIBMINC.cmake")
- SET(LIBMINC_INCLUDE_DIRS_CONFIG ${CMAKE_INSTALL_PREFIX}/${LIBMINC_INSTALL_INCLUDE_DIR} )
- SET(LIBMINC_LIBRARY_DIRS_CONFIG ${CMAKE_INSTALL_PREFIX}/${LIBMINC_INSTALL_LIB_DIR})
- SET(LIBMINC_STATIC_LIBRARIES_CONFIG "")
-@@ -452,7 +453,7 @@ IF(LIBMINC_INSTALL_LIB_DIR AND NOT LIBMINC_INSTALL_NO_DEVELOPMENT)
- ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/Use${LIBMINC_EXTERNAL_LIB_PREFIX}LIBMINC.cmake
- ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${LIBMINC_EXTERNAL_LIB_PREFIX}LIBMINCConfig.cmake
- DESTINATION
-- ${LIBMINC_INSTALL_LIB_DIR}
-+ ${LIBMINC_INSTALL_CMAKE_DIR}
- COMPONENT Development)
-
- ENDIF(LIBMINC_INSTALL_LIB_DIR AND NOT LIBMINC_INSTALL_NO_DEVELOPMENT)
---
-2.6.2
-
diff --git a/0001-remove-rpath.patch b/0001-remove-rpath.patch
new file mode 100644
index 0000000..d8c4b04
--- /dev/null
+++ b/0001-remove-rpath.patch
@@ -0,0 +1,28 @@
+From e3fbedc626ec97664a08b2281ae53abfc4b81bd9 Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
+Date: Fri, 7 Aug 2026 15:56:04 +0100
+Subject: [PATCH 1/2] remove rpath
+
+---
+ CMakeLists.txt | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6dedf3d9..b47a1946 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -564,11 +564,6 @@ set_target_properties(${LIBMINC_LIBRARY}
+ POSITION_INDEPENDENT_CODE ON
+ )
+
+-# Scope INSTALL_RPATH to the target instead of global CMAKE_INSTALL_RPATH
+-set_target_properties(${LIBMINC_LIBRARY}
+- PROPERTIES
+- INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}"
+-)
+
+ if(LIBMINC_MINC1_SUPPORT)
+ set(LIBMINC_LIBRARIES ${LIBMINC_LIBRARIES} ${NETCDF_LIBRARY} )
+--
+2.55.0
+
diff --git a/0002-install-cmake-files-to-private-dir.patch b/0002-install-cmake-files-to-private-dir.patch
new file mode 100644
index 0000000..8d5d600
--- /dev/null
+++ b/0002-install-cmake-files-to-private-dir.patch
@@ -0,0 +1,51 @@
+From bd173090647f8a81312ee5cdd5207332c66a61ee Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
+Date: Fri, 7 Aug 2026 16:39:03 +0100
+Subject: [PATCH 2/2] install cmake files to private dir
+
+---
+ CMakeLists.txt | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b47a1946..dd71e173 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -72,6 +72,7 @@ if(NOT LIBMINC_EXTERNALLY_CONFIGURED)
+ set (LIBMINC_EXPORTED_TARGETS "LIBMINC-targets")
+ set (LIBMINC_INSTALL_BIN_DIR ${CMAKE_INSTALL_BINDIR})
+ set (LIBMINC_INSTALL_LIB_DIR ${CMAKE_INSTALL_LIBDIR})
++ set (LIBMINC_INSTALL_CMAKE_DIR lib${LIB_SUFFIX}/cmake/LIBMINC)
+ set (LIBMINC_INSTALL_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR})
+ set (LIBMINC_INSTALL_DATA_DIR ${CMAKE_INSTALL_DATADIR})
+
+@@ -626,7 +627,7 @@ if(LIBMINC_IS_TOP_LEVEL OR LIBMINC_EXTERNALLY_CONFIGURED)
+ export(TARGETS ${LIBMINC_LIBRARY} FILE "${LIBMINC_EXPORTED_TARGETS}.cmake")
+
+ # config for install dir
+- set(LIBMINC_USE_FILE_CONFIG "\${LIBMINC_INSTALL_PREFIX}/lib/cmake/Use${LIBMINC_EXTERNAL_LIB_PREFIX}LIBMINC.cmake" )
++ set(LIBMINC_USE_FILE_CONFIG "\${LIBMINC_INSTALL_PREFIX}/${LIBMINC_INSTALL_CMAKE_DIR}/Use${LIBMINC_EXTERNAL_LIB_PREFIX}LIBMINC.cmake")
+ set(LIBMINC_INCLUDE_DIRS_CONFIG "\${LIBMINC_INSTALL_PREFIX}/include" )
+ set(LIBMINC_LIBRARY_DIRS_CONFIG "\${LIBMINC_INSTALL_PREFIX}/lib" )
+ set(LIBMINC_STATIC_LIBRARIES_CONFIG "" )
+@@ -728,7 +729,7 @@ if(LIBMINC_IS_TOP_LEVEL OR LIBMINC_EXTERNALLY_CONFIGURED)
+ install(
+ EXPORT ${LIBMINC_EXPORTED_TARGETS}
+ NAMESPACE LIBMINC::
+- DESTINATION ${LIBMINC_INSTALL_LIB_DIR}/cmake
++ DESTINATION ${LIBMINC_INSTALL_CMAKE_DIR}
+ COMPONENT Development
+ )
+
+@@ -748,7 +749,7 @@ if(LIBMINC_IS_TOP_LEVEL OR LIBMINC_EXTERNALLY_CONFIGURED)
+ FILES
+ ${_LIBMINC_CONFIG_INSTALL_FILES}
+ DESTINATION
+- ${LIBMINC_INSTALL_LIB_DIR}/cmake
++ ${LIBMINC_INSTALL_CMAKE_DIR}
+ COMPONENT Development)
+ endif()
+
+--
+2.55.0
+
diff --git a/129.patch b/129.patch
deleted file mode 100644
index dab9153..0000000
--- a/129.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 0876cd74f992aa3859e579b844e6b7c6e50fb30f Mon Sep 17 00:00:00 2001
-From: "Benjamin A. Beasley" <code@musicinmybrain.net>
-Date: Thu, 16 Jan 2025 14:20:01 -0500
-Subject: [PATCH 1/2] Update old-style (K&R/pre-ANSI) definition of ParseArgv()
-
-Today, such old-style definitions cause compiler warnings by default.
----
- libcommon/ParseArgv.c | 19 +++++++++++--------
- 1 file changed, 11 insertions(+), 8 deletions(-)
-
-diff --git a/libcommon/ParseArgv.c b/libcommon/ParseArgv.c
-index 260f5745..51ef699c 100644
---- a/libcommon/ParseArgv.c
-+++ b/libcommon/ParseArgv.c
-@@ -111,6 +111,16 @@ ParseLong(const char *argPtr, char **endPtr)
- * Process an argv array according to a table of expected
- * command-line options. See the manual page for more details.
- *
-+ * argcPtr: Number of arguments in argv. Modified to hold # args left in argv
-+ * at end.
-+ *
-+ * argv: Array of arguments. Modified to hold those that couldn't be processed
-+ * here.
-+ *
-+ * argTable: Array of option descriptions
-+ *
-+ * flags: Or'ed combination of various flag bits, such as ARGV_NO_DEFAULTS.
-+ *
- * Results:
- * The return value is a Boolean value with non-zero indicating an
- * error.
-@@ -126,14 +136,7 @@ ParseLong(const char *argPtr, char **endPtr)
- */
-
- int
--ParseArgv(argcPtr, argv, argTable, flags)
-- int *argcPtr; /* Number of arguments in argv. Modified
-- * to hold # args left in argv at end. */
-- char **argv; /* Array of arguments. Modified to hold
-- * those that couldn't be processed here. */
-- ArgvInfo *argTable; /* Array of option descriptions */
-- int flags; /* Or'ed combination of various flag bits,
-- * such as ARGV_NO_DEFAULTS. */
-+ParseArgv(int *argcPtr, char **argv, ArgvInfo *argTable, int flags)
- {
- ArgvInfo *infoPtr;
- /* Pointer to the current entry in the
-
-From 5b39cd2cb6e3d62cd5ac7474a28d5e8cb4497f18 Mon Sep 17 00:00:00 2001
-From: "Benjamin A. Beasley" <code@musicinmybrain.net>
-Date: Thu, 16 Jan 2025 14:33:35 -0500
-Subject: [PATCH 2/2] =?UTF-8?q?Don=E2=80=99t=20use=20pointers-to-functions?=
- =?UTF-8?q?-with-unspecified=20arguments?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-These are obsolescent, and C23 (the default for GCC 15) interprets the
-syntax as pointers to functions with no arguments, causing a compiler
-error.
----
- libcommon/ParseArgv.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/libcommon/ParseArgv.c b/libcommon/ParseArgv.c
-index 51ef699c..47cfe716 100644
---- a/libcommon/ParseArgv.c
-+++ b/libcommon/ParseArgv.c
-@@ -318,7 +318,8 @@ ParseArgv(int *argcPtr, char **argv, ArgvInfo *argTable, int flags)
- }
- break;
- case ARGV_FUNC: {
-- int (*handlerProc)() = (int (*)())(uintptr_t)infoPtr->src;
-+ typedef int (*handlerProcType)(void*, const char*, char*);
-+ handlerProcType handlerProc = (handlerProcType)(uintptr_t)infoPtr->src;
-
- if ((*handlerProc)(infoPtr->dst, infoPtr->key,
- argv[srcIndex])) {
-@@ -328,7 +329,8 @@ ParseArgv(int *argcPtr, char **argv, ArgvInfo *argTable, int flags)
- break;
- }
- case ARGV_GENFUNC: {
-- int (*handlerProc)() = (int (*)())(uintptr_t)infoPtr->src;
-+ typedef int (*handlerProcType)(void*, const char*, int, char**);
-+ handlerProcType handlerProc = (handlerProcType)(uintptr_t)infoPtr->src;
-
- argc = (*handlerProc)(infoPtr->dst, infoPtr->key,
- argc, argv+srcIndex);
diff --git a/libminc.spec b/libminc.spec
index 5189915..0e2cb3f 100644
--- a/libminc.spec
+++ b/libminc.spec
@@ -1,7 +1,7 @@
%global upver release-%{version}
Name: libminc
-Version: 2.4.03
+Version: 2.5.0
Release: %{autorelease}
Summary: Core library and API of the MINC toolkit
@@ -9,10 +9,9 @@ Summary: Core library and API of the MINC toolkit
License: MIT
URL: https://github.com/BIC-MNI/libminc
Source0: https://github.com/BIC-MNI/libminc/archive/%{upver}/%{name}-%{version}.tar.gz
-Patch0: 0001-install-cmake-files-in-private-directory.patch
-# Fix building with GCC15 as C23
-# https://github.com/BIC-MNI/libminc/pull/129
-Patch1: %{url}/pull/129.patch
+# https://github.com/sanjayankur31/libminc/tree/feat-2.5.0-fedora
+Patch: 0001-remove-rpath.patch
+Patch: 0002-install-cmake-files-to-private-dir.patch
BuildRequires: git-core
BuildRequires: cmake
@@ -53,9 +52,6 @@ sed -i -e '/SET (LIBMINC_INSTALL_INCLUDE_DIR/s/include/include\/%{name}/' CMakeL
sed -i -e '/CMAKE_INSTALL_RPATH/d' CMakeLists.txt
%build
-# TODO: Remove CMake 4.0 and GNUInstallDirs workaround at next release
-# https://github.com/BIC-MNI/libminc/pull/132
-export CMAKE_POLICY_VERSION_MINIMUM=3.5
%cmake ../ \
%if "%{?_lib}" == "lib64"
%{?_cmake_lib_suffix64} \
@@ -75,12 +71,13 @@ export CMAKE_POLICY_VERSION_MINIMUM=3.5
%files
%license COPYING
%doc README README.release doc/ NEWS ChangeLog AUTHORS
-%{_libdir}/%{name}*.so.*
+%{_libdir}/%{name}*.so.5.3.0
%files devel
%doc volume_io/example/*.c ezminc/examples/*.cpp ezminc/examples/Example_CMakeLists.txt
-%{_includedir}/%{name}/
-%{_libdir}/cmake/LIBMINC/
+%{_includedir}/*.h
+%{_includedir}/volume_io
+%{_libdir}/cmake/*
%{_libdir}/%{name}*.so
%changelog
diff --git a/sources b/sources
index 5bc5ae9..cb4d5f4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libminc-2.4.03.tar.gz) = d22fc0c75e76256bbe60bfe07166db42f5d721b8be9aa0cbd2fb13c36ca71059db55e87c85cfa26e19b396b590e1259c11f517a109b82be3f7f0066cb1277136
+SHA512 (libminc-2.5.0.tar.gz) = d44213a0525f34c60ef4bd93c5ff7dfc1b8a73eebed6a27492816c6a30f573f404c0bae1f6c054fedb60bb8401fe8e6b723238177e254376d4cef9f44d85a1da
reply other threads:[~2026-08-09 9:53 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178626921589.1.8075508983666909915.rpms-libminc-3e6f6a26e240@fedoraproject.org \
--to=sanjay.ankur@gmail.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox