diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2018-08-23 09:00:07 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-08-23 09:00:08 +0000 |
| commit | 0bc2aefacd98a40c47101ff430e98cd81534a8e7 (patch) | |
| tree | c6fef9cb037677691a61d355bbf2651a5dfe13b0 /testing/mapnik | |
| parent | e66abfb4c6fece91d29a27037fd31bd23bd279a4 (diff) | |
| download | aports-0bc2aefacd98a40c47101ff430e98cd81534a8e7.tar.bz2 aports-0bc2aefacd98a40c47101ff430e98cd81534a8e7.tar.xz | |
testing/mapnik: upgrade to 3.0.20
Diffstat (limited to 'testing/mapnik')
| -rw-r--r-- | testing/mapnik/APKBUILD | 56 | ||||
| -rw-r--r-- | testing/mapnik/icu-59.patch | 28 |
2 files changed, 41 insertions, 43 deletions
diff --git a/testing/mapnik/APKBUILD b/testing/mapnik/APKBUILD index 2eda61f080..0655e27adb 100644 --- a/testing/mapnik/APKBUILD +++ b/testing/mapnik/APKBUILD @@ -1,44 +1,70 @@ # Contributor: Markus Juenemann <markus@juenemann.net> # Maintainer: Markus Juenemann <markus@juenemann.net> pkgname=mapnik -pkgver=3.0.15 -pkgrel=4 +pkgver=3.0.20 +pkgrel=0 pkgdesc="An open source toolkit for developing mapping applications" url="http://mapnik.org/" arch="x86_64 ppc64le" license="LPGL-2.0-or-later" -depends="boost boost-regex freetype zlib harfbuzz postgresql-client sqlite-libs cairo libpng libjpeg tiff libwebp libxml2 proj4 gdal icu" -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" +makedepends=" + boost-dev + cairo-dev + freetype-dev + gdal-dev + harfbuzz-dev + icu-dev + libpng-dev + libwebp-dev + libxml2-dev + postgresql-dev + proj4-dev + python3 + sqlite-dev + tiff-dev + zlib-dev + " install="" subpackages="$pkgname-dev $pkgname-doc" -source="https://github.com/mapnik/mapnik/releases/download/v$pkgver/mapnik-v$pkgver.tar.bz2 - icu-59.patch" +source="https://github.com/mapnik/mapnik/releases/download/v$pkgver/mapnik-v$pkgver.tar.bz2" builddir="$srcdir/$pkgname-v$pkgver" build() { cd "$builddir" - python scons/scons.py configure PREFIX=/usr DESTDIR="$pkgdir" --jobs=${JOBS-2} --config=cache --implicit-cache --max-drift=1 || return 1 - python scons/scons.py --jobs=${JOBS-2} --config=cache --implicit-cache --max-drift=1 + python3 scons/scons.py configure \ + PREFIX=/usr \ + DESTDIR="$pkgdir" \ + --jobs=${JOBS:-2} \ + --config=cache \ + --implicit-cache \ + --max-drift=1 + python3 scons/scons.py \ + --jobs=${JOBS:-2} \ + --config=cache \ + --implicit-cache \ + --max-drift=1 } package() { cd "$builddir" - python scons/scons.py install --jobs=${JOBS-2} --config=cache --implicit-cache --max-drift=1 + python scons/scons.py install \ + --jobs=${JOBS-2} \ + --config=cache \ + --implicit-cache \ + --max-drift=1 } dev() { pkgdesc="Mapnik development files" - mkdir -p "$subpkgdir"/usr/include/mapnik || return 1 - mv "$pkgdir"/usr/include/mapnik "$subpkgdir"/usr/include/mapnik || return 1 + mkdir -p "$subpkgdir"/usr/include/mapnik + mv "$pkgdir"/usr/include/mapnik "$subpkgdir"/usr/include/mapnik } doc() { pkgdesc="Mapnik documentation" - mkdir -p "$subpkgdir"/usr/share/docs/$pkgname/docs/ || return 1 + mkdir -p "$subpkgdir"/usr/share/docs/$pkgname/docs/ install -Dm644 $builddir/*.md "$subpkgdir"/usr/share/docs/$pkgname/ install -Dm644 $builddir/docs/* "$subpkgdir"/usr/share/docs/$pkgname/docs/ } -sha512sums="61c46c0c8c662e6c0d0c3229c2feb6bce952096a1415ecf512765bae3630cdc28a79342cac4a94ed066f3503fddd0227602cf0eaeaa408e5be0bd8b628cbd5bb mapnik-v3.0.15.tar.bz2 -3e1fdf249c86615ad6c8d7d996e0af19cc53cf4a20f3a8d8c23ad1f01a072ed928de2160f6ff334eee0e50a96565081ca095cd25ac310c4f55c4733063e5ba61 icu-59.patch" +sha512sums="f957ee9ca63fc597baa513b226ba4a6ab310138c8daea3f8dd9af9fdb2f4fa10c52f1710a839549492403859c2b312e39bca2c5c4f7bc579dd9662a6438e2e39 mapnik-v3.0.20.tar.bz2" diff --git a/testing/mapnik/icu-59.patch b/testing/mapnik/icu-59.patch deleted file mode 100644 index c888017712..0000000000 --- a/testing/mapnik/icu-59.patch +++ /dev/null @@ -1,28 +0,0 @@ -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> |