- added icu 59 and gcc 6 c++ fixes

diff --git a/cxx.patch b/cxx.patch
new file mode 100644 (file)
index 0000000..bcb6ef8
--- /dev/null
+++ b/cxx.patch
@@ -0,0 +1,14 @@
+--- mapnik-v3.0.12/include/mapnik/text/harfbuzz_shaper.hpp.orig        2017-04-27 21:10:31.804876433 +0200
++++ mapnik-v3.0.12/include/mapnik/text/harfbuzz_shaper.hpp     2017-04-27 21:11:23.065634158 +0200
+@@ -55,11 +55,7 @@
+ 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/icu59.patch b/icu59.patch
new file mode 100644 (file)
index 0000000..a363baa
--- /dev/null
+++ b/icu59.patch
@@ -0,0 +1,10 @@
+--- mapnik-v3.0.12/include/mapnik/value_types.hpp~     2016-09-08 10:49:19.000000000 +0200
++++ mapnik-v3.0.12/include/mapnik/value_types.hpp      2017-04-27 21:00:01.132437004 +0200
+@@ -31,6 +31,7 @@
+ #pragma GCC diagnostic push
+ #include <mapnik/warning_ignore.hpp>
+ #include <unicode/uversion.h> // for U_NAMESPACE_QUALIFIER
++#include <unicode/unistr.h>
+ #pragma GCC diagnostic pop
+ 
+ // stl

diff --git a/mapnik.spec b/mapnik.spec
index 75b46c1615180282ce3c502de02a5f4b61209319..ccb528e5c49bfce0a286b66a23164b648f905bf1 100644 (file)
--- a/mapnik.spec
+++ b/mapnik.spec
@@ -12,6 +12,8 @@ Group:                Applications
 Source0:       https://github.com/mapnik/mapnik/releases/download/v%{version}/%{name}-v%{version}.tar.bz2
 # Source0-md5: 221c1fa8e63f4cc93b3040e9382e3394
 Patch0:                mapnik-boost_lib_names.patch
+Patch1:                cxx.patch
+Patch2:                icu59.patch
 URL:           http://mapnik.org/
 BuildRequires: boost-devel
 BuildRequires: boost-python-devel
@@ -77,6 +79,8 @@ Statyczna biblioteka Mapnik.
 %prep
 %setup -q -n %{name}-v%{version}
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 %scons configure \