Quilt + git patch for building mod_tile against libiniparser1
Hi ,
As per previous E-Mail , I suggest this patch to build mod_tile against
libiniparser1 which is delivered by Debian and not the hardcoded version in
upstream source code.
>From e6fa722b99899d6b03cd3d2da9d51dbee1e31968 Mon Sep 17 00:00:00 2001
From: Boris Shtrasman <boris@example.com>
Date: Thu, 18 Jul 2019 20:07:05 +0300
Subject: [PATCH] build source against libiniparser1
---
debian/control | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/debian/control b/debian/control
index 07627af..1b30af3 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,8 @@ Build-Depends: debhelper (>= 9),
apache2-dev,
libcairo2-dev,
libcurl4-gnutls-dev | libcurl-ssl-dev,
- libmapnik-dev | libmapnik2-dev
+ libmapnik-dev | libmapnik2-dev,
+ libiniparser-dev
Standards-Version: 4.4.0
Vcs-Browser: https://salsa.debian.org/debian-gis-team/libapache2-mod-tile
Vcs-Git: https://salsa.debian.org/debian-gis-team/libapache2-mod-tile.git
@@ -44,7 +45,8 @@ Package: renderd
Architecture: any
Section: utils
Depends: ${shlibs:Depends},
- ${misc:Depends}
+ ${misc:Depends},
+ libiniparser1
Recommends: osm2pgsql,
openstreetmap-carto | openstreetmap-mapnik-stylesheet-data | openstreetmap-mapnik-carto-stylesheet-data
Suggests: libapache2-mod-tile
--
2.20.1
build_with_libiniparser.patch
Build mod_tile with Debian delivered package
Index: libapache2-mod-tile/configure.ac
===================================================================
--- libapache2-mod-tile.orig/configure.ac 2019-07-18 19:52:02.146553156 +0300
+++ libapache2-mod-tile/configure.ac 2019-07-18 19:55:07.088907131 +0300
@@ -75,7 +75,7 @@
fi
AC_SEARCH_LIBS([iniparser_load], [iniparser], [
- AC_CHECK_HEADERS([iniparser.h], [have_system_iniparser=yes])
+ AC_CHECK_HEADERS([iniparser/iniparser.h], [have_system_iniparser=yes])
])
AM_CONDITIONAL([SYSTEM_LIBINIPARSER], [test "x$have_system_iniparser" = "xyes"])
if test "x$have_system_iniparser" = "xyes"; then
Index: libapache2-mod-tile/src/daemon.c
===================================================================
--- libapache2-mod-tile.orig/src/daemon.c 2019-07-18 19:52:02.150553211 +0300
+++ libapache2-mod-tile/src/daemon.c 2019-07-18 19:57:06.162242092 +0300
@@ -29,7 +29,7 @@
#define PIDFILE "/var/run/renderd/renderd.pid"
#if SYSTEM_LIBINIPARSER
-#include <iniparser.h>
+#include <iniparser/iniparser.h>
#else
// extern "C" {
#include "iniparser3.0b/src/iniparser.h"
Reply to: