Source: tirex Version: 0.7.1-1 Severity: important Tags: ftbfs upstream patch User: debian-...@lists.debian.org
Dear Maintainer, Your package FBTFS with Mapnik 4.0.0. pkg-config needs to be used instead of mapnik-config and some includes got moved. Kind Regards, Bas
diff -Nru tirex-0.7.1/debian/control tirex-0.7.1/debian/control --- tirex-0.7.1/debian/control 2023-11-03 17:20:43.000000000 +0100 +++ tirex-0.7.1/debian/control 2024-04-16 13:34:13.000000000 +0200 @@ -9,7 +9,7 @@ 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 diff -Nru tirex-0.7.1/debian/patches/mapnik-4.0.patch tirex-0.7.1/debian/patches/mapnik-4.0.patch --- tirex-0.7.1/debian/patches/mapnik-4.0.patch 1970-01-01 01:00:00.000000000 +0100 +++ tirex-0.7.1/debian/patches/mapnik-4.0.patch 2024-04-16 13:34:13.000000000 +0200 @@ -0,0 +1,27 @@ +Description: Use pkg-config for Mapnik 4.0.0. +Author: Bas Couwenberg <sebas...@debian.org> + +--- 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> diff -Nru tirex-0.7.1/debian/patches/series tirex-0.7.1/debian/patches/series --- tirex-0.7.1/debian/patches/series 2024-02-28 13:15:07.000000000 +0100 +++ tirex-0.7.1/debian/patches/series 2024-04-16 13:34:13.000000000 +0200 @@ -1 +1,2 @@ rules-requires-root.patch +mapnik-4.0.patch