[Git][debian-gis-team/mapnik][master] 3 commits: Rebuild with Boost 1.83.0.

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch master at Debian GIS Project / mapnik


Commits:
71459cc4 by Bas Couwenberg at 2023-11-16T18:42:42+01:00
Rebuild with Boost 1.83.0.

- - - - -
bf8b3cbf by Bas Couwenberg at 2023-11-16T18:47:47+01:00
Add patch to fix Boost 1.81 compatibility.

- - - - -
9ac4a9cc by Bas Couwenberg at 2023-11-16T19:03:56+01:00
Add patches to fix Boost 1.83 compatibility. (closes: #1056024)

- - - - -


6 changed files:

- debian/changelog
- debian/control
- + debian/patches/boost-1.81.patch
- + debian/patches/boost-1.83-1.patch
- + debian/patches/boost-1.83-2.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -4,6 +4,10 @@ mapnik (3.1.0+ds-5) UNRELEASED; urgency=medium
     (closes: #1046672)
   * Use execute_after instead of override in rules file.
   * Enable Salsa CI.
+  * Rebuild with Boost 1.83.0.
+  * Add patch to fix Boost 1.81 compatibility.
+  * Add patches to fix Boost 1.83 compatibility.
+    (closes: #1056024)
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 12 Aug 2023 21:21:41 +0200
 


=====================================
debian/control
=====================================
@@ -7,11 +7,11 @@ Uploaders: David Paleino <dapal at debian.org>,
 Section: libs
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
-               libboost-filesystem-dev,
-               libboost-program-options-dev,
-               libboost-regex-dev,
-               libboost-system-dev,
-               libboost-thread-dev,
+               libboost-filesystem-dev (>= 1.83.0),
+               libboost-program-options-dev (>= 1.83.0),
+               libboost-regex-dev (>= 1.83.0),
+               libboost-system-dev (>= 1.83.0),
+               libboost-thread-dev (>= 1.83.0),
                libcairo-dev,
                libcurl4-gnutls-dev | libcurl-ssl-dev,
                libfreetype-dev,


=====================================
debian/patches/boost-1.81.patch
=====================================
@@ -0,0 +1,15 @@
+Description: Fix FTBFS with Boost 1.81.
+Author: Tom Hughes <tom at compton.nu>
+Origin: https://src.fedoraproject.org/rpms/mapnik/c/7076c88d5b6437a12966c5f34299f4940d8d3a18
+Bug: https://github.com/boostorg/phoenix/issues/115
+
+--- a/SConstruct
++++ b/SConstruct
+@@ -1953,6 +1953,7 @@ if not preconfigured:
+         # http://www.boost.org/doc/libs/1_47_0/libs/spirit/doc/html/spirit/what_s_new/spirit_2_5.html#spirit.what_s_new.spirit_2_5.breaking_changes
+         env.Append(CPPDEFINES = '-DBOOST_SPIRIT_NO_PREDEFINED_TERMINALS=1')
+         env.Append(CPPDEFINES = '-DBOOST_PHOENIX_NO_PREDEFINED_TERMINALS=1')
++        env.Append(CPPDEFINES = '-DBOOST_PHOENIX_STL_TUPLE_H_')
+         # c++11 support / https://github.com/mapnik/mapnik/issues/1683
+         #  - upgrade to PHOENIX_V3 since that is needed for c++11 compile
+         env.Append(CPPDEFINES = '-DBOOST_SPIRIT_USE_PHOENIX_V3=1')


=====================================
debian/patches/boost-1.83-1.patch
=====================================
@@ -0,0 +1,17 @@
+Description: `boost/algorithm/string/trim.hpp` is needed for `trim_if'.
+Author: Artem Pavlenko <artem at mapnik.org>
+Origin: https://github.com/mapnik/mapnik/commit/50f1b05f863ab7060558d91a7d9521d849f29df3
+Forwarded: not-needed
+
+--- a/plugins/input/csv/csv_utils.cpp
++++ b/plugins/input/csv/csv_utils.cpp
+@@ -40,6 +40,9 @@
+ #include <cstdio>
+ #include <algorithm>
+ 
++// boost string algo
++#include <boost/algorithm/string/trim.hpp>
++
+ namespace csv_utils {
+ namespace detail {
+ 


=====================================
debian/patches/boost-1.83-2.patch
=====================================
@@ -0,0 +1,15 @@
+Description: Add support for building with Boost 1.83
+From: arojas <arojas at example.com>
+Origin: https://github.com/mapnik/mapnik/commit/3300b67b0ce048725cc4fcd99d19e12fbf5fe397
+Bug: https://github.com/mapnik/mapnik/pull/4413
+
+--- a/include/mapnik/json/generic_json.hpp
++++ b/include/mapnik/json/generic_json.hpp
+@@ -32,6 +32,7 @@
+ #include <boost/spirit/include/qi.hpp>
+ #include <boost/spirit/include/phoenix.hpp>
+ #include <boost/fusion/include/std_pair.hpp>
++#include <boost/regex/pending/unicode_iterator.hpp>
+ #pragma GCC diagnostic pop
+ 
+ #include <vector>


=====================================
debian/patches/series
=====================================
@@ -2,3 +2,6 @@ libxml2.patch
 Stop-using-custom-OrderedDict.patch
 proj.patch
 gcc-13.patch
+boost-1.81.patch
+boost-1.83-1.patch
+boost-1.83-2.patch



View it on GitLab: https://salsa.debian.org/debian-gis-team/mapnik/-/compare/15a9a4ea63d499579514c218510c9f0a499d8465...9ac4a9cc9759d3aa69622bc7a88c5c7b784d6c12

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapnik/-/compare/15a9a4ea63d499579514c218510c9f0a499d8465...9ac4a9cc9759d3aa69622bc7a88c5c7b784d6c12
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20231116/706ba519/attachment-0001.htm>