From owner-svn-ports-all@freebsd.org Wed Apr 4 10:11:14 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5ED2DF8077C; Wed, 4 Apr 2018 10:11:14 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 34619703AD; Wed, 4 Apr 2018 10:11:14 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2F64D124BC; Wed, 4 Apr 2018 10:11:14 +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 w34ABE3g044553; Wed, 4 Apr 2018 10:11:14 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w34ABE6r044552; Wed, 4 Apr 2018 10:11:14 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201804041011.w34ABE6r044552@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 4 Apr 2018 10:11:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r466415 - head/games/0ad X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/games/0ad X-SVN-Commit-Revision: 466415 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.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Apr 2018 10:11:14 -0000 Author: jbeich Date: Wed Apr 4 10:11:13 2018 New Revision: 466415 URL: https://svnweb.freebsd.org/changeset/ports/466415 Log: games/0ad: unbreak with ICU 61 In file included from ../../../source/lobby/XmppClient.cpp:26: ../../../source/i18n/L10n.h:89:2: error: unknown type name 'Locale'; did you mean 'icu::Locale'? Locale GetCurrentLocale() const; ^~~~~~ icu::Locale /usr/local/include/unicode/unistr.h:77:7: note: 'icu::Locale' declared here class Locale; // unicode/locid.h ^ In file included from ../../../source/lobby/XmppClient.cpp:26: ../../../source/i18n/L10n.h:133:24: error: unknown type name 'Locale'; did you mean 'icu::Locale'? bool SaveLocale(const Locale& locale) const; ^~~~~~ icu::Locale /usr/local/include/unicode/unistr.h:77:7: note: 'icu::Locale' declared here class Locale; // unicode/locid.h ^ In file included from ../../../source/lobby/XmppClient.cpp:26: ../../../source/i18n/L10n.h:235:54: error: unknown type name 'Locale'; did you mean 'icu::Locale'? std::wstring GetFallbackToAvailableDictLocale(const Locale& locale) const; ^~~~~~ icu::Locale /usr/local/include/unicode/unistr.h:77:7: note: 'icu::Locale' declared here class Locale; // unicode/locid.h ^ In file included from ../../../source/lobby/XmppClient.cpp:26: ../../../source/i18n/L10n.h:283:66: error: unknown type name 'Locale'; did you mean 'icu::Locale'? void GetDictionaryLocale(const std::string& configLocaleString, Locale& outLocale) const; ^~~~~~ icu::Locale /usr/local/include/unicode/unistr.h:77:7: note: 'icu::Locale' declared here class Locale; // unicode/locid.h ^ In file included from ../../../source/lobby/XmppClient.cpp:26: ../../../source/i18n/L10n.h:314:28: error: unknown type name 'Locale'; did you mean 'icu::Locale'? bool ValidateLocale(const Locale& locale) const; ^~~~~~ icu::Locale /usr/local/include/unicode/unistr.h:77:7: note: 'icu::Locale' declared here class Locale; // unicode/locid.h ^ In file included from ../../../source/lobby/XmppClient.cpp:26: ../../../source/i18n/L10n.h:411:98: error: unknown type name 'Locale'; did you mean 'icu::Locale'? UDate ParseDateTime(const std::string& dateTimeString, const std::string& dateTimeFormat, const Locale& locale) const; ^~~~~~ icu::Locale /usr/local/include/unicode/unistr.h:77:7: note: 'icu::Locale' declared here class Locale; // unicode/locid.h ^ In file included from ../../../source/lobby/XmppClient.cpp:26: ../../../source/i18n/L10n.h:427:85: error: use of undeclared identifier 'DateFormat'; did you mean 'icu::DateFormat'? std::string LocalizeDateTime(const UDate dateTime, const DateTimeType& type, const DateFormat::EStyle& style) const; ^~~~~~~~~~ icu::DateFormat /usr/local/include/unicode/smpdtfmt.h:46:7: note: 'icu::DateFormat' declared here class DateFormat; ^ In file included from ../../../source/lobby/XmppClient.cpp:26: ../../../source/i18n/L10n.h:508:2: error: unknown type name 'Locale'; did you mean 'icu::Locale'? Locale currentLocale; ^~~~~~ icu::Locale /usr/local/include/unicode/unistr.h:77:7: note: 'icu::Locale' declared here class Locale; // unicode/locid.h ^ In file included from ../../../source/lobby/XmppClient.cpp:26: ../../../source/i18n/L10n.h:519:14: error: use of undeclared identifier 'Locale' std::vector availableLocales; ^ ../../../source/i18n/L10n.h:519:21: error: expected expression std::vector availableLocales; ^ ../../../source/i18n/L10n.h:590:2: error: unknown type name 'DateFormat'; did you mean 'UDateFormat'? DateFormat* CreateDateTimeInstance(const DateTimeType& type, const DateFormat::EStyle& style, const Locale& locale) const; ^~~~~~~~~~ UDateFormat /usr/local/include/unicode/udat.h:153:15: note: 'UDateFormat' declared here typedef void* UDateFormat; ^ In file included from ../../../source/lobby/XmppClient.cpp:26: ../../../source/i18n/L10n.h:590:69: error: use of undeclared identifier 'DateFormat'; did you mean 'icu::DateFormat'? DateFormat* CreateDateTimeInstance(const DateTimeType& type, const DateFormat::EStyle& style, const Locale& locale) const; ^~~~~~~~~~ icu::DateFormat /usr/local/include/unicode/smpdtfmt.h:46:7: note: 'icu::DateFormat' declared here class DateFormat; ^ In file included from ../../../source/lobby/XmppClient.cpp:26: ../../../source/i18n/L10n.h:590:102: error: unknown type name 'Locale'; did you mean 'icu::Locale'? DateFormat* CreateDateTimeInstance(const DateTimeType& type, const DateFormat::EStyle& style, const Locale& locale) const; ^~~~~~ icu::Locale /usr/local/include/unicode/unistr.h:77:7: note: 'icu::Locale' declared here class Locale; // unicode/locid.h ^ ../../../source/lobby/XmppClient.cpp:948:81: error: use of undeclared identifier 'Locale'; did you mean 'icu::Locale'? return g_L10n.ParseDateTime(msg.when()->stamp().to_string(), "Y-M-d'T'H:m:sZ", Locale::getUS()) / 1000.0; ^~~~~~ icu::Locale /usr/local/include/unicode/unistr.h:77:7: note: 'icu::Locale' declared here class Locale; // unicode/locid.h ^ https://ssl.icu-project.org/trac/changeset/40705 PR: 227042 Reported by: antoine (via exp-run) Modified: head/games/0ad/Makefile (contents, props changed) Modified: head/games/0ad/Makefile ============================================================================== --- head/games/0ad/Makefile Wed Apr 4 10:10:26 2018 (r466414) +++ head/games/0ad/Makefile Wed Apr 4 10:11:13 2018 (r466415) @@ -29,6 +29,7 @@ LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-alpha BUILD_WRKSRC= ${WRKSRC}/build/workspaces/gcc MAKE_ARGS= config=release +CPPFLAGS+= -DU_USING_ICU_NAMESPACE=1 USES= compiler:c++11-lib dos2unix gmake iconv jpeg openal:al \ pkgconfig python:build tar:xz USE_GNOME= libxml2 gtk20