Bas Couwenberg pushed to branch master 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 - - - - - c04822cd by Bas Couwenberg at 2025-04-05T13:47:08+02:00 Update upstream source from tag 'upstream/4.0.7+ds' Update to upstream version '4.0.7+ds' with Debian dir a612068619678ffd2b7f6675485d01e4257ae6a1 - - - - - 6f07a57d by Bas Couwenberg at 2025-04-05T13:47:22+02:00 New upstream release. - - - - - 1d706f83 by Bas Couwenberg at 2025-04-05T13:48:20+02:00 Set distribution to unstable. - - - - - 4 changed files: - CHANGELOG.md - debian/changelog - 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 ===================================== debian/changelog ===================================== @@ -1,9 +1,10 @@ -mapnik (4.0.6+ds-2) UNRELEASED; urgency=medium +mapnik (4.0.7+ds-1) unstable; urgency=medium + * New upstream release. * Bump Standards-Version to 4.7.2, no changes. * Fix old FSF address in copyright file. - -- Bas Couwenberg <[email protected]> Thu, 20 Mar 2025 06:10:35 +0100 + -- Bas Couwenberg <[email protected]> Sat, 05 Apr 2025 13:47:53 +0200 mapnik (4.0.6+ds-1) unstable; urgency=medium ===================================== 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/-/compare/5e2a7f3914aa51c4d017332b8117bba509e470a8...1d706f836e12a769daeae7abdfc80df426dda34e -- View it on GitLab: https://salsa.debian.org/debian-gis-team/mapnik/-/compare/5e2a7f3914aa51c4d017332b8117bba509e470a8...1d706f836e12a769daeae7abdfc80df426dda34e You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
