Control: tags -1 patch
Dear Maintainer,
Please find in attachment a debdiff that make src:ciftilib
build against libxml++-4.0 instead of libxml++2.6
Best regards,
Sébastien
--- a/debian/control 2025-12-11 10:33:06.000000000 +0100
+++ b/debian/control 2026-02-16 18:39:37.198240224 +0100
@@ -11,7 +11,7 @@
debhelper-compat (= 13),
libboost-dev,
libboost-filesystem-dev,
- libxml++2.6-dev,
+ libxml++-4.0-dev,
zlib1g-dev,
Build-Depends-Indep:
doxygen,
--- a/debian/patches/boost1.88.patch 2025-12-11 10:33:06.000000000 +0100
+++ b/debian/patches/boost1.88.patch 2026-02-16 19:09:05.949653245 +0100
@@ -12,7 +12,8 @@
-#ifdef CIFTILIB_BOOST_NO_FSV3
- return filesystem::complete(AString_to_std_string(mypath)).string();
-#else
- return filesystem::absolute(AString_to_std_string(mypath)).native();
+- return filesystem::absolute(AString_to_std_string(mypath)).native();
++ return boost::filesystem::absolute(AString_to_std_string(mypath)).native();
#endif
-#endif
}
@@ -23,7 +24,7 @@
#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);
--- a/debian/patches/series 2025-12-11 10:33:06.000000000 +0100
+++ b/debian/patches/series 2026-02-16 19:10:09.914106087 +0100
@@ -1,3 +1,4 @@
0002-Fix-compilation-with-Boost-1.71.patch
cmake-4.patch
boost1.88.patch
+xmlplusplus4.patch
--- a/debian/patches/xmlplusplus4.patch 1970-01-01 01:00:00.000000000 +0100
+++ b/debian/patches/xmlplusplus4.patch 2026-02-16 19:12:00.819963293 +0100
@@ -0,0 +1,628 @@
+Description: Upgrade dependency from libxml++2.6-dev to libxml++-4.0-dev
+Bug-Debian: http://bugs.debian.org/1121313
+Author: Sébastien Noel <[email protected]>
+
+--- 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")
+
+--- 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})
+--- 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)
+--- 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})
+--- a/src/Cifti/CiftiBrainModelsMap.cxx
++++ b/src/Cifti/CiftiBrainModelsMap.cxx
+@@ -540,7 +540,7 @@ void CiftiBrainModelsMap::readXML1(XmlRe
+ {
+ 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(XmlRe
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+@@ -640,7 +640,7 @@ void CiftiBrainModelsMap::readXML2(XmlRe
+ {
+ 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(XmlRe
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+@@ -770,7 +770,7 @@ void CiftiBrainModelsMap::ParseHelperMod
+ {
+ 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::ParseHelperMod
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+@@ -829,7 +829,7 @@ void CiftiBrainModelsMap::ParseHelperMod
+ {
+ 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::ParseHelperMod
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+@@ -946,7 +946,7 @@ void CiftiBrainModelsMap::ParseHelperMod
+ {
+ 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::ParseHelperMod
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+@@ -998,7 +998,7 @@ void CiftiBrainModelsMap::ParseHelperMod
+ {
+ 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::ParseHelperMod
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+--- a/src/Cifti/CiftiLabelsMap.cxx
++++ b/src/Cifti/CiftiLabelsMap.cxx
+@@ -146,7 +146,7 @@ void CiftiLabelsMap::readXML1(XmlReader&
+ {
+ 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&
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+@@ -204,7 +204,7 @@ void CiftiLabelsMap::readXML2(XmlReader&
+ {
+ 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&
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+@@ -283,7 +283,7 @@ void CiftiLabelsMap::LabelMap::readXML1(
+ {
+ 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(
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+@@ -387,7 +387,7 @@ void CiftiLabelsMap::LabelMap::readXML2(
+ {
+ 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(
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+--- a/src/Cifti/CiftiParcelsMap.cxx
++++ b/src/Cifti/CiftiParcelsMap.cxx
+@@ -402,7 +402,7 @@ void CiftiParcelsMap::readXML1(XmlReader
+ {
+ 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
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+@@ -508,7 +508,7 @@ void CiftiParcelsMap::readXML2(XmlReader
+ {
+ 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
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+@@ -636,7 +636,7 @@ CiftiParcelsMap::Parcel CiftiParcelsMap:
+ {
+ 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:
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+@@ -778,7 +778,7 @@ CiftiParcelsMap::Parcel CiftiParcelsMap:
+ {
+ 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:
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+--- a/src/Cifti/CiftiScalarsMap.cxx
++++ b/src/Cifti/CiftiScalarsMap.cxx
+@@ -132,7 +132,7 @@ void CiftiScalarsMap::readXML1(XmlReader
+ {
+ 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
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+@@ -188,7 +188,7 @@ void CiftiScalarsMap::readXML2(XmlReader
+ {
+ 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
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+@@ -258,7 +258,7 @@ void CiftiScalarsMap::ScalarMap::readXML
+ {
+ 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::readXML
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+@@ -343,7 +343,7 @@ void CiftiScalarsMap::ScalarMap::readXML
+ {
+ 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::readXML
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+--- a/src/Cifti/CiftiSeriesMap.cxx
++++ b/src/Cifti/CiftiSeriesMap.cxx
+@@ -129,13 +129,13 @@ void CiftiSeriesMap::readXML1(XmlReader&
+ {
+ 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&
+ {
+ 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:
+--- 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& xm
+ {
+ 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& xm
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+@@ -510,7 +510,7 @@ void CiftiXML::parseCIFTI2(XmlReader& xm
+ {
+ 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& xm
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+@@ -598,7 +598,7 @@ void CiftiXML::parseMatrix1(XmlReader& x
+ }
+ 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& x
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+@@ -719,7 +719,7 @@ void CiftiXML::parseMatrix2(XmlReader& x
+ {
+ 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& x
+ }
+ break;
+ }
+- case XmlReader::EndElement:
++ case XmlReader::NodeType::EndElement:
+ done = true;
+ break;
+ default:
+--- 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:
+--- a/src/Cifti/MetaData.cxx
++++ b/src/Cifti/MetaData.cxx
+@@ -361,7 +361,7 @@ void MetaData::readCiftiXML1(XmlReader&
+ {
+ 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&
+ }
+ 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:
+--- a/src/Common/XmlAdapter.cxx
++++ b/src/Common/XmlAdapter.cxx
+@@ -81,7 +81,7 @@ XmlAttributesResult cifti::XmlReader_par
+ }
+ #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(Xm
+ 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
+ #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_readNextStartEleme
+ {
+ 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;
