From 043555bce6b7481517cfd5ac2cffa4af97e4c2a1 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Thu, 7 Aug 2025 20:49:13 +0100
Subject: Update to glibmm-2.68

---
 Jamroot.jam                                                 | 2 +-
 gentoobrowse-api/service/depend.cpp                         | 5 +++--
 gentoobrowse-api/service/maintenance/updatesProcessor.cpp   | 4 ++--
 gentoobrowse-api/service/maintenance/useGlobalProcessor.cpp | 3 +--
 gentoobrowse-api/service/maintenance/useGroupProcessor.cpp  | 3 +--
 gentoobrowse-api/service/maintenance/useLocalProcessor.cpp  | 4 ++--
 6 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Jamroot.jam b/Jamroot.jam
index dd2c8e9..c3877ef 100644
--- a/Jamroot.jam
+++ b/Jamroot.jam
@@ -86,5 +86,5 @@ project gentoobrowse-api : requirements
 build-project gentoobrowse-api ;
 
 pkg-config.import libxmlpp : : <name>libxml++-5.0 ;
-pkg-config.import glibmm : : <name>glibmm-2.4 ;
+pkg-config.import glibmm : : <name>glibmm-2.68 ;
 
diff --git a/gentoobrowse-api/service/depend.cpp b/gentoobrowse-api/service/depend.cpp
index 179eea0..28983d2 100644
--- a/gentoobrowse-api/service/depend.cpp
+++ b/gentoobrowse-api/service/depend.cpp
@@ -7,6 +7,7 @@
 #include <lexer-regex.h>
 #include <memory>
 #include <optional>
+#include <ranges>
 #include <string>
 
 namespace Portage::Utils {
@@ -45,8 +46,8 @@ namespace Portage::Utils {
 	{
 		std::vector<T> rtn;
 		if (x) {
-			Glib::Regex::split_simple(",", *x).assign_to(rtn);
-			std::sort(rtn.begin(), rtn.end());
+			std::ranges::copy(Glib::Regex::split_simple(",", *x), std::back_inserter(rtn));
+			std::ranges::sort(rtn);
 		}
 		return rtn;
 	}
diff --git a/gentoobrowse-api/service/maintenance/updatesProcessor.cpp b/gentoobrowse-api/service/maintenance/updatesProcessor.cpp
index 9e4a536..2d49bdb 100644
--- a/gentoobrowse-api/service/maintenance/updatesProcessor.cpp
+++ b/gentoobrowse-api/service/maintenance/updatesProcessor.cpp
@@ -34,8 +34,8 @@ namespace Glib {
 using namespace AdHoc::FileUtils;
 
 namespace Gentoo::Service {
-	static Glib::RefPtr<Glib::Regex> move
-			= Glib::Regex::create(R"R(^move ([^/]+)/([^ ]+) ([^/]+)/(.+)$)R", Glib::RegexCompileFlags::REGEX_MULTILINE);
+	static auto move
+			= Glib::Regex::create(R"R(^move ([^/]+)/([^ ]+) ([^/]+)/(.+)$)R", Glib::Regex::CompileFlags::MULTILINE);
 
 	unsigned char
 	UpdatesProcessor::phase() const
diff --git a/gentoobrowse-api/service/maintenance/useGlobalProcessor.cpp b/gentoobrowse-api/service/maintenance/useGlobalProcessor.cpp
index 811cd87..7dfe5be 100644
--- a/gentoobrowse-api/service/maintenance/useGlobalProcessor.cpp
+++ b/gentoobrowse-api/service/maintenance/useGlobalProcessor.cpp
@@ -20,8 +20,7 @@ namespace Glib {
 using namespace AdHoc::FileUtils;
 
 namespace Gentoo::Service {
-	static Glib::RefPtr<Glib::Regex> useDesc
-			= Glib::Regex::create(R"(^([^#\s][^ ]*)\s+-\s+(.*)$)", Glib::RegexCompileFlags::REGEX_MULTILINE);
+	static auto useDesc = Glib::Regex::create(R"(^([^#\s][^ ]*)\s+-\s+(.*)$)", Glib::Regex::CompileFlags::MULTILINE);
 
 	unsigned char
 	UseGlobalProcessor::phase() const
diff --git a/gentoobrowse-api/service/maintenance/useGroupProcessor.cpp b/gentoobrowse-api/service/maintenance/useGroupProcessor.cpp
index 5d25a21..77e0ba3 100644
--- a/gentoobrowse-api/service/maintenance/useGroupProcessor.cpp
+++ b/gentoobrowse-api/service/maintenance/useGroupProcessor.cpp
@@ -28,8 +28,7 @@ namespace Glib {
 namespace U = Gentoo::Utils;
 
 namespace Gentoo::Service {
-	static Glib::RefPtr<Glib::Regex> useDesc
-			= Glib::Regex::create(R"(^([^#\s][^ ]*)\s+-\s+(.*)$)", Glib::RegexCompileFlags::REGEX_MULTILINE);
+	static auto useDesc = Glib::Regex::create(R"(^([^#\s][^ ]*)\s+-\s+(.*)$)", Glib::Regex::CompileFlags::MULTILINE);
 
 	unsigned char
 	UseGroupProcessor::phase() const
diff --git a/gentoobrowse-api/service/maintenance/useLocalProcessor.cpp b/gentoobrowse-api/service/maintenance/useLocalProcessor.cpp
index 17fead6..eabe4c0 100644
--- a/gentoobrowse-api/service/maintenance/useLocalProcessor.cpp
+++ b/gentoobrowse-api/service/maintenance/useLocalProcessor.cpp
@@ -24,8 +24,8 @@ namespace Glib {
 using namespace AdHoc::FileUtils;
 
 namespace Gentoo::Service {
-	static Glib::RefPtr<Glib::Regex> useDesc = Glib::Regex::create(
-			R"(^([^#\s][^/]*)/([^:]+):([^ ]+)\s+-\s+(.*)$)", Glib::RegexCompileFlags::REGEX_MULTILINE);
+	static auto useDesc = Glib::Regex::create(
+			R"(^([^#\s][^/]*)/([^:]+):([^ ]+)\s+-\s+(.*)$)", Glib::Regex::CompileFlags::MULTILINE);
 
 	unsigned char
 	UseLocalProcessor::phase() const
-- 
cgit v1.2.3