svn commit: r466398 - in head/devel: pecl-intl php70-intl php71-intl php72-intl

[Jan Beich]

Author: jbeich
Date: Wed Apr  4 08:20:59 2018
New Revision: 466398
URL: https://svnweb.freebsd.org/changeset/ports/466398

Log:
  devel/php*-intl: unbreak with ICU 61
  
  In file included from ext/intl/intl_convertcpp.cpp:21:
  ./intl_convertcpp.h:29:25: error: unknown type name 'UnicodeString'
  int intl_stringFromChar(UnicodeString &ret, char *str, size_t str_len, UErrorCode *status);
                          ^
  ./intl_convertcpp.h:31:40: error: unknown type name 'UnicodeString'; did you mean 'icu::UnicodeString'?
  zend_string* intl_charFromString(const UnicodeString &from, UErrorCode *status);
                                         ^~~~~~~~~~~~~
                                         icu::UnicodeString
  /usr/local/include/unicode/unistr.h:286:20: note: 'icu::UnicodeString' declared here
  class U_COMMON_API UnicodeString : public Replaceable
                     ^
  ext/intl/intl_convertcpp.cpp:28:25: error: unknown type name 'UnicodeString'
  int intl_stringFromChar(UnicodeString &ret, char *str, size_t str_len, UErrorCode *status)
                          ^
  ext/intl/intl_convertcpp.cpp:59:40: error: unknown type name 'UnicodeString'; did you mean 'icu::UnicodeString'?
  zend_string* intl_charFromString(const UnicodeString &from, 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)

Modified:
  head/devel/pecl-intl/Makefile   (contents, props changed)
  head/devel/php70-intl/Makefile   (contents, props changed)
  head/devel/php71-intl/Makefile   (contents, props changed)
  head/devel/php72-intl/Makefile   (contents, props changed)

Modified: head/devel/pecl-intl/Makefile
==============================================================================
--- head/devel/pecl-intl/Makefile	Wed Apr  4 08:03:58 2018	(r466397)
+++ head/devel/pecl-intl/Makefile	Wed Apr  4 08:20:59 2018	(r466398)
@@ -17,4 +17,6 @@ IGNORE_WITH_PHP=70 71 72
 USES=		compiler:c++11-lib php:pecl
 USE_CXXSTD=	gnu++11
 
+CPPFLAGS+=	-DU_USING_ICU_NAMESPACE=1
+
 .include <bsd.port.mk>

Modified: head/devel/php70-intl/Makefile
==============================================================================
--- head/devel/php70-intl/Makefile	Wed Apr  4 08:03:58 2018	(r466397)
+++ head/devel/php70-intl/Makefile	Wed Apr  4 08:20:59 2018	(r466398)
@@ -10,4 +10,6 @@ PKGNAMESUFFIX=	-intl
 USES=		compiler:c++11-lib
 USE_CXXSTD=	gnu++11
 
+CPPFLAGS+=	-DU_USING_ICU_NAMESPACE=1
+
 .include "${MASTERDIR}/Makefile"

Modified: head/devel/php71-intl/Makefile
==============================================================================
--- head/devel/php71-intl/Makefile	Wed Apr  4 08:03:58 2018	(r466397)
+++ head/devel/php71-intl/Makefile	Wed Apr  4 08:20:59 2018	(r466398)
@@ -9,4 +9,6 @@ PKGNAMESUFFIX=	-intl
 USES=		compiler:c++11-lib
 USE_CXXSTD=	gnu++11
 
+CPPFLAGS+=	-DU_USING_ICU_NAMESPACE=1
+
 .include "${MASTERDIR}/Makefile"

Modified: head/devel/php72-intl/Makefile
==============================================================================
--- head/devel/php72-intl/Makefile	Wed Apr  4 08:03:58 2018	(r466397)
+++ head/devel/php72-intl/Makefile	Wed Apr  4 08:20:59 2018	(r466398)
@@ -9,4 +9,6 @@ PKGNAMESUFFIX=	-intl
 USES=		compiler:c++11-lib
 USE_CXXSTD=	gnu++11
 
+CPPFLAGS+=	-DU_USING_ICU_NAMESPACE=1
+
 .include "${MASTERDIR}/Makefile"