commit a5b4c7a01dbd3ee343ac2f2d9b4b99396c9ba071
Author: Jan Rękorajski <bagg...@pld-linux.org>
Date: Mon May 21 23:53:28 2018 +0900
- up to 3.0.20
cxx.patch | 14 --------------
mapnik.spec | 6 ++----
2 files changed, 2 insertions(+), 18 deletions(-)
---
diff --git a/mapnik.spec b/mapnik.spec
index ccb528e..e80a067 100644
--- a/mapnik.spec
+++ b/mapnik.spec
@@ -5,14 +5,13 @@
%endif
Summary: Toolkit for developing GIS (Geographic Information Systems)
applications
Name: mapnik
-Version: 3.0.12
+Version: 3.0.20
Release: 1
License: LGPL v2.1
Group: Applications
Source0:
https://github.com/mapnik/mapnik/releases/download/v%{version}/%{name}-v%{version}.tar.bz2
-# Source0-md5: 221c1fa8e63f4cc93b3040e9382e3394
+# Source0-md5: 10da364a50d5ccaf33a8b253ed75aa4f
Patch0: mapnik-boost_lib_names.patch
-Patch1: cxx.patch
Patch2: icu59.patch
URL: http://mapnik.org/
BuildRequires: boost-devel
@@ -79,7 +78,6 @@ Statyczna biblioteka Mapnik.
%prep
%setup -q -n %{name}-v%{version}
%patch0 -p1
-%patch1 -p1
%patch2 -p1
%build
diff --git a/cxx.patch b/cxx.patch
deleted file mode 100644
index bcb6ef8..0000000
--- a/cxx.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mapnik.git/commitdiff/a5b4c7a01dbd3ee343ac2f2d9b4b99396c9ba071
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
