svn commit: r466414 - head/games/widelands/files

Jan Beich jbeich at FreeBSD.org
Wed Apr 4 10:10:27 UTC 2018


Author: jbeich
Date: Wed Apr  4 10:10:26 2018
New Revision: 466414
URL: https://svnweb.freebsd.org/changeset/ports/466414

Log:
  games/widelands: unbreak with ICU 61
  
  In file included from src/graphic/font_handler.cc:36:
  src/graphic/text/bidi.h:43:36: error: unknown type name 'UnicodeString'; did you mean 'icu::UnicodeString'?
  std::string icustring2string(const UnicodeString& convertme);
                                     ^~~~~~~~~~~~~
                                     icu::UnicodeString
  /usr/local/include/unicode/unistr.h:286:20: note: 'icu::UnicodeString' declared here
  class U_COMMON_API UnicodeString : public Replaceable
                     ^
  
  https://ssl.icu-project.org/trac/changeset/40705
  
  PR:		227042
  Reported by:	antoine (via exp-run)
  Obtained from:	upstream

Added:
  head/games/widelands/files/patch-src_graphic_text_bidi.h   (contents, props changed)

Added: head/games/widelands/files/patch-src_graphic_text_bidi.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/widelands/files/patch-src_graphic_text_bidi.h	Wed Apr  4 10:10:26 2018	(r466414)
@@ -0,0 +1,13 @@
+https://bazaar.launchpad.net/~widelands-dev/widelands/trunk/revision/8641
+
+--- src/graphic/text/bidi.h.orig	2016-11-10 07:28:01 UTC
++++ src/graphic/text/bidi.h
+@@ -40,7 +40,7 @@ bool has_rtl_character(std::vector<std::string> input)
+ // True if a string contains a character from the script's code blocks
+ bool has_script_character(const char* input, UI::FontSets::Selector script);
+ UI::FontSet const* find_fontset(const char* word, const UI::FontSets& fontsets);
+-std::string icustring2string(const UnicodeString& convertme);
++std::string icustring2string(const icu::UnicodeString& convertme);
+ std::string icuchar2string(const UChar& convertme);
+ bool cannot_start_line(const UChar& c);
+ bool cannot_end_line(const UChar& c);


More information about the svn-ports-head mailing list