Date: Sunday, May 14, 2023 @ 10:52:29
Author: arojas
Revision: 1461572
upgpkg: mapnik 3.1.0-18: gdal 3.7 rebuild
Added:
mapnik/trunk/gcc-13.patch
Modified:
mapnik/trunk/PKGBUILD
--------------+
PKGBUILD | 11 ++++++++---
gcc-13.patch | 23 +++++++++++++++++++++++
2 files changed, 31 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2023-05-14 10:51:08 UTC (rev 1461571)
+++ PKGBUILD 2023-05-14 10:52:29 UTC (rev 1461572)
@@ -5,7 +5,7 @@
pkgname=mapnik
pkgver=3.1.0
-pkgrel=17
+pkgrel=18
pkgdesc="Free Toolkit for developing mapping applications and rendering
beautiful maps"
arch=('x86_64')
url="https://mapnik.org/";
@@ -15,10 +15,12 @@
makedepends=('boost' 'scons')
source=(https://github.com/$pkgname/$pkgname/releases/download/v$pkgver/$pkgname-v$pkgver.tar.bz2
boost-1.80.patch
- scons4.patch)
+ scons4.patch
+ gcc-13.patch)
sha256sums=('43d76182d2a975212b4ad11524c74e577576c11039fdab5286b828397d8e6261'
'b80085fba71ea6ecd86ff98ebdf652490bf56507cb798076192ab3ce136f5eeb'
- '79a85ddba3ec17b86cb216e21442611498a9f2612f03e98708057b3c3a6e8b06')
+ '79a85ddba3ec17b86cb216e21442611498a9f2612f03e98708057b3c3a6e8b06'
+ '84ddba271d74fd4ed1d26501789c50c5e6bda509c238986eb69f96b10cf1465a')
prepare() {
cd "${srcdir}"/$pkgname-v$pkgver
@@ -26,6 +28,9 @@
# Partial fix to build with SCons 4 (https://bugs.archlinux.org/task/71630)
patch -Np1 -i ../scons4.patch
+
+ # Fix build with GCC 13
+ patch -p1 -i ../gcc-13.patch
}
build() {
Added: gcc-13.patch
===================================================================
--- gcc-13.patch (rev 0)
+++ gcc-13.patch 2023-05-14 10:52:29 UTC (rev 1461572)
@@ -0,0 +1,23 @@
+From c62e03344fe3af8d061f3ff881ab3cb7bfa0e1e9 Mon Sep 17 00:00:00 2001
+From: Tom Hughes <[email protected]>
+Date: Mon, 23 Jan 2023 19:01:17 +0000
+Subject: [PATCH] Include cstdint for uint16_t
+
+---
+ include/mapnik/wkb.hpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/include/mapnik/wkb.hpp b/include/mapnik/wkb.hpp
+index 939fc17b74..52b902ae97 100644
+--- a/include/mapnik/wkb.hpp
++++ b/include/mapnik/wkb.hpp
+@@ -28,6 +28,9 @@
+ #include <mapnik/geometry.hpp>
+ #include <mapnik/util/noncopyable.hpp>
+
++// stl
++#include <cstdint>
++
+ namespace mapnik
+ {
+
