rpms/libmapnik
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 3.0.15 [release 3.0.15-1mamba;Sat Oct 21 2017]

Browse Source
This commit is contained in:
Silvan Calarco 2024-01-06 05:00:47 +01:00
parent 07322b1449
commit 49e8e8b014
2 changed files with 59 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
libmapnik-3.0.15-icu-59.patch Normal file
View File

@ -0,0 +1,45 @@
From 4c8f4faae92393d5949115d9767b1b5eec041762 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 19 Jul 2017 16:07:39 +0200
Subject: [PATCH] Add support for U_ICU_VERSION_MAJOR_NUM >= 59 (#3729)
---
include/mapnik/text/harfbuzz_shaper.hpp | 4 +++-
include/mapnik/unicode.hpp | 2 ++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/include/mapnik/text/harfbuzz_shaper.hpp b/include/mapnik/text/harfbuzz_shaper.hpp
index 8b574b095f..14151cf7d8 100644
--- a/include/mapnik/text/harfbuzz_shaper.hpp
+++ b/include/mapnik/text/harfbuzz_shaper.hpp
@@ -40,6 +40,7 @@
#include <mapnik/warning_ignore.hpp>
#include <harfbuzz/hb.h>
#include <harfbuzz/hb-ft.h>
+#include <unicode/uvernum.h>
#include <unicode/uscript.h>
#pragma GCC diagnostic pop
@@ -55,7 +56,8 @@ 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)
+#if defined(_MSC_VER) || (U_ICU_VERSION_MAJOR_NUM >= 59)
+ // ^^ http://site.icu-project.org/download/59#TOC-ICU4C-char16_t1
return reinterpret_cast<const uint16_t *>(src);
#else
return src;
diff --git a/include/mapnik/unicode.hpp b/include/mapnik/unicode.hpp
index f3b270cb93..83ed3b126e 100644
--- a/include/mapnik/unicode.hpp
+++ b/include/mapnik/unicode.hpp
@@ -31,6 +31,8 @@
// std
#include <cstdint>
#include <string>
+// icu
+#include <unicode/unistr.h>
struct UConverter;

19
libmapnik.spec
View File

@ -1,5 +1,5 @@
Name: libmapnik
Version: 3.0.10
Version: 3.0.15
Release: 1mamba
Summary: A Free Toolkit for developing mapping applications
Group: System/Tools
@ -7,8 +7,10 @@ Vendor: openmamba
Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: http://mapnik.org/
Source: https://mapnik.s3.amazonaws.com/dist/v%{version}/mapnik-v%{version}.tar.bz2
Source: https://github.com/mapnik/mapnik/releases/download/v%{version}/mapnik-v%{version}.tar.bz2
#Source: https://mapnik.s3.amazonaws.com/dist/v%{version}/mapnik-v%{version}.tar.bz2
Patch0: libmapnik-3.0.9-boost-mt.patch
Patch1: libmapnik-3.0.15-icu-59.patch
License: LGPL
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
@ -46,12 +48,13 @@ Mapnik is a Free Toolkit for developing mapping applications. Above all Mapnik i
This is the devel package.
%prep
%setup -q -n mapnik-v%{version} -D -T
%setup -q -n mapnik-v%{version}
#-D -T
#:<< _EOF
#% patch0 -p1
%patch1 -p1
%build
:<< _EOF
#:<< _EOF
%{__python} scons/scons.py configure \
PREFIX=%{_prefix} \
LIBDIR_SCHEMA=%{_lib} \
@ -98,6 +101,12 @@ sed -i "s|max-drift=1 install|max-drift=1 install DESTDIR=%{buildroot}|" Makefil
#%doc README
%changelog
* Sat Oct 21 2017 Silvan Calarco <silvan.calarco@mambasoft.it> 3.0.15-1mamba
- update to 3.0.15
* Tue Nov 22 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 3.0.12-1mamba
- update to 3.0.12
* Sun Jul 10 2016 Automatic Build System <autodist@mambasoft.it> 3.0.10-1mamba
- automatic version update by autodist