mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-26 12:45:20 +03:00
testing/mapnik: upgrade to 4.0.6
This commit is contained in:
Natanael Copa
parent
fb832c98c7
commit
c968d05625
7 changed files with 3 additions and 257 deletions
|
|
@ -1,8 +1,8 @@
|
||||||
# Contributor: Markus Juenemann <markus@juenemann.net>
|
# Contributor: Markus Juenemann <markus@juenemann.net>
|
||||||
maintainer="Markus Juenemann <markus@juenemann.net>"
|
maintainer="Markus Juenemann <markus@juenemann.net>"
|
||||||
pkgname=mapnik
|
pkgname=mapnik
|
||||||
pkgver=3.1.0
|
pkgver=4.0.6
|
||||||
pkgrel=30
|
pkgrel=0
|
||||||
pkgdesc="An open source toolkit for developing mapping applications"
|
pkgdesc="An open source toolkit for developing mapping applications"
|
||||||
url="https://mapnik.org/"
|
url="https://mapnik.org/"
|
||||||
arch="all"
|
arch="all"
|
||||||
|
|
@ -28,12 +28,7 @@ makedepends="
|
||||||
"
|
"
|
||||||
subpackages="$pkgname-dev $pkgname-doc"
|
subpackages="$pkgname-dev $pkgname-doc"
|
||||||
source="https://github.com/mapnik/mapnik/releases/download/v$pkgver/mapnik-v$pkgver.tar.bz2
|
source="https://github.com/mapnik/mapnik/releases/download/v$pkgver/mapnik-v$pkgver.tar.bz2
|
||||||
boost-1.77.patch
|
|
||||||
gcc13.patch
|
gcc13.patch
|
||||||
scons4.patch
|
|
||||||
libxml2.patch
|
|
||||||
boost-1.83.patch
|
|
||||||
gcc14.patch
|
|
||||||
"
|
"
|
||||||
builddir="$srcdir/$pkgname-v$pkgver"
|
builddir="$srcdir/$pkgname-v$pkgver"
|
||||||
options="!check" # fail to build
|
options="!check" # fail to build
|
||||||
|
|
@ -74,11 +69,6 @@ doc() {
|
||||||
}
|
}
|
||||||
|
|
||||||
sha512sums="
|
sha512sums="
|
||||||
089e619f4672e017b1aaf31836ade7e22d2a465f5a923f697935d8447d5dd0c2acb9ae6682d1c9035e58036c62685c2f38f75f0a106ee9b4ce6197e0357c47eb mapnik-v3.1.0.tar.bz2
|
94c92c5cf34a42f495dd115f75871f13fc6b43547e1e597d8e9b12e0b92d54705e0625c909f39cb21e163e78daef746d868d88b0743bb97e63b7107d25a93b15 mapnik-v4.0.6.tar.bz2
|
||||||
b5961faf1bf903fca0d92408f4b9a783e61b5c06e89c9318aa7f59c6ca98be922504909ae7cf59dd09e953378952f7af3335f3f71cb1ff9f5a8a8c8f7c729f6d boost-1.77.patch
|
|
||||||
b9de94825d5c9934adcfd451b1fada42d17d9b79345649c19d9d1b3db333309086b7de711e9fb44038a3ba992c27d520f6a5a66f656c267f9e8d286ad2bec920 gcc13.patch
|
b9de94825d5c9934adcfd451b1fada42d17d9b79345649c19d9d1b3db333309086b7de711e9fb44038a3ba992c27d520f6a5a66f656c267f9e8d286ad2bec920 gcc13.patch
|
||||||
e0c60c696b9d195ad0e430c8c4fb9c36465d9635fae3e4a8b25dca4b421d90330994285c92dfcefe929a196ff87345da278a564d8fa9f3ac29a46d9e2dfa3110 scons4.patch
|
|
||||||
1333cb498f5c617ad9179f7920869c91d81f2905a97f1b3e230c486f996cfc012a44fa83863d70a30b8c29f950a16e61fd4cbbf9fc71c82bf89fa672b863aa19 libxml2.patch
|
|
||||||
9f4def2f41932c6e80c0ace4b9d80744bdd51e9dff71ec13328b220fb445739c0633e1a313d70c26f591aaeadfc0304b8544cc49b0dc8b836707c4d4b9079c74 boost-1.83.patch
|
|
||||||
969ce67ceecf904130180460be7a3f4966dbfaa9d1f5acaa57fbaffb65d38758a353fff65faddab41c8e7801e04297a719e6cb179960cd535571bc1e728b396f gcc14.patch
|
|
||||||
"
|
"
|
||||||
|
|
|
||||||
|
|
@ -1,48 +0,0 @@
|
||||||
From 737e7a69c2679b33093e1ebf0b4c3fa34ae36878 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Artem Pavlenko <artem@mapnik.org>
|
|
||||||
Date: Wed, 1 Sep 2021 10:11:13 +0100
|
|
||||||
Subject: [PATCH] Add includes required for building with boost_1_77
|
|
||||||
(https://github.com/boostorg/geometry/commit/46e3d9231c2353b323796b6423f13cd61e0d585c#diff-2eb9871858184271f07935b31093c2d9f70f7a219979bec85adc03db6721a182)
|
|
||||||
|
|
||||||
---
|
|
||||||
plugins/input/csv/csv_datasource.hpp | 1 +
|
|
||||||
plugins/input/geojson/geojson_datasource.hpp | 1 +
|
|
||||||
plugins/input/topojson/topojson_datasource.hpp | 1 +
|
|
||||||
4 files changed, 4 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/plugins/input/csv/csv_datasource.hpp b/plugins/input/csv/csv_datasource.hpp
|
|
||||||
index 13b876b3a9..a81d308e28 100644
|
|
||||||
--- a/plugins/input/csv/csv_datasource.hpp
|
|
||||||
+++ b/plugins/input/csv/csv_datasource.hpp
|
|
||||||
@@ -39,6 +39,7 @@ MAPNIK_DISABLE_WARNING_PUSH
|
|
||||||
#include <mapnik/warning_ignore.hpp>
|
|
||||||
#include <boost/optional.hpp>
|
|
||||||
#include <boost/version.hpp>
|
|
||||||
+#include <boost/geometry/strategies/cartesian/disjoint_box_box.hpp>
|
|
||||||
#include <boost/geometry/index/rtree.hpp>
|
|
||||||
MAPNIK_DISABLE_WARNING_POP
|
|
||||||
|
|
||||||
diff --git a/plugins/input/geojson/geojson_datasource.hpp b/plugins/input/geojson/geojson_datasource.hpp
|
|
||||||
index 88ef28b34e..4bb965f3cb 100644
|
|
||||||
--- a/plugins/input/geojson/geojson_datasource.hpp
|
|
||||||
+++ b/plugins/input/geojson/geojson_datasource.hpp
|
|
||||||
@@ -38,6 +38,7 @@ MAPNIK_DISABLE_WARNING_PUSH
|
|
||||||
#include <mapnik/warning_ignore.hpp>
|
|
||||||
#include <boost/optional.hpp>
|
|
||||||
#include <boost/version.hpp>
|
|
||||||
+#include <boost/geometry/strategies/cartesian/disjoint_box_box.hpp>
|
|
||||||
#include <boost/geometry/index/rtree.hpp>
|
|
||||||
MAPNIK_DISABLE_WARNING_POP
|
|
||||||
|
|
||||||
diff --git a/plugins/input/topojson/topojson_datasource.hpp b/plugins/input/topojson/topojson_datasource.hpp
|
|
||||||
index a603804b36..0c0937899e 100644
|
|
||||||
--- a/plugins/input/topojson/topojson_datasource.hpp
|
|
||||||
+++ b/plugins/input/topojson/topojson_datasource.hpp
|
|
||||||
@@ -41,6 +41,7 @@ MAPNIK_DISABLE_WARNING_PUSH
|
|
||||||
#include <boost/geometry/geometries/geometries.hpp>
|
|
||||||
#include <boost/geometry.hpp>
|
|
||||||
#include <boost/version.hpp>
|
|
||||||
+#include <boost/geometry/strategies/cartesian/disjoint_box_box.hpp>
|
|
||||||
#include <boost/geometry/index/rtree.hpp>
|
|
||||||
MAPNIK_DISABLE_WARNING_POP
|
|
||||||
|
|
||||||
|
|
@ -1,53 +0,0 @@
|
||||||
Author: Antonio Rojas
|
|
||||||
Summary: fixes for boost 1.83
|
|
||||||
URL: https://gitlab.archlinux.org/archlinux/packaging/packages/mapnik/-/blob/f9f723222c0af50e4db747e7c4e8138dbc769f53/boost-1.83.patch
|
|
||||||
----
|
|
||||||
|
|
||||||
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"
|
|
||||||
|
|
||||||
|
|
@ -1,12 +0,0 @@
|
||||||
diff --git a/include/mapnik/wkb.hpp b/include/mapnik/wkb.hpp
|
|
||||||
index fc32a9f..482496a 100644
|
|
||||||
--- a/include/mapnik/wkb.hpp
|
|
||||||
+++ b/include/mapnik/wkb.hpp
|
|
||||||
@@ -27,6 +27,7 @@
|
|
||||||
#include <mapnik/config.hpp>
|
|
||||||
#include <mapnik/geometry.hpp>
|
|
||||||
#include <mapnik/util/noncopyable.hpp>
|
|
||||||
+#include <cstdint>
|
|
||||||
|
|
||||||
namespace mapnik
|
|
||||||
{
|
|
||||||
|
|
@ -1,81 +0,0 @@
|
||||||
commit 544fda0a238c786e565e09dd7ff9e9917c29aaf6
|
|
||||||
Author: Tom Hughes <tom@compton.nu>
|
|
||||||
Date: Thu Jan 18 20:19:20 2024 +0000
|
|
||||||
|
|
||||||
Fix gcc 14 build issues
|
|
||||||
|
|
||||||
diff --git a/include/mapnik/geometry/boost_spirit_karma_adapter.hpp b/include/mapnik/geometry/boost_spirit_karma_adapter.hpp
|
|
||||||
index a146ef1d1..318613b15 100644
|
|
||||||
--- a/include/mapnik/geometry/boost_spirit_karma_adapter.hpp
|
|
||||||
+++ b/include/mapnik/geometry/boost_spirit_karma_adapter.hpp
|
|
||||||
@@ -26,6 +26,8 @@
|
|
||||||
|
|
||||||
#include <mapnik/geometry.hpp>
|
|
||||||
|
|
||||||
+#include <cstdint>
|
|
||||||
+
|
|
||||||
namespace boost { using mapbox::util::get; }
|
|
||||||
|
|
||||||
#include <boost/spirit/home/karma/domain.hpp>
|
|
||||||
diff --git a/include/mapnik/geometry_fusion_adapted.hpp b/include/mapnik/geometry_fusion_adapted.hpp
|
|
||||||
index 66869891a..eafc9dee2 100644
|
|
||||||
--- a/include/mapnik/geometry_fusion_adapted.hpp
|
|
||||||
+++ b/include/mapnik/geometry_fusion_adapted.hpp
|
|
||||||
@@ -27,6 +27,8 @@
|
|
||||||
#include <mapnik/geometry.hpp>
|
|
||||||
#include <boost/fusion/include/adapt_struct.hpp>
|
|
||||||
|
|
||||||
+#include <cstdint>
|
|
||||||
+
|
|
||||||
BOOST_FUSION_ADAPT_STRUCT(
|
|
||||||
mapnik::geometry::point<double>,
|
|
||||||
(double, x)
|
|
||||||
diff --git a/include/mapnik/grid/grid_view.hpp b/include/mapnik/grid/grid_view.hpp
|
|
||||||
index b26001774..106fc708f 100644
|
|
||||||
--- a/include/mapnik/grid/grid_view.hpp
|
|
||||||
+++ b/include/mapnik/grid/grid_view.hpp
|
|
||||||
@@ -92,22 +92,6 @@ public:
|
|
||||||
features_(rhs.features_)
|
|
||||||
{}
|
|
||||||
|
|
||||||
- hit_grid_view<T> & operator=(hit_grid_view<T> const& rhs)
|
|
||||||
- {
|
|
||||||
- if (&rhs==this) return *this;
|
|
||||||
- x_ = rhs.x_;
|
|
||||||
- y_ = rhs.y_;
|
|
||||||
- width_ = rhs.width_;
|
|
||||||
- height_ = rhs.height_;
|
|
||||||
- data_ = rhs.data_;
|
|
||||||
- key_ = rhs.key_;
|
|
||||||
- id_name_ = rhs.id_name_;
|
|
||||||
- names_ = rhs.names_;
|
|
||||||
- f_keys_ = rhs.f_keys_;
|
|
||||||
- features_ = rhs.features_;
|
|
||||||
- return *this;
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
inline unsigned x() const
|
|
||||||
{
|
|
||||||
return x_;
|
|
||||||
diff --git a/include/mapnik/util/singleton.hpp b/include/mapnik/util/singleton.hpp
|
|
||||||
index 0736e0961..691d19283 100644
|
|
||||||
--- a/include/mapnik/util/singleton.hpp
|
|
||||||
+++ b/include/mapnik/util/singleton.hpp
|
|
||||||
@@ -40,7 +40,7 @@ namespace mapnik
|
|
||||||
{
|
|
||||||
|
|
||||||
template <typename T>
|
|
||||||
-class CreateUsingNew
|
|
||||||
+class MAPNIK_DECL CreateUsingNew
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
static T* create()
|
|
||||||
@@ -54,7 +54,7 @@ public:
|
|
||||||
};
|
|
||||||
|
|
||||||
template <typename T>
|
|
||||||
-class CreateStatic
|
|
||||||
+class MAPNIK_DECL CreateStatic
|
|
||||||
{
|
|
||||||
private:
|
|
||||||
using storage_type = typename std::aligned_storage<sizeof(T), alignof(T)>::type;
|
|
||||||
|
|
@ -1,39 +0,0 @@
|
||||||
From 8cdca5f5be97b9fb4de95e0214197f879e6fcfb7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: David Hummel <6109326+hummeltech@users.noreply.github.com>
|
|
||||||
Date: Mon, 20 Nov 2023 10:21:12 -0700
|
|
||||||
Subject: [PATCH] Fix broken builds with libxml2 >= v2.12.0
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
**I.E.**
|
|
||||||
```
|
|
||||||
src/libxml2_loader.cpp:91:50: error: invalid conversion from ‘const xmlError*’ {aka ‘const _xmlError*’} to ‘xmlError*’ {aka ‘_xmlError*’} [-fpermissive]
|
|
||||||
src/libxml2_loader.cpp:131:50: error: invalid conversion from ‘const xmlError*’ {aka ‘const _xmlError*’} to ‘xmlError*’ {aka ‘_xmlError*’} [-fpermissive]
|
|
||||||
```
|
|
||||||
---
|
|
||||||
src/libxml2_loader.cpp | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/libxml2_loader.cpp b/src/libxml2_loader.cpp
|
|
||||||
index 223d8df447..78dc8aa978 100644
|
|
||||||
--- a/src/libxml2_loader.cpp
|
|
||||||
+++ b/src/libxml2_loader.cpp
|
|
||||||
@@ -79,7 +79,7 @@ class libxml2_loader : util::noncopyable
|
|
||||||
|
|
||||||
if (!doc)
|
|
||||||
{
|
|
||||||
- xmlError * error = xmlCtxtGetLastError(ctx_);
|
|
||||||
+ const xmlError* error = xmlCtxtGetLastError(ctx_);
|
|
||||||
if (error)
|
|
||||||
{
|
|
||||||
std::string msg("XML document not well formed:\n");
|
|
||||||
@@ -118,7 +118,7 @@
|
|
||||||
if (!doc)
|
|
||||||
{
|
|
||||||
std::string msg("XML document not well formed");
|
|
||||||
- xmlError * error = xmlCtxtGetLastError( ctx_ );
|
|
||||||
+ const xmlError* error = xmlCtxtGetLastError(ctx_);
|
|
||||||
if (error)
|
|
||||||
{
|
|
||||||
msg += ":\n";
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
||||||
#https://github.com/archlinux/svntogit-community/blob/packages/mapnik/trunk/scons4.patch
|
|
||||||
--- a/SConstruct 2021-01-08 13:23:24.000000000 +0200
|
|
||||||
+++ b/SConstruct 2021-11-22 11:41:03.413991679 +0200
|
|
||||||
@@ -126,7 +126,6 @@ PLUGINS = { # plugins with external depe
|
|
||||||
|
|
||||||
def init_environment(env):
|
|
||||||
env.Decider('MD5-timestamp')
|
|
||||||
- env.SourceCode(".", None)
|
|
||||||
if os.environ.get('RANLIB'):
|
|
||||||
env['RANLIB'] = os.environ['RANLIB']
|
|
||||||
if os.environ.get('AR'):
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue