[Git][debian-gis-team/mapnik][upstream] New upstream version 4.0.7+ds

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch upstream at Debian GIS Project / mapnik


Commits:
a1bf4852 by Bas Couwenberg at 2025-04-05T13:47:02+02:00
New upstream version 4.0.7+ds
- - - - -


3 changed files:

- CHANGELOG.md
- include/mapnik/version.hpp
- src/expression_node.cpp


Changes:

=====================================
CHANGELOG.md
=====================================
@@ -6,6 +6,18 @@ Developers: Please commit along with changes.
 
 For a complete change history, see the git log.
 
+## Mapnik 4.0.7
+
+Released April 5th, 2025
+
+(Packaged from [659bf720d](https://github.com/mapnik/mapnik/commit/659bf720d))
+
+- Upgrade SCons to v4.9.1
+- Fix to support clang/libc++ >= 19 (via @hummeltech)
+  https://github.com/mapnik/mapnik/pull/4500
+  https://github.com/mapnik/mapnik/issues/4499
+
+
 ## Mapnik 4.0.6
 
 Released March 2nd, 2025


=====================================
include/mapnik/version.hpp
=====================================
@@ -27,7 +27,7 @@
 
 #define MAPNIK_MAJOR_VERSION 4
 #define MAPNIK_MINOR_VERSION 0
-#define MAPNIK_PATCH_VERSION 6
+#define MAPNIK_PATCH_VERSION 7
 
 #define MAPNIK_VERSION MAPNIK_VERSION_ENCODE(MAPNIK_MAJOR_VERSION, MAPNIK_MINOR_VERSION, MAPNIK_PATCH_VERSION)
 


=====================================
src/expression_node.cpp
=====================================
@@ -38,10 +38,10 @@ MAPNIK_DISABLE_WARNING_POP
 namespace mapnik {
 
 #if defined(BOOST_REGEX_HAS_ICU)
-static void fromUTF32toUTF8(std::basic_string<UChar32> const& src, std::string& dst)
+static void fromUTF32toUTF8(boost::u32regex const& src, std::string& dst)
 {
-    int32_t len = safe_cast<int32_t>(src.length());
-    value_unicode_string::fromUTF32(src.data(), len).toUTF8String(dst);
+    std::int32_t size = safe_cast<std::int32_t>(src.size());
+    value_unicode_string::fromUTF32(src.expression(), size).toUTF8String(dst);
 }
 #endif
 
@@ -106,7 +106,7 @@ std::string regex_match_node::to_string() const
     str_ += ".match('";
     auto const& pattern = impl_.get()->pattern_;
 #if defined(BOOST_REGEX_HAS_ICU)
-    fromUTF32toUTF8(pattern.str(), str_);
+    fromUTF32toUTF8(pattern, str_);
 #else
     str_ += pattern.str();
 #endif
@@ -151,7 +151,7 @@ std::string regex_replace_node::to_string() const
     auto const& pattern = impl_.get()->pattern_;
     auto const& format = impl_.get()->format_;
 #if defined(BOOST_REGEX_HAS_ICU)
-    fromUTF32toUTF8(pattern.str(), str_);
+    fromUTF32toUTF8(pattern, str_);
     str_ += "','";
     format.toUTF8String(str_);
 #else



View it on GitLab: https://salsa.debian.org/debian-gis-team/mapnik/-/commit/a1bf48522dab714551829f4838327bc5bde7c11e

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapnik/-/commit/a1bf48522dab714551829f4838327bc5bde7c11e
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20250405/4a5eef82/attachment-0001.htm>