From 2bae37f19842c21a9ec2bd78f39f99223f780190 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Fri, 13 Jun 2025 22:25:03 +0100
Subject: Update to libxmlpp-5

---
 Jamroot.jam                 |  2 +-
 slicer/test/serializers.cpp | 11 +++++++++--
 slicer/xml/Jamfile.jam      |  2 ++
 slicer/xml/serializer.cpp   |  4 ++--
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/Jamroot.jam b/Jamroot.jam
index e9280eb..4c96f07 100644
--- a/Jamroot.jam
+++ b/Jamroot.jam
@@ -78,6 +78,6 @@ project slicer : requirements
 
 build-project slicer ;
 
-pkg-config.import libxmlpp : : <name>libxml++-3.0 ;
+pkg-config.import libxmlpp : : <name>libxml++-5.0 ;
 pkg-config.import glibmm : : <name>glibmm-2.4 ;
 
diff --git a/slicer/test/serializers.cpp b/slicer/test/serializers.cpp
index 525d68d..5e1aced 100644
--- a/slicer/test/serializers.cpp
+++ b/slicer/test/serializers.cpp
@@ -21,7 +21,14 @@
 #include <filesystem>
 #include <fstream>
 #include <functional>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wold-style-cast"
+#pragma GCC diagnostic ignored "-Wsign-conversion"
+#ifndef __clang__
+#	pragma GCC diagnostic ignored "-Wuseless-cast"
+#endif
 #include <glibmm/ustring.h>
+#pragma GCC diagnostic pop
 #include <json.h>
 #include <json/serializer.h>
 #include <jsonpp.h>
@@ -673,9 +680,9 @@ BOOST_AUTO_TEST_CASE(sequence_element_in_same_slice_link_bug)
 {
 	// Link error when sequence element type defined in same slice.
 	BOOST_CHECK_NO_THROW(
-			Slicer::ModelPart::Make<Slicer::ModelPartForSequence<TestModule::Classes>>(nullptr, [](auto &&) {}));
+			Slicer::ModelPart::Make<Slicer::ModelPartForSequence<TestModule::Classes>>(nullptr, [](auto &&) { }));
 	BOOST_CHECK_NO_THROW(
-			Slicer::ModelPart::Make<Slicer::ModelPartForSequence<TestModule::Dates>>(nullptr, [](auto &&) {}));
+			Slicer::ModelPart::Make<Slicer::ModelPartForSequence<TestModule::Dates>>(nullptr, [](auto &&) { }));
 }
 
 BOOST_AUTO_TEST_CASE(typeid_specifies_same)
diff --git a/slicer/xml/Jamfile.jam b/slicer/xml/Jamfile.jam
index 390b449..f157b9c 100644
--- a/slicer/xml/Jamfile.jam
+++ b/slicer/xml/Jamfile.jam
@@ -10,6 +10,7 @@ lib slicer-xml :
 	<library>stdc++fs
 	<library>..//Ice
 	<library>../..//libxmlpp
+	<library>../..//glibmm
 	<library>..//adhocutil
 	<library>../slicer//slicer
 	<implicit-dependency>../slicer//slicer
@@ -17,6 +18,7 @@ lib slicer-xml :
 	<dependency>../slicer//install-headers-local
 	: :
 	<library>../..//libxmlpp
+	<library>../..//glibmm
 	<implicit-dependency>xmlExceptions
 	;
 
diff --git a/slicer/xml/serializer.cpp b/slicer/xml/serializer.cpp
index 6c0fc27..6e86be8 100644
--- a/slicer/xml/serializer.cpp
+++ b/slicer/xml/serializer.cpp
@@ -326,7 +326,7 @@ namespace Slicer {
 								}
 								DocumentTreeIterateElement(element, smp, md);
 							},
-							element->get_name().raw(),
+							element->get_name(),
 							[](const auto & h) {
 								return h->GetMetadata().flagNotSet(md_attribute);
 							});
@@ -338,7 +338,7 @@ namespace Slicer {
 								smp->SetValue(XmlValueSource(attribute));
 								smp->Complete();
 							},
-							attribute->get_name().raw(),
+							attribute->get_name(),
 							[](const auto & h) {
 								return h->GetMetadata().flagSet(md_attribute);
 							});
-- 
cgit v1.2.3