Bas Couwenberg pushed to branch master at Debian GIS Project / libapache2-mod-tile
Commits: 4e422af3 by Bas Couwenberg at 2024-06-17T08:28:18+02:00 Add patch to fix FTBFS with Mapnik 4.0.0. - - - - - 8787f804 by Bas Couwenberg at 2024-06-17T08:34:49+02:00 Set distribution to unstable. - - - - - 3 changed files: - debian/changelog - + debian/patches/mapnik-4.0.patch - + debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +libapache2-mod-tile (0.7.1-2) unstable; urgency=medium + + * Team upload. + * Add patch to fix FTBFS with Mapnik 4.0.0. + + -- Bas Couwenberg <[email protected]> Mon, 17 Jun 2024 08:34:37 +0200 + libapache2-mod-tile (0.7.1-1) unstable; urgency=medium * Team upload. ===================================== debian/patches/mapnik-4.0.patch ===================================== @@ -0,0 +1,26 @@ +Description: Fix FTBFS with Mapnik 4.0.0. +Author: Bas Couwenberg <[email protected]> +Forwarded: not-needed + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -48,7 +48,7 @@ find_package(LIBMEMCACHED) + find_package(LIBRADOS) + + if(LIBMAPNIK_VERSION STRGREATER_EQUAL "4") +- set(CMAKE_CXX_STANDARD 14) ++ set(CMAKE_CXX_STANDARD 17) + endif() + + # Programs +--- a/src/parameterize_style.cpp ++++ b/src/parameterize_style.cpp +@@ -72,7 +72,7 @@ static void parameterize_map_language(ma + mapnik::parameters params = l.datasource()->params(); + + if (params.find("table") != params.end()) { +- boost::optional<std::string> table = params.get<std::string>("table"); ++ auto table = params.get<std::string>("table"); + + if (table && table->find(",name") != std::string::npos) { + std::string str = *table; ===================================== debian/patches/series ===================================== @@ -0,0 +1 @@ +mapnik-4.0.patch View it on GitLab: https://salsa.debian.org/debian-gis-team/libapache2-mod-tile/-/compare/d324e794dbeaea561a13917319cef54c4e35cd4c...8787f804b1629d58bf3410085fe2287f11b498c3 -- This project does not include diff previews in email notifications. View it on GitLab: https://salsa.debian.org/debian-gis-team/libapache2-mod-tile/-/compare/d324e794dbeaea561a13917319cef54c4e35cd4c...8787f804b1629d58bf3410085fe2287f11b498c3 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
