svn commit: r466410 - head/graphics/mapnik
Jan Beich
jbeich at FreeBSD.org
Wed Apr 4 09:46:31 UTC 2018
Author: jbeich
Date: Wed Apr 4 09:46:30 2018
New Revision: 466410
URL: https://svnweb.freebsd.org/changeset/ports/466410
Log:
graphics/mapnik: unbreak with ICU 61
src/text/text_layout.cpp:234:5: error: unknown type name 'Locale'; did you mean 'icu::Locale'?
Locale locale; // TODO: Is the default constructor correct?
^~~~~~
icu::Locale
/usr/local/include/unicode/locid.h:188:20: note: 'icu::Locale' declared here
class U_COMMON_API Locale : public UObject {
^
src/text/text_layout.cpp:236:21: error: unknown type name 'BreakIterator'; did you mean 'UBreakIterator'?
std::unique_ptr<BreakIterator> breakitr(BreakIterator::createLineInstance(locale, status));
^~~~~~~~~~~~~
UBreakIterator
/usr/local/include/unicode/ustring.h:33:35: note: 'UBreakIterator' declared here
typedef struct UBreakIterator UBreakIterator;
^
src/text/text_layout.cpp:236:45: error: use of undeclared identifier 'BreakIterator'; did you mean 'UBreakIterator'?
std::unique_ptr<BreakIterator> breakitr(BreakIterator::createLineInstance(locale, status));
^~~~~~~~~~~~~
UBreakIterator
/usr/local/include/unicode/ustring.h:33:35: note: 'UBreakIterator' declared here
typedef struct UBreakIterator UBreakIterator;
^
src/text/text_layout.cpp:236:45: error: incomplete type 'UBreakIterator' named in nested name specifier
std::unique_ptr<BreakIterator> breakitr(BreakIterator::createLineInstance(locale, status));
^~~~~~~~~~~~~~~
/usr/local/include/unicode/ustring.h:33:20: note: forward declaration of 'UBreakIterator'
typedef struct UBreakIterator UBreakIterator;
^
src/text/text_layout.cpp:247:13: error: member access into incomplete type 'UBreakIterator'
breakitr->setText(text);
^
/usr/local/include/unicode/ustring.h:33:20: note: forward declaration of 'UBreakIterator'
typedef struct UBreakIterator UBreakIterator;
^
src/text/text_layout.cpp:260:53: error: member access into incomplete type 'UBreakIterator'
int break_position = wrap_before_ ? breakitr->preceding(i + 1) : breakitr->following(i);
^
/usr/local/include/unicode/ustring.h:33:20: note: forward declaration of 'UBreakIterator'
typedef struct UBreakIterator UBreakIterator;
^
src/text/text_layout.cpp:260:55: error: expected ':'
int break_position = wrap_before_ ? breakitr->preceding(i + 1) : breakitr->following(i);
^
:
src/text/text_layout.cpp:260:43: note: to match this '?'
int break_position = wrap_before_ ? breakitr->preceding(i + 1) : breakitr->following(i);
^
src/text/text_layout.cpp:260:55: error: use of undeclared identifier 'preceding'
int break_position = wrap_before_ ? breakitr->preceding(i + 1) : breakitr->following(i);
^
src/text/text_layout.cpp:263:89: error: use of undeclared identifier 'BreakIterator'; did you mean 'UBreakIterator'?
if (break_position <= last_break_position || break_position == static_cast<int>(BreakIterator::DONE))
^~~~~~~~~~~~~
UBreakIterator
/usr/local/include/unicode/ustring.h:33:35: note: 'UBreakIterator' declared here
typedef struct UBreakIterator UBreakIterator;
^
src/text/text_layout.cpp:263:89: error: incomplete type 'UBreakIterator' named in nested name specifier
if (break_position <= last_break_position || break_position == static_cast<int>(BreakIterator::DONE))
^~~~~~~~~~~~~~~
/usr/local/include/unicode/ustring.h:33:20: note: forward declaration of 'UBreakIterator'
typedef struct UBreakIterator UBreakIterator;
^
src/text/text_layout.cpp:267:38: error: member access into incomplete type 'UBreakIterator'
break_position = breakitr->following(i);
^
/usr/local/include/unicode/ustring.h:33:20: note: forward declaration of 'UBreakIterator'
typedef struct UBreakIterator UBreakIterator;
^
src/text/text_layout.cpp:268:52: error: use of undeclared identifier 'BreakIterator'; did you mean 'UBreakIterator'?
if (break_position == static_cast<int>(BreakIterator::DONE))
^~~~~~~~~~~~~
UBreakIterator
/usr/local/include/unicode/ustring.h:33:35: note: 'UBreakIterator' declared here
typedef struct UBreakIterator UBreakIterator;
^
src/text/text_layout.cpp:268:52: error: incomplete type 'UBreakIterator' named in nested name specifier
if (break_position == static_cast<int>(BreakIterator::DONE))
^~~~~~~~~~~~~~~
/usr/local/include/unicode/ustring.h:33:20: note: forward declaration of 'UBreakIterator'
typedef struct UBreakIterator UBreakIterator;
^
src/text/text_layout.cpp:373:89: error: use of undeclared identifier 'BreakIterator'; did you mean 'UBreakIterator'?
if (break_position <= last_break_position || break_position == static_cast<int>(BreakIterator::DONE))
^~~~~~~~~~~~~
UBreakIterator
/usr/local/include/unicode/ustring.h:33:35: note: 'UBreakIterator' declared here
typedef struct UBreakIterator UBreakIterator;
^
src/text/text_layout.cpp:373:89: error: incomplete type 'UBreakIterator' named in nested name specifier
if (break_position <= last_break_position || break_position == static_cast<int>(BreakIterator::DONE))
^~~~~~~~~~~~~~~
/usr/local/include/unicode/ustring.h:33:20: note: forward declaration of 'UBreakIterator'
typedef struct UBreakIterator UBreakIterator;
^
src/text/text_layout.cpp:376:52: error: use of undeclared identifier 'BreakIterator'; did you mean 'UBreakIterator'?
if (break_position == static_cast<int>(BreakIterator::DONE))
^~~~~~~~~~~~~
UBreakIterator
/usr/local/include/unicode/ustring.h:33:35: note: 'UBreakIterator' declared here
typedef struct UBreakIterator UBreakIterator;
^
src/text/text_layout.cpp:376:52: error: incomplete type 'UBreakIterator' named in nested name specifier
if (break_position == static_cast<int>(BreakIterator::DONE))
^~~~~~~~~~~~~~~
/usr/local/include/unicode/ustring.h:33:20: note: forward declaration of 'UBreakIterator'
typedef struct UBreakIterator UBreakIterator;
^
https://ssl.icu-project.org/trac/changeset/40705
PR: 227042
Reported by: antoine (via exp-run)
Obtained from: upstream
Modified:
head/graphics/mapnik/Makefile (contents, props changed)
head/graphics/mapnik/distinfo (contents, props changed)
Modified: head/graphics/mapnik/Makefile
==============================================================================
--- head/graphics/mapnik/Makefile Wed Apr 4 09:38:04 2018 (r466409)
+++ head/graphics/mapnik/Makefile Wed Apr 4 09:46:30 2018 (r466410)
@@ -8,6 +8,9 @@ PORTREVISION= 16
CATEGORIES= graphics geography
MASTER_SITES= http://mapnik.s3.amazonaws.com/dist/v${PORTVERSION}/
+PATCH_SITES= https://github.com/mapnik/mapnik/commit/
+PATCHFILES= 1ddfe6c31548.patch:-p1
+
MAINTAINER= littlesavage at rambler.ru
COMMENT= Free Toolkit For Developing Mapping Applications
Modified: head/graphics/mapnik/distinfo
==============================================================================
--- head/graphics/mapnik/distinfo Wed Apr 4 09:38:04 2018 (r466409)
+++ head/graphics/mapnik/distinfo Wed Apr 4 09:46:30 2018 (r466410)
@@ -1,2 +1,5 @@
+TIMESTAMP = 1448548335
SHA256 (mapnik-v3.0.9.tar.bz2) = 3a3f67532b05f8a527a5bab32effd7dd5aa59165c7e24505268f6d827955d3da
SIZE (mapnik-v3.0.9.tar.bz2) = 75213927
+SHA256 (1ddfe6c31548.patch) = fab754996485dc607108a4fd69d0df82414928eb5a210b329a84f47e90da0c8a
+SIZE (1ddfe6c31548.patch) = 2148
More information about the svn-ports-head
mailing list