diff options
Diffstat (limited to 'testing/mapnik')
| -rw-r--r-- | testing/mapnik/APKBUILD | 12 | ||||
| -rw-r--r-- | testing/mapnik/icu-59.patch | 28 |
2 files changed, 34 insertions, 6 deletions
diff --git a/testing/mapnik/APKBUILD b/testing/mapnik/APKBUILD index 1e0b49113d..58355976c6 100644 --- a/testing/mapnik/APKBUILD +++ b/testing/mapnik/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Markus Juenemann <markus@juenemann.net> # Maintainer: Markus Juenemann <markus@juenemann.net> pkgname=mapnik -pkgver=3.0.12 -pkgrel=2 +pkgver=3.0.15 +pkgrel=0 pkgdesc="An open source toolkit for developing mapping applications" url="http://mapnik.org/" arch="x86_64" @@ -12,7 +12,8 @@ depends_dev="" makedepends="$depends_dev python scons boost-dev freetype-dev zlib-dev harfbuzz-dev postgresql-dev sqlite-dev cairo-dev libpng-dev tiff-dev libwebp-dev libxml2-dev proj4-dev gdal-dev icu-dev" install="" 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 + icu-59.patch" builddir="$srcdir/$pkgname-v$pkgver" build() { @@ -39,6 +40,5 @@ doc() { install -Dm644 $builddir/docs/* "$subpkgdir"/usr/share/docs/$pkgname/docs/ } -md5sums="221c1fa8e63f4cc93b3040e9382e3394 mapnik-v3.0.12.tar.bz2" -sha256sums="66a3d620c3ce543c91ea5b42a25079aca9a2a90f6079a2ce2a8714398fa57d6d mapnik-v3.0.12.tar.bz2" -sha512sums="db87cd76f21b46e1b92d303f02b4c3927e520e7b309f717967283831adfec53f15aab23e7e737ee4a79ff2c06948b94df7d193621aff99197d4dede9a4e329b7 mapnik-v3.0.12.tar.bz2" +sha512sums="61c46c0c8c662e6c0d0c3229c2feb6bce952096a1415ecf512765bae3630cdc28a79342cac4a94ed066f3503fddd0227602cf0eaeaa408e5be0bd8b628cbd5bb mapnik-v3.0.15.tar.bz2 +3e1fdf249c86615ad6c8d7d996e0af19cc53cf4a20f3a8d8c23ad1f01a072ed928de2160f6ff334eee0e50a96565081ca095cd25ac310c4f55c4733063e5ba61 icu-59.patch" diff --git a/testing/mapnik/icu-59.patch b/testing/mapnik/icu-59.patch new file mode 100644 index 0000000000..c888017712 --- /dev/null +++ b/testing/mapnik/icu-59.patch @@ -0,0 +1,28 @@ +diff --git a/include/mapnik/text/harfbuzz_shaper.hpp b/include/mapnik/text/harfbuzz_shaper.hpp +index 8b574b0..2d41efb 100644 +--- a/include/mapnik/text/harfbuzz_shaper.hpp ++++ b/include/mapnik/text/harfbuzz_shaper.hpp +@@ -55,11 +55,7 @@ static inline hb_script_t _icu_script_to_script(UScriptCode script) + static inline const uint16_t * uchar_to_utf16(const UChar* src) + { + static_assert(sizeof(UChar) == sizeof(uint16_t),"UChar is eq size to uint16_t"); +-#if defined(_MSC_VER) + return reinterpret_cast<const uint16_t *>(src); +-#else +- return src; +-#endif + } + + struct harfbuzz_shaper +diff --git a/include/mapnik/value_types.hpp b/include/mapnik/value_types.hpp +index 7682d52..9dba491 100644 +--- a/include/mapnik/value_types.hpp ++++ b/include/mapnik/value_types.hpp +@@ -23,6 +23,7 @@ + #ifndef MAPNIK_VALUE_TYPES_HPP + #define MAPNIK_VALUE_TYPES_HPP + ++#include <unicode/unistr.h> + // mapnik + #include <mapnik/config.hpp> + #include <mapnik/cxx11_support.hpp> |