Date: Thursday, November 16, 2017 @ 19:26:54
Author: jlichtblau
Revision: 267015
upgpkg: mapnik 3.0.16-1 - new upstream release
Modified:
mapnik/trunk/PKGBUILD
Deleted:
mapnik/trunk/icu59.patch
-------------+
PKGBUILD | 22 +++++++---------------
icu59.patch | 26 --------------------------
2 files changed, 7 insertions(+), 41 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-11-16 18:17:20 UTC (rev 267014)
+++ PKGBUILD 2017-11-16 19:26:54 UTC (rev 267015)
@@ -5,35 +5,27 @@
# Contributor: orbisvicis <orbisvi...@gmail.com>
pkgname=mapnik
-pkgver=3.0.13
-pkgrel=8
-pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is
about rendering beautiful maps"
+pkgver=3.0.16
+pkgrel=1
+pkgdesc="Free Toolkit for developing mapping applications and rendering
beautiful maps"
arch=('x86_64')
url="http://mapnik.org/";
license=('LGPL')
depends=('boost-libs' 'icu' 'libpng' 'libjpeg-turbo' 'libtiff' 'freetype2'
- 'libxml2' 'python2' 'proj' 'cairo' 'cairomm' 'python2-cairo'
- 'postgresql-libs' 'postgis' 'gdal' 'curl' 'libtool')
+ 'libxml2' 'python2' 'proj' 'cairo' 'cairomm' 'python2-cairo'
+ 'postgresql-libs' 'postgis' 'gdal' 'curl' 'libtool')
optdepends=('libxslt: Web Map Service'
'python2-lxml: Web Map Service'
'python2-pillow: Web Map Service'
'python-nose: Web Map Service'
'apache: Web Map Service'
- 'mod_fastcgi: Web Map Service - or:'
'mod_fcgid: Web Map Service - or:'
'mod_wsgi2: Web Map Service')
makedepends=('scons' 'boost' 'git')
install="mapnik.install"
-source=("https://github.com/$pkgname/$pkgname/releases/download/v$pkgver/$pkgname-v$pkgver.tar.bz2";
- 'icu59.patch')
-sha256sums=('d6213d514a0e3cd84d9bfcb6d97208d169ffcaae1f36250f6555655cdfe57bcc'
- 'b391a775f28ec9bc7d5d2a8ef429789d8c6158bdf8023f395501fbfc8137cc22')
+source=("https://github.com/$pkgname/$pkgname/releases/download/v$pkgver/$pkgname-v$pkgver.tar.bz2";)
+sha256sums=('0a0e6351d1a32922327555b9835d4843aade752adecadde309fa856b72dfb1b1')
-prepare() {
- cd "$srcdir/$pkgname-v$pkgver"
- patch -Np1 -i ../icu59.patch
-}
-
build() {
cd "$srcdir/$pkgname-v$pkgver"
PYTHON=python2
Deleted: icu59.patch
===================================================================
--- icu59.patch 2017-11-16 18:17:20 UTC (rev 267014)
+++ icu59.patch 2017-11-16 19:26:54 UTC (rev 267015)
@@ -1,26 +0,0 @@
-diff -upr mapnik-v3.0.13.orig/include/mapnik/text/harfbuzz_shaper.hpp
mapnik-v3.0.13/include/mapnik/text/harfbuzz_shaper.hpp
---- mapnik-v3.0.13.orig/include/mapnik/text/harfbuzz_shaper.hpp
2017-02-08 15:13:58.000000000 +0200
-+++ mapnik-v3.0.13/include/mapnik/text/harfbuzz_shaper.hpp 2017-04-26
12:14:46.156921035 +0300
-@@ -55,11 +55,7 @@ static inline hb_script_t _icu_script_to
- 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 -upr mapnik-v3.0.13.orig/src/unicode.cpp mapnik-v3.0.13/src/unicode.cpp
---- mapnik-v3.0.13.orig/src/unicode.cpp 2017-02-08 15:13:58.000000000
+0200
-+++ mapnik-v3.0.13/src/unicode.cpp 2017-04-26 12:14:20.346507663 +0300
-@@ -30,6 +30,7 @@
- #pragma GCC diagnostic push
- #include <mapnik/warning_ignore.hpp>
- #include <unicode/ucnv.h>
-+#include <unicode/unistr.h>
- #pragma GCC diagnostic pop
-
- namespace mapnik {
