Antonio Rojas pushed to branch main at Arch Linux / Packaging / Packages /
mapnik
Commits:
adbe9821 by Antonio Rojas at 2024-08-30T22:15:32+02:00
upgpkg: 3.1.0-25: boost 1.86 rebuild
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- + boost-1.85.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = mapnik
pkgdesc = Free Toolkit for developing mapping applications and
rendering beautiful maps
pkgver = 3.1.0
- pkgrel = 24
+ pkgrel = 25
url = https://mapnik.org/
arch = x86_64
license = LGPL
@@ -29,6 +29,7 @@ pkgbase = mapnik
source = boost-1.83.patch
source = libxml2-2.12.patch
source = mapnik-gcc14.patch
+ source = boost-1.85.patch
sha256sums =
43d76182d2a975212b4ad11524c74e577576c11039fdab5286b828397d8e6261
sha256sums =
b80085fba71ea6ecd86ff98ebdf652490bf56507cb798076192ab3ce136f5eeb
sha256sums =
79a85ddba3ec17b86cb216e21442611498a9f2612f03e98708057b3c3a6e8b06
@@ -36,5 +37,6 @@ pkgbase = mapnik
sha256sums =
356271f4550c2b370ae48bbce9cebb58c5803507f2b14bc8e84f3813871d0645
sha256sums =
f56d43aab85750505d56aa92f8f34453f4344e76a7ccdf394e874245b05990c3
sha256sums =
086c57f5907c2e3f378f1f747dce59cf7ce5e5cffdd7c3779414dab2405eaed2
+ sha256sums =
23c26604fd191459da70aa29fc9cf6578e0f3ca75c9240150b3f2247d92cb070
pkgname = mapnik
=====================================
PKGBUILD
=====================================
@@ -5,7 +5,7 @@
pkgname=mapnik
pkgver=3.1.0
-pkgrel=24
+pkgrel=25
pkgdesc="Free Toolkit for developing mapping applications and rendering
beautiful maps"
arch=('x86_64')
url="https://mapnik.org/";
@@ -19,14 +19,16 @@
source=(https://github.com/$pkgname/$pkgname/releases/download/v$pkgver/$pkgname
gcc-13.patch
boost-1.83.patch
libxml2-2.12.patch
- mapnik-gcc14.patch)
+ mapnik-gcc14.patch
+ boost-1.85.patch)
sha256sums=('43d76182d2a975212b4ad11524c74e577576c11039fdab5286b828397d8e6261'
'b80085fba71ea6ecd86ff98ebdf652490bf56507cb798076192ab3ce136f5eeb'
'79a85ddba3ec17b86cb216e21442611498a9f2612f03e98708057b3c3a6e8b06'
'84ddba271d74fd4ed1d26501789c50c5e6bda509c238986eb69f96b10cf1465a'
'356271f4550c2b370ae48bbce9cebb58c5803507f2b14bc8e84f3813871d0645'
'f56d43aab85750505d56aa92f8f34453f4344e76a7ccdf394e874245b05990c3'
- '086c57f5907c2e3f378f1f747dce59cf7ce5e5cffdd7c3779414dab2405eaed2')
+ '086c57f5907c2e3f378f1f747dce59cf7ce5e5cffdd7c3779414dab2405eaed2'
+ '23c26604fd191459da70aa29fc9cf6578e0f3ca75c9240150b3f2247d92cb070')
prepare() {
cd "${srcdir}"/$pkgname-v$pkgver
@@ -49,6 +51,9 @@ prepare() {
# Fix build with GCC 14
patch -p1 -i ../mapnik-gcc14.patch
+
+ # Fix build with boost 1.85
+ patch -p1 -i ../boost-1.85.patch
}
build() {
=====================================
boost-1.85.patch
=====================================
@@ -0,0 +1,35 @@
+diff -ru mapnik-v3.1.0.orig/src/fs.cpp mapnik-v3.1.0/src/fs.cpp
+--- mapnik-v3.1.0.orig/src/fs.cpp 2024-08-30 21:58:59.969635234 +0200
++++ mapnik-v3.1.0/src/fs.cpp 2024-08-30 22:00:48.488604302 +0200
+@@ -29,6 +29,7 @@
+ #include <mapnik/warning_ignore.hpp>
+ #include <boost/filesystem/operations.hpp> // for absolute, exists, etc
+ #include <boost/filesystem/path.hpp> // for path, operator/
++#include <boost/filesystem/directory.hpp>
+ #pragma GCC diagnostic pop
+
+ // stl
+diff -ru mapnik-v3.1.0.orig/test/unit/imaging/image_io_test.cpp
mapnik-v3.1.0/test/unit/imaging/image_io_test.cpp
+--- mapnik-v3.1.0.orig/test/unit/imaging/image_io_test.cpp 2024-08-30
21:59:00.109638259 +0200
++++ mapnik-v3.1.0/test/unit/imaging/image_io_test.cpp 2024-08-30
22:10:55.207122334 +0200
+@@ -15,7 +15,7 @@
+ #pragma GCC diagnostic push
+ #include <mapnik/warning_ignore.hpp>
+ #include <boost/format.hpp>
+-#include <boost/filesystem/convenience.hpp>
++#include <boost/filesystem/operations.hpp>
+ #pragma GCC diagnostic pop
+
+ inline void make_directory(std::string const& dir) {
+diff -ru mapnik-v3.1.0.orig/test/unit/run.cpp mapnik-v3.1.0/test/unit/run.cpp
+--- mapnik-v3.1.0.orig/test/unit/run.cpp 2024-08-30 21:59:00.109638259
+0200
++++ mapnik-v3.1.0/test/unit/run.cpp 2024-08-30 22:07:05.929456645 +0200
+@@ -4,7 +4,7 @@
+ #include <string>
+ #include <mapnik/util/fs.hpp>
+ #include <mapnik/datasource_cache.hpp>
+-#include <boost/filesystem/convenience.hpp>
++#include <boost/filesystem/operations.hpp>
+
+ #include "cleanup.hpp" // run_cleanup()
+
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/mapnik/-/commit/adbe98219e1b989d0d6976f326e525ff491ebcd4
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/mapnik/-/commit/adbe98219e1b989d0d6976f326e525ff491ebcd4
You're receiving this email because of your account on gitlab.archlinux.org.
