Antonio Rojas pushed to branch main at Arch Linux / Packaging / Packages /
mapnik
Commits:
f9f72322 by Antonio Rojas at 2023-08-31T21:12:06+02:00
upgpkg: 3.1.0-20: boost 1.83 rebuild
- - - - -
2 changed files:
- PKGBUILD
- + boost-1.83.patch
Changes:
=====================================
PKGBUILD
=====================================
@@ -5,7 +5,7 @@
pkgname=mapnik
pkgver=3.1.0
-pkgrel=19
+pkgrel=20
pkgdesc="Free Toolkit for developing mapping applications and rendering
beautiful maps"
arch=('x86_64')
url="https://mapnik.org/";
@@ -16,11 +16,13 @@ makedepends=('boost' 'scons')
source=(https://github.com/$pkgname/$pkgname/releases/download/v$pkgver/$pkgname-v$pkgver.tar.bz2
boost-1.80.patch
scons4.patch
- gcc-13.patch)
+ gcc-13.patch
+ boost-1.83.patch)
sha256sums=('43d76182d2a975212b4ad11524c74e577576c11039fdab5286b828397d8e6261'
'b80085fba71ea6ecd86ff98ebdf652490bf56507cb798076192ab3ce136f5eeb'
'79a85ddba3ec17b86cb216e21442611498a9f2612f03e98708057b3c3a6e8b06'
- '84ddba271d74fd4ed1d26501789c50c5e6bda509c238986eb69f96b10cf1465a')
+ '84ddba271d74fd4ed1d26501789c50c5e6bda509c238986eb69f96b10cf1465a'
+ '356271f4550c2b370ae48bbce9cebb58c5803507f2b14bc8e84f3813871d0645')
prepare() {
cd "${srcdir}"/$pkgname-v$pkgver
@@ -31,6 +33,9 @@ prepare() {
# Fix build with GCC 13
patch -p1 -i ../gcc-13.patch
+
+ # Fix build with boost 1.83
+ patch -p1 -i ../boost-1.83.patch
}
build() {
=====================================
boost-1.83.patch
=====================================
@@ -0,0 +1,48 @@
+diff --git a/include/mapnik/geometry/boost_spirit_karma_adapter.hpp
b/include/mapnik/geometry/boost_spirit_karma_adapter.hpp
+index a146ef1d1..bfdf00d7f 100644
+--- a/include/mapnik/geometry/boost_spirit_karma_adapter.hpp
++++ b/include/mapnik/geometry/boost_spirit_karma_adapter.hpp
+@@ -25,6 +25,7 @@
+ #define MAPNIK_BOOST_SPIRIT_KARMA_ADAPTER_HPP
+
+ #include <mapnik/geometry.hpp>
++#include <cstdint>
+
+ namespace boost { using mapbox::util::get; }
+
+diff --git a/include/mapnik/geometry_fusion_adapted.hpp
b/include/mapnik/geometry_fusion_adapted.hpp
+index 66869891a..c4b4cae13 100644
+--- a/include/mapnik/geometry_fusion_adapted.hpp
++++ b/include/mapnik/geometry_fusion_adapted.hpp
+@@ -26,6 +26,7 @@
+
+ #include <mapnik/geometry.hpp>
+ #include <boost/fusion/include/adapt_struct.hpp>
++#include <cstdint>
+
+ BOOST_FUSION_ADAPT_STRUCT(
+ mapnik::geometry::point<double>,
+diff --git a/include/mapnik/json/generic_json.hpp
b/include/mapnik/json/generic_json.hpp
+index 0c4662304..b81a742c7 100644
+--- 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>
+diff --git a/plugins/input/csv/csv_utils.cpp b/plugins/input/csv/csv_utils.cpp
+index 916b17e01..227ee2c9b 100644
+--- a/plugins/input/csv/csv_utils.cpp
++++ b/plugins/input/csv/csv_utils.cpp
+@@ -32,6 +32,7 @@
+ // csv grammar
+ #include <mapnik/csv/csv_grammar_impl.hpp>
+ //
++#include <boost/algorithm/string/trim.hpp>
+ #include "csv_getline.hpp"
+ #include "csv_utils.hpp"
+
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/mapnik/-/commit/f9f723222c0af50e4db747e7c4e8138dbc769f53
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/mapnik/-/commit/f9f723222c0af50e4db747e7c4e8138dbc769f53
You're receiving this email because of your account on gitlab.archlinux.org.
