[med-svn] [Git][med-team/ciftilib][master] 6 commits: Add patch to build with libxml++ 4.0 instead of 2.6
Jeremy Bícha (@jbicha)
gitlab at salsa.debian.org
Fri May 15 18:55:48 BST 2026
Jeremy Bícha pushed to branch master at Debian Med / ciftilib
Commits:
88cf5637 by Sébastien Noel at 2026-05-15T13:44:08-04:00
Add patch to build with libxml++ 4.0 instead of 2.6
Closes: #1121313
- - - - -
ac356d13 by Jeremy Bícha at 2026-05-15T13:48:26-04:00
Refresh patches
- - - - -
cf8a270b by Jeremy Bícha at 2026-05-15T13:49:01-04:00
Update Standards Version to 4.7.4
- - - - -
3ad1f7f3 by Jeremy Bícha at 2026-05-15T13:53:15-04:00
Run wrap-and-sort -ast
- - - - -
ba9a3576 by Jeremy Bícha at 2026-05-15T13:54:48-04:00
Add minimal debian/gbp.conf
- - - - -
e60779fb by Jeremy Bícha at 2026-05-15T13:55:23-04:00
releasing package ciftilib version 1.6.0-8
- - - - -
12 changed files:
- debian/changelog
- debian/control
- debian/copyright
- + debian/gbp.conf
- debian/patches/0002-Fix-compilation-with-Boost-1.71.patch
- debian/patches/boost1.88.patch
- debian/patches/boost1.90.patch
- debian/patches/cmake-4.patch
- debian/patches/series
- + debian/patches/xmlplusplus4.patch
- debian/tests/control
- debian/upstream/metadata
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,16 @@
+ciftilib (1.6.0-8) unstable; urgency=medium
+
+ * Team upload
+
+ [ Sébastien Noel ]
+ * Add patch to build with libxml++ 4.0 instead of 2.6 (Closes: #1121313)
+
+ [ Jeremy Bícha ]
+ * Add minimal debian/gbp.conf
+ * Update Standards Version to 4.7.4
+
+ -- Jeremy Bícha <jbicha at ubuntu.com> Fri, 15 May 2026 13:53:29 -0400
+
ciftilib (1.6.0-7) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -1,16 +1,16 @@
Source: ciftilib
-Standards-Version: 4.7.3
+Standards-Version: 4.7.4
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
Uploaders:
Ghislain Antony Vaillant <ghisvail at gmail.com>,
Section: libs
Build-Depends:
+ debhelper-compat (= 13),
dpkg-dev (>= 1.22.5),
cmake,
- debhelper-compat (= 13),
libboost-dev,
libboost-filesystem-dev,
- libxml++2.6-dev,
+ libxml++-4.0-dev,
zlib1g-dev,
Build-Depends-Indep:
doxygen,
@@ -47,10 +47,10 @@ Architecture: any
Multi-Arch: same
Section: libdevel
Depends:
- ${misc:Depends},
libboost-dev,
libcifti0t64 (= ${binary:Version}),
libxml++2.6-dev,
+ ${misc:Depends},
Suggests:
libcifti-doc,
Description: development files for CiftiLib
=====================================
debian/copyright
=====================================
@@ -1,7 +1,6 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: CiftiLib
-Upstream-Contact: Tim Coalson <tsc5yc at mst.edu>
Source: https://github.com/Washington-University/CiftiLib
+Upstream-Name: CiftiLib
Files: *
Copyright: 2014 Washington University School of Medicine
=====================================
debian/gbp.conf
=====================================
@@ -0,0 +1,10 @@
+[DEFAULT]
+pristine-tar = True
+debian-branch = master
+upstream-branch = upstream
+
+[dch]
+multimaint-merge = True
+
+[pq]
+patch-numbers = False
=====================================
debian/patches/0002-Fix-compilation-with-Boost-1.71.patch
=====================================
@@ -1,13 +1,16 @@
From: Giovanni Mascellani <gio at debian.org>
Date: Sat, 11 Jan 2020 15:44:14 +0100
-Bug-Debian: https://bugs.debian.org/948665
Subject: Fix compilation with Boost 1.71.
Method file_string() is now obsolete and just calls string().
+
+Bug-Debian: https://bugs.debian.org/948665
---
src/CiftiFile.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
+diff --git a/src/CiftiFile.cxx b/src/CiftiFile.cxx
+index 6baab8b..3f7a685 100644
--- a/src/CiftiFile.cxx
+++ b/src/CiftiFile.cxx
@@ -100,7 +100,7 @@ namespace
=====================================
debian/patches/boost1.88.patch
=====================================
@@ -1,29 +1,35 @@
-Description: Port to boost 1.88
-Author: Andreas Tille <tille at debian.org>
-Last-Update: 2025-12-11
+From: Andreas Tille <tille at debian.org>
+Date: Thu, 11 Dec 2025 10:33:02 +0100
+Subject: Port to boost 1.88
+
Bug-Debian: https://bugs.debian.org/1110582
+---
+ src/CiftiFile.cxx | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+diff --git a/src/CiftiFile.cxx b/src/CiftiFile.cxx
+index 3f7a685..1c53421 100644
--- a/src/CiftiFile.cxx
+++ b/src/CiftiFile.cxx
-@@ -99,12 +99,8 @@ namespace
+@@ -99,11 +99,7 @@ namespace
#ifdef CIFTILIB_USE_QT
return QFileInfo(mypath).absoluteFilePath();
#else
-#ifdef CIFTILIB_BOOST_NO_FSV3
- return filesystem::complete(AString_to_std_string(mypath)).string();
-#else
- return filesystem::absolute(AString_to_std_string(mypath)).native();
- #endif
+- return filesystem::absolute(AString_to_std_string(mypath)).native();
-#endif
++ return boost::filesystem::absolute(AString_to_std_string(mypath)).native();
+ #endif
}
- AString pathToCanonical(const AString& mypath)
@@ -113,7 +109,7 @@ namespace
return QFileInfo(mypath).canonicalFilePath();
#else
#ifdef CIFTILIB_BOOST_NO_FSV3
- return filesystem::complete(AString_to_std_string(mypath)).string();
-+ return filesystem::weakly_canonical(AString_to_std_string(mypath)).string();
++ return boost::filesystem::weakly_canonical(AString_to_std_string(mypath)).string();
#else
#ifdef CIFTILIB_BOOST_NO_CANONICAL
filesystem::path temp = AString_to_std_string(mypath);
=====================================
debian/patches/boost1.90.patch
=====================================
@@ -1,8 +1,14 @@
-Description: Port to boost 1.90
-Author: Andreas Tille <tille at debian.org>
-Last-Update: 2026-02-21
+From: Andreas Tille <tille at debian.org>
+Date: Sat, 21 Feb 2026 17:34:28 +0100
+Subject: Port to boost 1.90
+
Bug-Debian: https://bugs.debian.org/1128116
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d66a4b9..aced570 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,7 +76,7 @@ ENDIF (NOT QT_FOUND)
=====================================
debian/patches/cmake-4.patch
=====================================
@@ -1,11 +1,18 @@
-Description: Fix build with CMake 4
-Author: Santiago Vila <sanvila at debian.org>
+From: Santiago Vila <sanvila at debian.org>
+Date: Fri, 17 Oct 2025 11:15:00 +0200
+Subject: Fix build with CMake 4
+
Bug-Debian: https://bugs.debian.org/1112779
-Last-Update: 2025-10-17
+---
+ CMakeLists.txt | 6 +++---
+ cmake/Modules/UseDoxygen/UseDoxygen.cmake | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 990f5a8..d66a4b9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -3,9 +3,9 @@
+@@ -3,9 +3,9 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
#UseDoxygen trips over a policy change in cmake 3, suppress the warning
CMAKE_POLICY(VERSION 2.8.7)
#the suggested version-type policy command doesn't shut this warning up, so set it manually
@@ -18,9 +25,11 @@ Last-Update: 2025-10-17
PROJECT(CiftiLib)
+diff --git a/cmake/Modules/UseDoxygen/UseDoxygen.cmake b/cmake/Modules/UseDoxygen/UseDoxygen.cmake
+index 245ba56..6a14199 100644
--- a/cmake/Modules/UseDoxygen/UseDoxygen.cmake
+++ b/cmake/Modules/UseDoxygen/UseDoxygen.cmake
-@@ -135,10 +135,10 @@
+@@ -135,10 +135,10 @@ if(DOXYGEN_FOUND AND DOXYFILE_IN_FOUND)
configure_file("${DOXYFILE_IN}" "${DOXYFILE}" @ONLY)
=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@
cmake-4.patch
boost1.88.patch
boost1.90.patch
+xmlplusplus4.patch
=====================================
debian/patches/xmlplusplus4.patch
=====================================
@@ -0,0 +1,671 @@
+From: =?utf-8?q?S=C3=A9bastien_Noel?= <sebastien at twolife.be>
+Date: Mon, 16 Feb 2026 19:25:08 +0100
+Subject: Upgrade dependency from libxml++2.6-dev to libxml++-4.0-dev
+
+Bug-Debian: http://bugs.debian.org/1121313
+---
+ CMakeLists.txt | 2 +-
+ cmake/Modules/Findglibmm.cmake | 4 ++--
+ cmake/Modules/Findlibxml++.cmake | 4 ++--
+ cmake/Modules/Findsigc++.cmake | 4 ++--
+ src/Cifti/CiftiBrainModelsMap.cxx | 24 ++++++++++++------------
+ src/Cifti/CiftiLabelsMap.cxx | 16 ++++++++--------
+ src/Cifti/CiftiParcelsMap.cxx | 16 ++++++++--------
+ src/Cifti/CiftiScalarsMap.cxx | 16 ++++++++--------
+ src/Cifti/CiftiSeriesMap.cxx | 8 ++++----
+ src/Cifti/CiftiXML.cxx | 18 +++++++++---------
+ src/Cifti/LabelTable.cxx | 4 ++--
+ src/Cifti/MetaData.cxx | 8 ++++----
+ src/Common/XmlAdapter.cxx | 18 +++++++++---------
+ 13 files changed, 71 insertions(+), 71 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index aced570..390f2ec 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -34,7 +34,7 @@ IF (${CMAKE_VERSION} VERSION_LESS "3.1")
+ ENDIF (${GCC_STD11})
+ ENDIF (CMAKE_COMPILER_IS_GNUCC)
+ ELSE (${CMAKE_VERSION} VERSION_LESS "3.1")
+- SET(CMAKE_CXX_STANDARD 11)
++ SET(CMAKE_CXX_STANDARD 17)
+ SET(CMAKE_CXX_STANDARD_REQUIRED TRUE)
+ ENDIF (${CMAKE_VERSION} VERSION_LESS "3.1")
+
+diff --git a/cmake/Modules/Findglibmm.cmake b/cmake/Modules/Findglibmm.cmake
+index c9b9bef..d190398 100644
+--- a/cmake/Modules/Findglibmm.cmake
++++ b/cmake/Modules/Findglibmm.cmake
+@@ -11,11 +11,11 @@ IF(GLIB_FOUND)
+
+ #use pkg-config
+ FIND_PACKAGE(PkgConfig)
+- PKG_CHECK_MODULES(PC_GLIBMM glibmm-2.4)
++ PKG_CHECK_MODULES(PC_GLIBMM glibmm-2.68)
+
+ FIND_PATH(glibmm_INCLUDE_DIR NAMES glibmm/main.h HINTS ${PC_GLIBMM_INCLUDEDIR} ${PC_GLIBMM_INCLUDE_DIRS})
+ FIND_PATH(glibmm_config_INCLUDE_DIR NAMES glibmmconfig.h HINTS ${PC_GLIBMM_INCLUDEDIR} ${PC_GLIBMM_INCLUDE_DIRS})
+- FIND_LIBRARY(glibmm_LIBRARY NAMES glibmm glibmm-2.4 HINTS ${PC_GLIBMM_LIBDIR} ${PC_GLIBMM_LIBRARY_DIRS})
++ FIND_LIBRARY(glibmm_LIBRARY NAMES glibmm glibmm-2.68 HINTS ${PC_GLIBMM_LIBDIR} ${PC_GLIBMM_LIBRARY_DIRS})
+
+ SET(glibmm_LIBRARIES ${glibmm_LIBRARY} ${PC_GLIBMM_PKGCONF_LIBRARIES} ${glib_LIBRARIES} ${sigc++_LIBRARIES})
+ SET(glibmm_INCLUDE_DIRS ${glibmm_INCLUDE_DIR} ${glibmm_config_INCLUDE_DIR} ${PC_GLIBMM_PKGCONF_INCLUDE_DIRS} ${glib_INCLUDE_DIRS} ${sigc++_INCLUDE_DIRS})
+diff --git a/cmake/Modules/Findlibxml++.cmake b/cmake/Modules/Findlibxml++.cmake
+index 1a80939..351728e 100644
+--- a/cmake/Modules/Findlibxml++.cmake
++++ b/cmake/Modules/Findlibxml++.cmake
+@@ -11,11 +11,11 @@ IF(GLIBMM_FOUND AND LIBXML2_FOUND)
+
+ #use pkg-config
+ FIND_PACKAGE(PkgConfig)
+- PKG_CHECK_MODULES(PC_LIBXMLPP QUIET libxml++-2.6)
++ PKG_CHECK_MODULES(PC_LIBXMLPP QUIET libxml++-4.0)
+
+ FIND_PATH(libxml++_INCLUDE_DIR NAMES libxml++/libxml++.h HINTS ${PC_LIBXMLPP_INCLUDEDIR} ${PC_LIBXMLPP_INCLUDE_DIRS})
+ FIND_PATH(libxml++_config_INCLUDE_DIR NAMES libxml++config.h HINTS ${PC_LIBXMLPP_INCLUDEDIR} ${PC_LIBXMLPP_INCLUDE_DIRS})
+- FIND_LIBRARY(libxml++_LIBRARY NAMES xml++ xml++-2.6 HINTS ${PC_LIBXMLPP_LIBDIR} ${PC_LIBXMLPP_LIBRARY_DIRS})
++ FIND_LIBRARY(libxml++_LIBRARY NAMES xml++ xml++-4.0 HINTS ${PC_LIBXMLPP_LIBDIR} ${PC_LIBXMLPP_LIBRARY_DIRS})
+
+ SET(libxml++_LIBRARIES ${libxml++_LIBRARY} ${PC_LIBXMLPP_PKGCONF_LIBRARIES} ${glibmm_LIBRARIES} ${LIBXML2_LIBRARIES})
+ IF(libxml++_config_INCLUDE_DIR)
+diff --git a/cmake/Modules/Findsigc++.cmake b/cmake/Modules/Findsigc++.cmake
+index 64ed168..d68e44a 100644
+--- a/cmake/Modules/Findsigc++.cmake
++++ b/cmake/Modules/Findsigc++.cmake
+@@ -1,11 +1,11 @@
+
+ #use pkg-config
+ FIND_PACKAGE(PkgConfig)
+-PKG_CHECK_MODULES(PC_SIGCXX sigc++-2.0)
++PKG_CHECK_MODULES(PC_SIGCXX sigc++-3.0)
+
+ FIND_PATH(sigc++_INCLUDE_DIR NAMES sigc++/sigc++.h HINTS ${PC_SIGCXX_INCLUDEDIR} ${PC_SIGCXX_INCLUDE_DIRS})
+ FIND_PATH(sigc++_config_INCLUDE_DIR NAMES sigc++config.h HINTS ${PC_SIGCXX_INCLUDEDIR} ${PC_SIGCXX_INCLUDE_DIRS})
+-FIND_LIBRARY(sigc++_LIBRARY NAMES sigc sigc-2.0 HINTS ${PC_SIGCXX_LIBDIR} ${PC_SIGCXX_LIBRARY_DIRS})
++FIND_LIBRARY(sigc++_LIBRARY NAMES sigc sigc-3.0 HINTS ${PC_SIGCXX_LIBDIR} ${PC_SIGCXX_LIBRARY_DIRS})
+
+ SET(sigc++_LIBRARIES ${sigc++_LIBRARY} ${PC_SIGCXX_PKGCONF_LIBRARIES})
+ SET(sigc++_INCLUDE_DIRS ${sigc++_INCLUDE_DIR} ${sigc++_config_INCLUDE_DIR} ${PC_SIGCXX_PKGCONF_INCLUDE_DIRS})
+diff --git a/src/Cifti/CiftiBrainModelsMap.cxx b/src/Cifti/CiftiBrainModelsMap.cxx
+index d8c1e54..ae885b3 100644
+--- a/src/Cifti/CiftiBrainModelsMap.cxx
++++ b/src/Cifti/CiftiBrainModelsMap.cxx
+@@ -540,7 +540,7 @@ void CiftiBrainModelsMap::readXML1(XmlReader& xml)
+ {
+ switch (xml.get_node_type())
+ {
+- case XmlReader::Element:
++ case XmlReader::NodeType::Element:
+ {
+ AString name = xml.get_local_name();
+ if (name == "BrainModel")
+@@ -553,7 +553,7 @@ void CiftiBrainModelsMap::readXML1(XmlReader& xml)
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+@@ -640,7 +640,7 @@ void CiftiBrainModelsMap::readXML2(XmlReader& xml)
+ {
+ switch (xml.get_node_type())
+ {
+- case XmlReader::Element:
++ case XmlReader::NodeType::Element:
+ {
+ AString name = xml.get_local_name();
+ if (name == "BrainModel")
+@@ -661,7 +661,7 @@ void CiftiBrainModelsMap::readXML2(XmlReader& xml)
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+@@ -770,7 +770,7 @@ void CiftiBrainModelsMap::ParseHelperModel::parseBrainModel1(XmlReader& xml)
+ {
+ switch (xml.get_node_type())
+ {
+- case XmlReader::Element:
++ case XmlReader::NodeType::Element:
+ {
+ AString name = xml.get_local_name();
+ if (name == "NodeIndices")
+@@ -786,7 +786,7 @@ void CiftiBrainModelsMap::ParseHelperModel::parseBrainModel1(XmlReader& xml)
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+@@ -829,7 +829,7 @@ void CiftiBrainModelsMap::ParseHelperModel::parseBrainModel1(XmlReader& xml)
+ {
+ switch (xml.get_node_type())
+ {
+- case XmlReader::Element:
++ case XmlReader::NodeType::Element:
+ {
+ AString name = xml.get_local_name();
+ if (name == "VoxelIndicesIJK")
+@@ -845,7 +845,7 @@ void CiftiBrainModelsMap::ParseHelperModel::parseBrainModel1(XmlReader& xml)
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+@@ -946,7 +946,7 @@ void CiftiBrainModelsMap::ParseHelperModel::parseBrainModel2(XmlReader& xml)
+ {
+ switch (xml.get_node_type())
+ {
+- case XmlReader::Element:
++ case XmlReader::NodeType::Element:
+ {
+ AString name = xml.get_local_name();
+ if (name == "VertexIndices")
+@@ -962,7 +962,7 @@ void CiftiBrainModelsMap::ParseHelperModel::parseBrainModel2(XmlReader& xml)
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+@@ -998,7 +998,7 @@ void CiftiBrainModelsMap::ParseHelperModel::parseBrainModel2(XmlReader& xml)
+ {
+ switch (xml.get_node_type())
+ {
+- case XmlReader::Element:
++ case XmlReader::NodeType::Element:
+ {
+ AString name = xml.get_local_name();
+ if (name == "VoxelIndicesIJK")
+@@ -1014,7 +1014,7 @@ void CiftiBrainModelsMap::ParseHelperModel::parseBrainModel2(XmlReader& xml)
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+diff --git a/src/Cifti/CiftiLabelsMap.cxx b/src/Cifti/CiftiLabelsMap.cxx
+index 2f4ef1f..0d1e41c 100644
+--- a/src/Cifti/CiftiLabelsMap.cxx
++++ b/src/Cifti/CiftiLabelsMap.cxx
+@@ -146,7 +146,7 @@ void CiftiLabelsMap::readXML1(XmlReader& xml)
+ {
+ switch (xml.get_node_type())
+ {
+- case XmlReader::Element:
++ case XmlReader::NodeType::Element:
+ {
+ AString name = xml.get_local_name();
+ if (name == "NamedMap")
+@@ -159,7 +159,7 @@ void CiftiLabelsMap::readXML1(XmlReader& xml)
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+@@ -204,7 +204,7 @@ void CiftiLabelsMap::readXML2(XmlReader& xml)
+ {
+ switch (xml.get_node_type())
+ {
+- case XmlReader::Element:
++ case XmlReader::NodeType::Element:
+ {
+ AString name = xml.get_local_name();
+ if (name == "NamedMap")
+@@ -217,7 +217,7 @@ void CiftiLabelsMap::readXML2(XmlReader& xml)
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+@@ -283,7 +283,7 @@ void CiftiLabelsMap::LabelMap::readXML1(XmlReader& xml)
+ {
+ switch (xml.get_node_type())
+ {
+- case XmlReader::Element:
++ case XmlReader::NodeType::Element:
+ {
+ AString name = xml.get_local_name();
+ if (name == "MetaData")
+@@ -313,7 +313,7 @@ void CiftiLabelsMap::LabelMap::readXML1(XmlReader& xml)
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+@@ -387,7 +387,7 @@ void CiftiLabelsMap::LabelMap::readXML2(XmlReader& xml)
+ {
+ switch (xml.get_node_type())
+ {
+- case XmlReader::Element:
++ case XmlReader::NodeType::Element:
+ {
+ AString name = xml.get_local_name();
+ if (name == "MetaData")
+@@ -417,7 +417,7 @@ void CiftiLabelsMap::LabelMap::readXML2(XmlReader& xml)
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+diff --git a/src/Cifti/CiftiParcelsMap.cxx b/src/Cifti/CiftiParcelsMap.cxx
+index e4e40fe..c3ca557 100644
+--- a/src/Cifti/CiftiParcelsMap.cxx
++++ b/src/Cifti/CiftiParcelsMap.cxx
+@@ -402,7 +402,7 @@ void CiftiParcelsMap::readXML1(XmlReader& xml)
+ {
+ switch (xml.get_node_type())
+ {
+- case XmlReader::Element:
++ case XmlReader::NodeType::Element:
+ {
+ AString name = xml.get_local_name();
+ if (name == "Surface")
+@@ -430,7 +430,7 @@ void CiftiParcelsMap::readXML1(XmlReader& xml)
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+@@ -508,7 +508,7 @@ void CiftiParcelsMap::readXML2(XmlReader& xml)
+ {
+ switch (xml.get_node_type())
+ {
+- case XmlReader::Element:
++ case XmlReader::NodeType::Element:
+ {
+ AString name = xml.get_local_name();
+ if (name == "Surface")
+@@ -544,7 +544,7 @@ void CiftiParcelsMap::readXML2(XmlReader& xml)
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+@@ -636,7 +636,7 @@ CiftiParcelsMap::Parcel CiftiParcelsMap::readParcel1(XmlReader& xml)
+ {
+ switch (xml.get_node_type())
+ {
+- case XmlReader::Element:
++ case XmlReader::NodeType::Element:
+ {
+ AString name = xml.get_local_name();
+ if (name == "Nodes")
+@@ -690,7 +690,7 @@ CiftiParcelsMap::Parcel CiftiParcelsMap::readParcel1(XmlReader& xml)
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+@@ -778,7 +778,7 @@ CiftiParcelsMap::Parcel CiftiParcelsMap::readParcel2(XmlReader& xml)
+ {
+ switch (xml.get_node_type())
+ {
+- case XmlReader::Element:
++ case XmlReader::NodeType::Element:
+ {
+ AString name = xml.get_local_name();
+ if (name == "Vertices")
+@@ -832,7 +832,7 @@ CiftiParcelsMap::Parcel CiftiParcelsMap::readParcel2(XmlReader& xml)
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+diff --git a/src/Cifti/CiftiScalarsMap.cxx b/src/Cifti/CiftiScalarsMap.cxx
+index 2892dda..7f1ab92 100644
+--- a/src/Cifti/CiftiScalarsMap.cxx
++++ b/src/Cifti/CiftiScalarsMap.cxx
+@@ -132,7 +132,7 @@ void CiftiScalarsMap::readXML1(XmlReader& xml)
+ {
+ switch (xml.get_node_type())
+ {
+- case XmlReader::Element:
++ case XmlReader::NodeType::Element:
+ {
+ AString name = xml.get_local_name();
+ if (name == "NamedMap")
+@@ -144,7 +144,7 @@ void CiftiScalarsMap::readXML1(XmlReader& xml)
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+@@ -188,7 +188,7 @@ void CiftiScalarsMap::readXML2(XmlReader& xml)
+ {
+ switch (xml.get_node_type())
+ {
+- case XmlReader::Element:
++ case XmlReader::NodeType::Element:
+ {
+ AString name = xml.get_local_name();
+ if (name == "NamedMap")
+@@ -200,7 +200,7 @@ void CiftiScalarsMap::readXML2(XmlReader& xml)
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+@@ -258,7 +258,7 @@ void CiftiScalarsMap::ScalarMap::readXML1(XmlReader& xml)
+ {
+ switch (xml.get_node_type())
+ {
+- case XmlReader::Element:
++ case XmlReader::NodeType::Element:
+ {
+ AString name = xml.get_local_name();
+ if (name == "MetaData")
+@@ -281,7 +281,7 @@ void CiftiScalarsMap::ScalarMap::readXML1(XmlReader& xml)
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+@@ -343,7 +343,7 @@ void CiftiScalarsMap::ScalarMap::readXML2(XmlReader& xml)
+ {
+ switch (xml.get_node_type())
+ {
+- case XmlReader::Element:
++ case XmlReader::NodeType::Element:
+ {
+ AString name = xml.get_local_name();
+ if (name == "MetaData")
+@@ -366,7 +366,7 @@ void CiftiScalarsMap::ScalarMap::readXML2(XmlReader& xml)
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+diff --git a/src/Cifti/CiftiSeriesMap.cxx b/src/Cifti/CiftiSeriesMap.cxx
+index 1f37d2a..f770fbc 100644
+--- a/src/Cifti/CiftiSeriesMap.cxx
++++ b/src/Cifti/CiftiSeriesMap.cxx
+@@ -129,13 +129,13 @@ void CiftiSeriesMap::readXML1(XmlReader& xml)
+ {
+ switch (xml.get_node_type())
+ {
+- case XmlReader::Element:
++ case XmlReader::NodeType::Element:
+ {
+ AString name = xml.get_local_name();
+ throw CiftiException("unexpected element in timepoints map: " + name);
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+@@ -215,13 +215,13 @@ void CiftiSeriesMap::readXML2(XmlReader& xml)
+ {
+ switch (xml.get_node_type())
+ {
+- case XmlReader::Element:
++ case XmlReader::NodeType::Element:
+ {
+ AString name = xml.get_local_name();
+ throw CiftiException("unexpected element in series map: " + name);
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+diff --git a/src/Cifti/CiftiXML.cxx b/src/Cifti/CiftiXML.cxx
+index 4e0cf59..273a003 100644
+--- a/src/Cifti/CiftiXML.cxx
++++ b/src/Cifti/CiftiXML.cxx
+@@ -345,7 +345,7 @@ void CiftiXML::readXML(XmlReader& xml)
+ {
+ switch (xml.get_node_type())
+ {
+- case XmlReader::Element:
++ case XmlReader::NodeType::Element:
+ {
+ AString name = xml.get_local_name();
+ if (name == "CIFTI")
+@@ -442,7 +442,7 @@ void CiftiXML::parseCIFTI1(XmlReader& xml)
+ {
+ switch (xml.get_node_type())
+ {
+- case XmlReader::Element:
++ case XmlReader::NodeType::Element:
+ {
+ AString name = xml.get_local_name();
+ if (name == "Matrix")
+@@ -458,7 +458,7 @@ void CiftiXML::parseCIFTI1(XmlReader& xml)
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+@@ -510,7 +510,7 @@ void CiftiXML::parseCIFTI2(XmlReader& xml)//yes, these will often have largely s
+ {
+ switch (xml.get_node_type())
+ {
+- case XmlReader::Element:
++ case XmlReader::NodeType::Element:
+ {
+ AString name = xml.get_local_name();
+ if (name == "Matrix")
+@@ -526,7 +526,7 @@ void CiftiXML::parseCIFTI2(XmlReader& xml)//yes, these will often have largely s
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+@@ -598,7 +598,7 @@ void CiftiXML::parseMatrix1(XmlReader& xml)
+ }
+ switch (xml.get_node_type())
+ {
+- case XmlReader::Element:
++ case XmlReader::NodeType::Element:
+ {
+ AString name = xml.get_local_name();
+ if (name == "MetaData")
+@@ -626,7 +626,7 @@ void CiftiXML::parseMatrix1(XmlReader& xml)
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+@@ -719,7 +719,7 @@ void CiftiXML::parseMatrix2(XmlReader& xml)
+ {
+ switch (xml.get_node_type())
+ {
+- case XmlReader::Element:
++ case XmlReader::NodeType::Element:
+ {
+ AString name = xml.get_local_name();
+ if (name == "MetaData")
+@@ -737,7 +737,7 @@ void CiftiXML::parseMatrix2(XmlReader& xml)
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+diff --git a/src/Cifti/LabelTable.cxx b/src/Cifti/LabelTable.cxx
+index 3475277..e3b2c4b 100644
+--- a/src/Cifti/LabelTable.cxx
++++ b/src/Cifti/LabelTable.cxx
+@@ -822,7 +822,7 @@ void LabelTable::readXml(XmlReader& xml)
+ {
+ switch (xml.get_node_type())
+ {
+- case XmlReader::Element:
++ case XmlReader::NodeType::Element:
+ {
+ AString name = xml.get_local_name();
+ if (name == "Label")
+@@ -853,7 +853,7 @@ void LabelTable::readXml(XmlReader& xml)
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+diff --git a/src/Cifti/MetaData.cxx b/src/Cifti/MetaData.cxx
+index e16328d..101a999 100644
+--- a/src/Cifti/MetaData.cxx
++++ b/src/Cifti/MetaData.cxx
+@@ -361,7 +361,7 @@ void MetaData::readCiftiXML1(XmlReader& xml)
+ {
+ switch (xml.get_node_type())
+ {
+- case XmlReader::Element:
++ case XmlReader::NodeType::Element:
+ {
+ AString name = xml.get_local_name();
+ if (name == "MD")
+@@ -372,7 +372,7 @@ void MetaData::readCiftiXML1(XmlReader& xml)
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+@@ -425,7 +425,7 @@ void MetaData::readEntry(XmlReader& xml)
+ {
+ switch (xml.get_node_type())
+ {
+- case XmlReader::Element:
++ case XmlReader::NodeType::Element:
+ {
+ AString name = xml.get_local_name();
+ if (name == "Name")
+@@ -442,7 +442,7 @@ void MetaData::readEntry(XmlReader& xml)
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+diff --git a/src/Common/XmlAdapter.cxx b/src/Common/XmlAdapter.cxx
+index 6b3ddcc..9144a94 100644
+--- a/src/Common/XmlAdapter.cxx
++++ b/src/Common/XmlAdapter.cxx
+@@ -81,7 +81,7 @@ XmlAttributesResult cifti::XmlReader_parseAttributes(XmlReader& xml, const vecto
+ }
+ #else
+ #ifdef CIFTILIB_USE_XMLPP
+- CiftiAssert(xml.get_node_type() == XmlReader::Element);
++ CiftiAssert(xml.get_node_type() == XmlReader::NodeType::Element);
+ elemName = xml.get_local_name();
+ for (int i = 0; i < numMandatory; ++i)//NOTE: libxml++ (and even libxml2 to some extent) don't have a good interface for iterating through all attributes efficiently
+ {//you have to iterate through a linked list of attributes exposed through a "hacking interface"
+@@ -113,7 +113,7 @@ bool cifti::XmlReader_checkEndElement(XmlReader& xml, const AString& elementName
+ return xml.hasError() || (xml.isEndElement() && xml.name() == elementName);//if it has an xml error, don't trip an assert
+ #else
+ #ifdef CIFTILIB_USE_XMLPP
+- return (xml.get_node_type() == XmlReader::EndElement || xml.is_empty_element()) && xml.get_local_name() == elementName;
++ return (xml.get_node_type() == XmlReader::NodeType::EndElement || xml.is_empty_element()) && xml.get_local_name() == elementName;
+ #else
+ #error "not implemented"
+ #endif
+@@ -127,20 +127,20 @@ AString cifti::XmlReader_readElementText(XmlReader& xml)
+ #else
+ #ifdef CIFTILIB_USE_XMLPP
+ AString ret;
+- CiftiAssert(xml.get_node_type() == XmlReader::Element);
++ CiftiAssert(xml.get_node_type() == XmlReader::NodeType::Element);
+ AString elemName = xml.get_local_name();
+ bool done = xml.is_empty_element();//NOTE: a <blah/> element does NOT give a separate end element state!!!
+ while(!done && xml.read())
+ {
+ switch(xml.get_node_type())
+ {
+- case XmlReader::Element:
++ case XmlReader::NodeType::Element:
+ throw CiftiException("unexpected element inside " + elemName + " element: " + xml.get_local_name());
+- case XmlReader::Text:
+- case XmlReader::CDATA:
++ case XmlReader::NodeType::Text:
++ case XmlReader::NodeType::CDATA:
+ ret += xml.get_value();
+ break;
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+@@ -165,9 +165,9 @@ bool cifti::XmlReader_readNextStartElement(XmlReader& xml)
+ {
+ switch (xml.get_node_type())
+ {
+- case XmlReader::Element:
++ case XmlReader::NodeType::Element:
+ return true;
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ return false;
+ default:
+ break;
=====================================
debian/tests/control
=====================================
@@ -1,3 +1,8 @@
Tests: ciftilib-tests
-Depends: @, cmake, g++ | c++-compiler, pkg-config
-Restrictions: allow-stderr
+Depends:
+ cmake,
+ g++ | c++-compiler,
+ pkgconf,
+ @,
+Restrictions:
+ allow-stderr,
=====================================
debian/upstream/metadata
=====================================
@@ -1,3 +1,4 @@
+---
Bug-Database: https://github.com/Washington-University/CiftiLib/issues
Bug-Submit: https://github.com/Washington-University/CiftiLib/issues/new
Repository: https://github.com/Washington-University/CiftiLib.git
View it on GitLab: https://salsa.debian.org/med-team/ciftilib/-/compare/a59cf33b41f1c0ebd8f7ac93c52434a3e3323daa...e60779fb254e64fbf6e3522016cc7f5a61d0719c
--
View it on GitLab: https://salsa.debian.org/med-team/ciftilib/-/compare/a59cf33b41f1c0ebd8f7ac93c52434a3e3323daa...e60779fb254e64fbf6e3522016cc7f5a61d0719c
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20260515/3e137461/attachment-0001.htm>
More information about the debian-med-commit
mailing list