svn commit: r466411 - head/multimedia/aegisub

[Jan Beich]

Author: jbeich
Date: Wed Apr  4 09:46:40 2018
New Revision: 466411
URL: https://svnweb.freebsd.org/changeset/ports/466411

Log:
  multimedia/aegisub: unbreak with ICU 61
  
  libaegisub/common/character_count.cpp:41:12: error: use of undeclared identifier 'BreakIterator'; did you mean 'UBreakIterator'?
                  bi.reset(BreakIterator::createCharacterInstance(Locale::getDefault(), status));
                           ^~~~~~~~~~~~~
                           UBreakIterator
  /usr/local/include/unicode/ubrk.h:28:35: note: 'UBreakIterator' declared here
      typedef struct UBreakIterator UBreakIterator;
                                    ^
  libaegisub/common/character_count.cpp:41:12: error: incomplete type 'UBreakIterator' named in nested name specifier
                  bi.reset(BreakIterator::createCharacterInstance(Locale::getDefault(), status));
                           ^~~~~~~~~~~~~~~
  /usr/local/include/unicode/ubrk.h:28:20: note: forward declaration of 'UBreakIterator'
      typedef struct UBreakIterator UBreakIterator;
                     ^
  libaegisub/common/character_count.cpp:41:51: error: use of undeclared identifier 'Locale'; did you mean 'icu::Locale'?
                  bi.reset(BreakIterator::createCharacterInstance(Locale::getDefault(), status));
                                                                  ^~~~~~
                                                                  icu::Locale
  /usr/local/include/unicode/locid.h:188:20: note: 'icu::Locale' declared here
  class U_COMMON_API Locale : public UObject {
                     ^
  libaegisub/common/character_count.cpp:63:46: error: use of undeclared identifier 'BreakIterator'; did you mean 'UBreakIterator'?
          for (auto end = character_bi.next(); end != BreakIterator::DONE; pos = end, end = character_bi.next()) {
                                                      ^~~~~~~~~~~~~
                                                      UBreakIterator
  /usr/local/include/unicode/ubrk.h:28:35: note: 'UBreakIterator' declared here
      typedef struct UBreakIterator UBreakIterator;
                                    ^
  libaegisub/common/character_count.cpp:63:46: error: incomplete type 'UBreakIterator' named in nested name specifier
          for (auto end = character_bi.next(); end != BreakIterator::DONE; pos = end, end = character_bi.next()) {
                                                      ^~~~~~~~~~~~~~~
  /usr/local/include/unicode/ubrk.h:28:20: note: forward declaration of 'UBreakIterator'
      typedef struct UBreakIterator UBreakIterator;
                     ^
  libaegisub/common/character_count.cpp:148:14: error: use of undeclared identifier 'BreakIterator'; did you mean 'UBreakIterator'?
                  if (end == BreakIterator::DONE)
                             ^~~~~~~~~~~~~
                             UBreakIterator
  /usr/local/include/unicode/ubrk.h:28:35: note: 'UBreakIterator' declared here
      typedef struct UBreakIterator UBreakIterator;
                                    ^
  libaegisub/common/character_count.cpp:148:14: error: incomplete type 'UBreakIterator' named in nested name specifier
                  if (end == BreakIterator::DONE)
                             ^~~~~~~~~~~~~~~
  /usr/local/include/unicode/ubrk.h:28: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)

Modified:
  head/multimedia/aegisub/Makefile   (contents, props changed)

Modified: head/multimedia/aegisub/Makefile
==============================================================================
--- head/multimedia/aegisub/Makefile	Wed Apr  4 09:46:30 2018	(r466410)
+++ head/multimedia/aegisub/Makefile	Wed Apr  4 09:46:40 2018	(r466411)
@@ -28,6 +28,7 @@ WX_CONF_ARGS=	absolute
 USE_GL=		gl
 USE_CSTD=	c99
 USE_CXXSTD=	c++11
+CPPFLAGS+=	-DU_USING_ICU_NAMESPACE=1
 CXXFLAGS+=	-D_GLIBCXX_USE_C99 # XXX ports/193528
 LDFLAGS+=	-Wl,--as-needed # freetype
 GNU_CONFIGURE=	yes