aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjbeich <jbeich@FreeBSD.org>2018-04-04 16:03:58 +0800
committerjbeich <jbeich@FreeBSD.org>2018-04-04 16:03:58 +0800
commit72e64193ea42beed83e24f41e4371bf99b4dc863 (patch)
tree9834233e2bb2487d1b89861b7df377e1632b0514
parent8239b2979f440eb48f64f1ea7e40b7866910b793 (diff)
downloadfreebsd-ports-gnome-72e64193ea42beed83e24f41e4371bf99b4dc863.tar.gz
freebsd-ports-gnome-72e64193ea42beed83e24f41e4371bf99b4dc863.tar.zst
freebsd-ports-gnome-72e64193ea42beed83e24f41e4371bf99b4dc863.zip
misc/sword: unbreak with ICU 61
In file included from ../src/mgr/swmgr.cpp:108: ../include/utf8transliterator.h:53:2: error: unknown type name 'UnicodeString'; did you mean 'icu::UnicodeString'? UnicodeString resource; ^~~~~~~~~~~~~ icu::UnicodeString /usr/local/include/unicode/unistr.h:286:20: note: 'icu::UnicodeString' declared here class U_COMMON_API UnicodeString : public Replaceable ^ In file included from ../src/mgr/swmgr.cpp:108: ../include/utf8transliterator.h:56:24: error: unknown type name 'UnicodeString'; did you mean 'icu::UnicodeString'? typedef std::map<const UnicodeString, SWTransData> SWTransMap; ^~~~~~~~~~~~~ icu::UnicodeString /usr/local/include/unicode/unistr.h:286:20: note: 'icu::UnicodeString' declared here class U_COMMON_API UnicodeString : public Replaceable ^ In file included from ../src/mgr/swmgr.cpp:108: ../include/utf8transliterator.h:57:19: error: use of undeclared identifier 'UnicodeString' typedef std::pair<UnicodeString, SWTransData> SWTransPair; ^ ../include/utf8transliterator.h:84:2: error: unknown type name 'Transliterator'; did you mean 'UTransliterator'? Transliterator *createTrans(const UnicodeString& ID, UTransDirection dir, UErrorCode &status); ^~~~~~~~~~~~~~ UTransliterator /usr/local/include/unicode/utrans.h:70:15: note: 'UTransliterator' declared here typedef void* UTransliterator; ^ In file included from ../src/mgr/swmgr.cpp:108: ../include/utf8transliterator.h:84:36: error: unknown type name 'UnicodeString'; did you mean 'icu::UnicodeString'? Transliterator *createTrans(const UnicodeString& ID, UTransDirection dir, UErrorCode &status); ^~~~~~~~~~~~~ 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)
-rw-r--r--misc/sword/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/misc/sword/Makefile b/misc/sword/Makefile
index 1b1fd2339e34..7200f4f89b8e 100644
--- a/misc/sword/Makefile
+++ b/misc/sword/Makefile
@@ -16,6 +16,7 @@ BUILD_DEPENDS= cppunit-config:devel/cppunit
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-conf --with-zlib
+CPPFLAGS+= -DU_USING_ICU_NAMESPACE=1
INSTALL_TARGET= install-strip
USES= gmake libtool pathfix pkgconfig
USE_LDCONFIG= yes