From owner-svn-ports-all@freebsd.org  Tue Sep 12 22:23:51 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A6F2CE2207E;
 Tue, 12 Sep 2017 22:23:51 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6F3EB65E18;
 Tue, 12 Sep 2017 22:23:51 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8CMNoT8059916;
 Tue, 12 Sep 2017 22:23:50 GMT (envelope-from jbeich@FreeBSD.org)
Received: (from jbeich@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8CMNo1R059915;
 Tue, 12 Sep 2017 22:23:50 GMT (envelope-from jbeich@FreeBSD.org)
Message-Id: <201709122223.v8CMNo1R059915@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jbeich set sender to
 jbeich@FreeBSD.org using -f
From: Jan Beich <jbeich@FreeBSD.org>
Date: Tue, 12 Sep 2017 22:23:50 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r449741 - head/graphics/mapnik/files
X-SVN-Group: ports-head
X-SVN-Commit-Author: jbeich
X-SVN-Commit-Paths: head/graphics/mapnik/files
X-SVN-Commit-Revision: 449741
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 Sep 2017 22:23:51 -0000

Author: jbeich
Date: Tue Sep 12 22:23:50 2017
New Revision: 449741
URL: https://svnweb.freebsd.org/changeset/ports/449741

Log:
  graphics/mapnik: unbreak with ICU 59.1
  
  src/unicode.cpp:47:42: error: incomplete result type 'mapnik::value_unicode_string' (aka 'icu::UnicodeString') in function definition
  mapnik::value_unicode_string transcoder::transcode(const char* data, std::int32_t length) const
                                           ^
  include/mapnik/value_types.hpp:39:11: note: forward declaration of 'icu::UnicodeString'
      class UnicodeString;
            ^
  src/unicode.cpp:51:34: error: variable has incomplete type 'mapnik::value_unicode_string' (aka 'icu::UnicodeString')
      mapnik::value_unicode_string ustr(data,length,conv_,err);
                                   ^
  include/mapnik/value_types.hpp:39:11: note: forward declaration of 'icu::UnicodeString'
      class UnicodeString;
            ^
  
  PR:		218788
  Obtained from:	upstream

Added:
  head/graphics/mapnik/files/patch-icu59   (contents, props changed)

Added: head/graphics/mapnik/files/patch-icu59
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/mapnik/files/patch-icu59	Tue Sep 12 22:23:50 2017	(r449741)
@@ -0,0 +1,39 @@
+https://github.com/mapnik/mapnik/commit/9e58c890430d
+https://github.com/mapnik/mapnik/commit/093fcee6d1ba
+
+--- include/mapnik/text/harfbuzz_shaper.hpp.orig	2015-11-26 14:32:15 UTC
++++ include/mapnik/text/harfbuzz_shaper.hpp
+@@ -41,6 +41,7 @@
+ #include <harfbuzz/hb-ft.h>
+ 
+ // icu
++#include <unicode/uvernum.h>
+ #include <unicode/uscript.h>
+ 
+ namespace mapnik
+@@ -55,7 +56,8 @@ static inline hb_script_t _icu_script_to_script(UScrip
+ 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;
+--- include/mapnik/unicode.hpp.orig	2015-11-26 14:32:15 UTC
++++ include/mapnik/unicode.hpp
+@@ -31,6 +31,13 @@
+ // std
+ #include <cstdint>
+ #include <string>
++// icu
++#if (U_ICU_VERSION_MAJOR_NUM >= 59)
++#pragma GCC diagnostic push
++#include <mapnik/warning_ignore.hpp>
++#include <unicode/unistr.h>
++#pragma GCC diagnostic pop
++#endif
+ 
+ struct UConverter;
+