diff options
| author | Omar Vega Ramos <ovruni@gnu.org.pe> | 2017-07-03 21:31:20 -0500 |
|---|---|---|
| committer | Omar Vega Ramos <ovruni@gnu.org.pe> | 2017-07-03 21:31:20 -0500 |
| commit | ab72d6ba9aa8688eeca9947c6ef0f70f40772184 (patch) | |
| tree | 4983ba1c88e2e55f067db9387835f53b11c96343 /libre | |
| parent | 875f9f71f77e3f31c59d7a6d5c6f9d2fcd7442c9 (diff) | |
| download | abslibre-ab72d6ba9aa8688eeca9947c6ef0f70f40772184.tar.gz abslibre-ab72d6ba9aa8688eeca9947c6ef0f70f40772184.tar.bz2 abslibre-ab72d6ba9aa8688eeca9947c6ef0f70f40772184.zip | |
mapnik-3.0.13-5.parabola1: rebuild
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/mapnik/PKGBUILD | 17 | ||||
| -rw-r--r-- | libre/mapnik/icu59.patch | 26 |
2 files changed, 38 insertions, 5 deletions
diff --git a/libre/mapnik/PKGBUILD b/libre/mapnik/PKGBUILD index fd04b5731..779e2b49c 100644 --- a/libre/mapnik/PKGBUILD +++ b/libre/mapnik/PKGBUILD @@ -7,13 +7,13 @@ pkgname=mapnik pkgver=3.0.13 -pkgrel=1.parabola1 +pkgrel=5.parabola1 pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps, without nonfree mod_fastcgi recommendation" arch=('i686' 'x86_64' 'armv7h') url="http://mapnik.org/" license=('LGPL') depends=('boost-libs' 'icu' 'libpng' 'libjpeg' 'libtiff' 'freetype2' - 'libxml2' 'python2' 'proj' 'cairo' 'cairomm' 'pycairo' + 'libxml2' 'python2' 'proj' 'cairo' 'cairomm' 'python2-cairo' 'postgresql-libs' 'postgis' 'gdal' 'curl' 'libltdl') optdepends=('libxslt: Web Map Service' 'python2-lxml: Web Map Service' @@ -24,8 +24,15 @@ optdepends=('libxslt: Web Map Service' '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") -sha256sums=('d6213d514a0e3cd84d9bfcb6d97208d169ffcaae1f36250f6555655cdfe57bcc') +source=("https://github.com/$pkgname/$pkgname/releases/download/v$pkgver/$pkgname-v$pkgver.tar.bz2" + 'icu59.patch') +sha256sums=('d6213d514a0e3cd84d9bfcb6d97208d169ffcaae1f36250f6555655cdfe57bcc' + 'b391a775f28ec9bc7d5d2a8ef429789d8c6158bdf8023f395501fbfc8137cc22') + +prepare() { + cd "$srcdir/$pkgname-v$pkgver" + patch -Np1 -i ../icu59.patch +} build() { cd "$srcdir/$pkgname-v$pkgver" @@ -36,7 +43,7 @@ build() { XMLPARSER=libxml2 \ DESTDIR="$pkgdir" \ CUSTOM_CXXFLAGS="-DBOOST_OPTIONAL_CONFIG_USE_OLD_IMPLEMENTATION_OF_OPTIONAL" - scons $MAKEFLAGS + scons -j1 $MAKEFLAGS } package(){ diff --git a/libre/mapnik/icu59.patch b/libre/mapnik/icu59.patch new file mode 100644 index 000000000..47494a3aa --- /dev/null +++ b/libre/mapnik/icu59.patch @@ -0,0 +1,26 @@ +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 { |