aboutsummaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2015-04-20 09:50:49 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2015-04-20 11:53:26 +0000
commit17cd5c97576ae711276f84ba6336d8e63a2b2198 (patch)
tree4038126d76178d29cc98d12b45f6c344158316f2 /testing
parentdba2946237806b2454acd22da1a427ef18e2ca79 (diff)
testing/mapnik: rebuild against icu-55
Diffstat (limited to 'testing')
-rw-r--r--testing/mapnik/APKBUILD14
-rw-r--r--testing/mapnik/boost-1.57-geojson.patch11
2 files changed, 20 insertions, 5 deletions
diff --git a/testing/mapnik/APKBUILD b/testing/mapnik/APKBUILD
index 91af162d42d..d27f7c58e9d 100644
--- a/testing/mapnik/APKBUILD
+++ b/testing/mapnik/APKBUILD
@@ -1,7 +1,7 @@
pkgname=mapnik
pkgver=3.0.0_rc1
_ver=${pkgver/_rc/-rc}
-pkgrel=0
+pkgrel=1
pkgdesc="Toolkit and API for developing mapping application"
url="http://mapnik.org/"
arch="all"
@@ -14,6 +14,7 @@ makedepends="freetype-dev libxml2-dev zlib-dev icu-dev proj4-dev
harfbuzz-dev"
subpackages="$pkgname-dev"
source="$pkgname-$_ver.tar.gz::https://github.com/mapnik/mapnik/archive/v$_ver.tar.gz
+ boost-1.57-geojson.patch
"
_builddir="$srcdir"/$pkgname-$_ver
@@ -28,7 +29,7 @@ prepare() {
build () {
cd "$_builddir"
- python scons/scons.py sh configure \
+ python scons/scons.py sh configure -j ${JOBS:-1} \
DESTDIR="$pkgdir" \
SYSTEM_FONTS="/usr/share/fonts/TTF/" \
CUSTOM_CFLAGS="$CFLAGS" \
@@ -43,6 +44,9 @@ package() {
make install || return 1
}
-md5sums="c7231574639ec2688d957831a5c16341 mapnik-3.0.0-rc1.tar.gz"
-sha256sums="b4aef9a5910b25cb694b1a67beaf3e8dfbd4d629615d5012eb2378f39a63b379 mapnik-3.0.0-rc1.tar.gz"
-sha512sums="00fd5479424dc06c9e22e201495fe6a178e5f656445bb5739045c87eda7985bad1598e1eb34bc9bcce6cae2b72200489728a059ba08f32283ddc45dd8d6dc47b mapnik-3.0.0-rc1.tar.gz"
+md5sums="c7231574639ec2688d957831a5c16341 mapnik-3.0.0-rc1.tar.gz
+15fbf2b3478699f1d2f9c7c1f10256ab boost-1.57-geojson.patch"
+sha256sums="b4aef9a5910b25cb694b1a67beaf3e8dfbd4d629615d5012eb2378f39a63b379 mapnik-3.0.0-rc1.tar.gz
+f2b49482abd85d62e80cef5602890385d4c39aa67a2a4d9341af83bc4485b32d boost-1.57-geojson.patch"
+sha512sums="00fd5479424dc06c9e22e201495fe6a178e5f656445bb5739045c87eda7985bad1598e1eb34bc9bcce6cae2b72200489728a059ba08f32283ddc45dd8d6dc47b mapnik-3.0.0-rc1.tar.gz
+88d830765b7c1404f9b14ca165b1dd546ba3da2fd69c89786cc80a24147acb5807f1bc0b8e5b7d55eadd9d18d3530fc14b254822984856508c04a22e2a14f978 boost-1.57-geojson.patch"
diff --git a/testing/mapnik/boost-1.57-geojson.patch b/testing/mapnik/boost-1.57-geojson.patch
new file mode 100644
index 00000000000..7c971b6ba0c
--- /dev/null
+++ b/testing/mapnik/boost-1.57-geojson.patch
@@ -0,0 +1,11 @@
+--- ./plugins/input/geojson/geojson_datasource.hpp.orig
++++ ./plugins/input/geojson/geojson_datasource.hpp
+@@ -73,7 +73,7 @@
+ choose_by_content_diff_tag,
+ split_default_tag,
+ linear_tag,
+- node_s_mem_static_tag>;
++ node_variant_static_tag>;
+ };
+
+ }}}}}