Bas Couwenberg pushed to branch master at Debian GIS Project / tirex
Commits: f310c08a by Bas Couwenberg at 2024-06-17T08:01:51+02:00 Add patch to fix FTBFS with Mapnik 4.0. (closes: #1069109) - - - - - afa169d3 by Bas Couwenberg at 2024-06-17T08:04:38+02:00 Set distribution to unstable. - - - - - 4 changed files: - debian/changelog - debian/control - + debian/patches/mapnik-4.0.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +tirex (0.7.1-3) unstable; urgency=medium + + * Team upload. + * Add patch to fix FTBFS with Mapnik 4.0. + (closes: #1069109) + + -- Bas Couwenberg <[email protected]> Mon, 17 Jun 2024 08:04:22 +0200 + tirex (0.7.1-2) unstable; urgency=medium * Team upload. ===================================== debian/control ===================================== @@ -10,7 +10,7 @@ Build-Depends: architecture-is-64-bit, libboost-program-options-dev, libipc-sharelite-perl, libjson-perl, - libmapnik-dev + libmapnik-dev (>= 4.0.0) Standards-Version: 4.6.2 Vcs-Browser: https://salsa.debian.org/debian-gis-team/tirex Vcs-Git: https://salsa.debian.org/debian-gis-team/tirex.git ===================================== debian/patches/mapnik-4.0.patch ===================================== @@ -0,0 +1,28 @@ +Description: Use pkg-config for Mapnik 4.0.0. +Author: Bas Couwenberg <[email protected]> +Forwarded: https://github.com/openstreetmap/tirex/issues/60 + +--- a/backend-mapnik/Makefile ++++ b/backend-mapnik/Makefile +@@ -1,8 +1,7 @@ + INSTALLOPTS=-g root -o root +-CFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 +-CXXFLAGS = `mapnik-config --cflags` $(CFLAGS) ++CXXFLAGS += `pkg-config --cflags libmapnik` -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 + CXXFLAGS += -Wall -Wextra -pedantic -Wredundant-decls -Wdisabled-optimization -Wctor-dtor-privacy -Wnon-virtual-dtor -Woverloaded-virtual -Wsign-promo -Wold-style-cast +-LDFLAGS= `mapnik-config --libs --ldflags --dep-libs` ++LDFLAGS += `pkg-config --libs libmapnik` -lboost_filesystem + + backend-mapnik: renderd.o metatilehandler.o networklistener.o networkmessage.o networkrequest.o networkresponse.o debuggable.o requesthandler.o + $(CXX) -o $@ $^ $(LDFLAGS) +--- a/backend-mapnik/metatilehandler.cc ++++ b/backend-mapnik/metatilehandler.cc +@@ -25,7 +25,7 @@ + #include <mapnik/agg_renderer.hpp> + #include <mapnik/image_util.hpp> + #include <mapnik/load_map.hpp> +-#include <mapnik/box2d.hpp> ++#include <mapnik/geometry/box2d.hpp> + + #if MAPNIK_VERSION >= 300000 + # include <mapnik/datasource.hpp> ===================================== debian/patches/series ===================================== @@ -1 +1,2 @@ rules-requires-root.patch +mapnik-4.0.patch View it on GitLab: https://salsa.debian.org/debian-gis-team/tirex/-/compare/379af2e4fd71f37d2fbc724138fee0c3e61a102d...afa169d33c19c2a4c0a92319606bb9728f445368 -- This project does not include diff previews in email notifications. View it on GitLab: https://salsa.debian.org/debian-gis-team/tirex/-/compare/379af2e4fd71f37d2fbc724138fee0c3e61a102d...afa169d33c19c2a4c0a92319606bb9728f445368 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
