Mon Nov 16 12:10:05 2020 UTC ()
php56: Fix php-intl module build with textproc/icu-68.1
(ryoon)
diff -r1.56 -r1.57 pkgsrc/lang/php56/distinfo
diff -r0 -r1.1 pkgsrc/lang/php56/patches/patch-ext_intl_breakiterator_codepointiterator__internal.cpp
diff -r0 -r1.1 pkgsrc/lang/php56/patches/patch-ext_intl_collator_collator__convert.c
diff -r0 -r1.1 pkgsrc/lang/php56/patches/patch-ext_intl_collator_collator__error.c
diff -r0 -r1.1 pkgsrc/lang/php56/patches/patch-ext_intl_collator_collator__locale.c
diff -r0 -r1.1 pkgsrc/lang/php56/patches/patch-ext_intl_collator_collator__sort.c
diff -r0 -r1.1 pkgsrc/lang/php56/patches/patch-ext_intl_common_common__error.c
diff -r0 -r1.1 pkgsrc/lang/php56/patches/patch-ext_intl_dateformat_dateformat__attr.c
diff -r0 -r1.1 pkgsrc/lang/php56/patches/patch-ext_intl_locale_locale__methods.c
diff -r0 -r1.1 pkgsrc/lang/php56/patches/patch-ext_intl_normalizer_normalizer__normalize.c
diff -r0 -r1.1 pkgsrc/lang/php56/patches/patch-ext_intl_timezone_timezone__class.cpp
diff -r0 -r1.1 pkgsrc/lang/php56/patches/patch-ext_intl_timezone_timezone__methods.cpp
diff -r1.43 -r1.44 pkgsrc/textproc/php-intl/Makefile
--- pkgsrc/lang/php56/distinfo 2019/11/25 03:12:50 1.56
+++ pkgsrc/lang/php56/distinfo 2020/11/16 12:10:05 1.57
| @@ -1,28 +1,39 @@ | | | @@ -1,28 +1,39 @@ |
1 | $NetBSD: distinfo,v 1.56 2019/11/25 03:12:50 taca Exp $ | | 1 | $NetBSD: distinfo,v 1.57 2020/11/16 12:10:05 ryoon Exp $ |
2 | | | 2 | |
3 | SHA1 (PHP-5.6.31-OpenSSL-1.1.0-compatibility-20170801.patch) = 980b9f3f2e62a7360904b5b2107a4213bd052caa | | 3 | SHA1 (PHP-5.6.31-OpenSSL-1.1.0-compatibility-20170801.patch) = 980b9f3f2e62a7360904b5b2107a4213bd052caa |
4 | RMD160 (PHP-5.6.31-OpenSSL-1.1.0-compatibility-20170801.patch) = 4eeb1cc0364da69920c3d101a2f1a882550721a7 | | 4 | RMD160 (PHP-5.6.31-OpenSSL-1.1.0-compatibility-20170801.patch) = 4eeb1cc0364da69920c3d101a2f1a882550721a7 |
5 | SHA512 (PHP-5.6.31-OpenSSL-1.1.0-compatibility-20170801.patch) = bbe39ad27a5a82c705692c921b214c5630227ed9852f0432340f74533b5e618d9bea01bff75a4b7a1f1b72876b6d092d2db4533758d9a927f274cff7361f3eb4 | | 5 | SHA512 (PHP-5.6.31-OpenSSL-1.1.0-compatibility-20170801.patch) = bbe39ad27a5a82c705692c921b214c5630227ed9852f0432340f74533b5e618d9bea01bff75a4b7a1f1b72876b6d092d2db4533758d9a927f274cff7361f3eb4 |
6 | Size (PHP-5.6.31-OpenSSL-1.1.0-compatibility-20170801.patch) = 41904 bytes | | 6 | Size (PHP-5.6.31-OpenSSL-1.1.0-compatibility-20170801.patch) = 41904 bytes |
7 | SHA1 (php-5.6.40.tar.xz) = 0403ae06273fe8c1acdbd45b181a8a53f4b0b4d7 | | 7 | SHA1 (php-5.6.40.tar.xz) = 0403ae06273fe8c1acdbd45b181a8a53f4b0b4d7 |
8 | RMD160 (php-5.6.40.tar.xz) = 43b648cf24cdea59765a1d12c247f83f60af283f | | 8 | RMD160 (php-5.6.40.tar.xz) = 43b648cf24cdea59765a1d12c247f83f60af283f |
9 | SHA512 (php-5.6.40.tar.xz) = 997b5a952a60cf9166671cc91fcc34c674dd62bfd5cb0a9cdf3fdf2d088b5d19943d94c1cf193f8ab71fc4957d9a9a4c7c2fb8826f937501c1c0a0858f10e329 | | 9 | SHA512 (php-5.6.40.tar.xz) = 997b5a952a60cf9166671cc91fcc34c674dd62bfd5cb0a9cdf3fdf2d088b5d19943d94c1cf193f8ab71fc4957d9a9a4c7c2fb8826f937501c1c0a0858f10e329 |
10 | Size (php-5.6.40.tar.xz) = 12472236 bytes | | 10 | Size (php-5.6.40.tar.xz) = 12472236 bytes |
11 | SHA1 (patch-acinclude.m4) = 34d38d2538cc00932cdfcc80d1d4a91632cd15d0 | | 11 | SHA1 (patch-acinclude.m4) = 34d38d2538cc00932cdfcc80d1d4a91632cd15d0 |
12 | SHA1 (patch-configure) = a5623b0cbb3331fd0a537b26c0ae48315d52dbe2 | | 12 | SHA1 (patch-configure) = a5623b0cbb3331fd0a537b26c0ae48315d52dbe2 |
13 | SHA1 (patch-disable-filter-url) = a2b08912d81f2872bf1834fa4cefddb044c9d0f8 | | 13 | SHA1 (patch-disable-filter-url) = a2b08912d81f2872bf1834fa4cefddb044c9d0f8 |
14 | SHA1 (patch-ext_gd_config.m4) = b92ab4c7fe8aceaef7787a607a7d2eac258fee19 | | 14 | SHA1 (patch-ext_gd_config.m4) = b92ab4c7fe8aceaef7787a607a7d2eac258fee19 |
15 | SHA1 (patch-ext_imap_config.m4) = 9c6ed6966366c4fe1b7cfd34b5910e2ff0e68577 | | 15 | SHA1 (patch-ext_imap_config.m4) = 9c6ed6966366c4fe1b7cfd34b5910e2ff0e68577 |
| | | 16 | SHA1 (patch-ext_intl_breakiterator_codepointiterator__internal.cpp) = f4cf2a1cc650ed9a4291924c2ed9fcbd7061e33b |
| | | 17 | SHA1 (patch-ext_intl_collator_collator__convert.c) = 91f5b8458eebc0c2f3871f76a522f627e4cf4fbf |
| | | 18 | SHA1 (patch-ext_intl_collator_collator__error.c) = 94a26ee166506f7f77dd762e9c789d0e803f2b3c |
| | | 19 | SHA1 (patch-ext_intl_collator_collator__locale.c) = ab48d5fac5a80b1c4c25fef61993a889a8014e3f |
| | | 20 | SHA1 (patch-ext_intl_collator_collator__sort.c) = f21e117180a7c8d999e13e77ff078e55c3481562 |
| | | 21 | SHA1 (patch-ext_intl_common_common__error.c) = 2afa6a5c908de7347e49030b7d4b5e8f41b6eda5 |
| | | 22 | SHA1 (patch-ext_intl_dateformat_dateformat__attr.c) = 4567753a7f6d4a6229ab8ab67f16f668aeb8bf6f |
| | | 23 | SHA1 (patch-ext_intl_locale_locale__methods.c) = 10e946194686539178e52116303951e3a1c8397c |
| | | 24 | SHA1 (patch-ext_intl_normalizer_normalizer__normalize.c) = 8031fa56c927781f3094d484a2cf15d365f9e1f6 |
| | | 25 | SHA1 (patch-ext_intl_timezone_timezone__class.cpp) = b76ba1df02e854b9fae27c4c3dd554fba91aadfa |
| | | 26 | SHA1 (patch-ext_intl_timezone_timezone__methods.cpp) = fc3a99380f1c29553621cb864493d6d79b4d737a |
16 | SHA1 (patch-ext_mssql_php__mssql.c) = c4fa9231dc539ffb027f1beb6f182f21ddb94a3c | | 27 | SHA1 (patch-ext_mssql_php__mssql.c) = c4fa9231dc539ffb027f1beb6f182f21ddb94a3c |
17 | SHA1 (patch-ext_pcre_pcrelib_config.h) = 26588e9932ee715e32c872a1c7e2f9c640bd9cf8 | | 28 | SHA1 (patch-ext_pcre_pcrelib_config.h) = 26588e9932ee715e32c872a1c7e2f9c640bd9cf8 |
18 | SHA1 (patch-ext_pdo__mysql_config.m4) = 9d25c673fc151e1b8ae137f2a0fc540189ef5398 | | 29 | SHA1 (patch-ext_pdo__mysql_config.m4) = 9d25c673fc151e1b8ae137f2a0fc540189ef5398 |
19 | SHA1 (patch-ext_pdo_config.m4) = f6deef3ac631769baa587dd7c27e55bd2e9ca6a5 | | 30 | SHA1 (patch-ext_pdo_config.m4) = f6deef3ac631769baa587dd7c27e55bd2e9ca6a5 |
20 | SHA1 (patch-ext_phar_Makefile.frag) = 1564c188e57d48f83de7c2420fdde183598539e2 | | 31 | SHA1 (patch-ext_phar_Makefile.frag) = 1564c188e57d48f83de7c2420fdde183598539e2 |
21 | SHA1 (patch-ext_phar_phar_phar.php) = 5a82d55c7965027115065412f9b68defb278db64 | | 32 | SHA1 (patch-ext_phar_phar_phar.php) = 5a82d55c7965027115065412f9b68defb278db64 |
22 | SHA1 (patch-ext_recode_recode.c) = a97a1815d6a41410f68c289debbb9396128a2159 | | 33 | SHA1 (patch-ext_recode_recode.c) = a97a1815d6a41410f68c289debbb9396128a2159 |
23 | SHA1 (patch-ext_standard_basic__functions.c) = 669fe55c975bf2d971f6fdcb5b3004f7e20304d2 | | 34 | SHA1 (patch-ext_standard_basic__functions.c) = 669fe55c975bf2d971f6fdcb5b3004f7e20304d2 |
24 | SHA1 (patch-ext_standard_php__dns.h) = 57c5d6d8ae60da58925abc2c51d66b56762fecda | | 35 | SHA1 (patch-ext_standard_php__dns.h) = 57c5d6d8ae60da58925abc2c51d66b56762fecda |
25 | SHA1 (patch-ext_tidy_tidy.c) = dd66f203196af544dcc06fe2229ba23c3086d3e8 | | 36 | SHA1 (patch-ext_tidy_tidy.c) = dd66f203196af544dcc06fe2229ba23c3086d3e8 |
26 | SHA1 (patch-ext_xsl_php__xsl.h) = a9877bff7bacc77926a4541a0ac171c00ad1a627 | | 37 | SHA1 (patch-ext_xsl_php__xsl.h) = a9877bff7bacc77926a4541a0ac171c00ad1a627 |
27 | SHA1 (patch-makedist) = 8e8660b2e0a34f06f433e24dbb0a9c872963e419 | | 38 | SHA1 (patch-makedist) = 8e8660b2e0a34f06f433e24dbb0a9c872963e419 |
28 | SHA1 (patch-php.ini-development) = 3c54a41310d28ecff4996c966934350368657c2f | | 39 | SHA1 (patch-php.ini-development) = 3c54a41310d28ecff4996c966934350368657c2f |
$NetBSD: patch-ext_intl_breakiterator_codepointiterator__internal.cpp,v 1.1 2020/11/16 12:10:05 ryoon Exp $
--- ext/intl/breakiterator/codepointiterator_internal.cpp.orig 2019-01-09 09:54:13.000000000 +0000
+++ ext/intl/breakiterator/codepointiterator_internal.cpp
@@ -55,7 +55,7 @@ CodePointBreakIterator& CodePointBreakIt
return *this;
}
- this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec);
+ this->fText = utext_clone(this->fText, that.fText, false, true, &uec);
//don't bother copying the character iterator, getText() is deprecated
clearCurrentCharIter();
@@ -75,17 +75,17 @@ CodePointBreakIterator::~CodePointBreakI
UBool CodePointBreakIterator::operator==(const BreakIterator& that) const
{
if (typeid(*this) != typeid(that)) {
- return FALSE;
+ return false;
}
const CodePointBreakIterator& that2 =
static_cast<const CodePointBreakIterator&>(that);
if (!utext_equals(this->fText, that2.fText)) {
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
CodePointBreakIterator* CodePointBreakIterator::clone(void) const
@@ -106,7 +106,7 @@ CharacterIterator& CodePointBreakIterato
UText *CodePointBreakIterator::getUText(UText *fillIn, UErrorCode &status) const
{
- return utext_clone(fillIn, this->fText, FALSE, TRUE, &status);
+ return utext_clone(fillIn, this->fText, false, true, &status);
}
void CodePointBreakIterator::setText(const UnicodeString &text)
@@ -125,7 +125,7 @@ void CodePointBreakIterator::setText(UTe
return;
}
- this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status);
+ this->fText = utext_clone(this->fText, text, false, true, &status);
clearCurrentCharIter();
}
@@ -277,7 +277,7 @@ CodePointBreakIterator &CodePointBreakIt
}
int64_t pos = utext_getNativeIndex(this->fText);
- this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status);
+ this->fText = utext_clone(this->fText, input, false, true, &status);
if (U_FAILURE(status)) {
return *this;
}
$NetBSD: patch-ext_intl_collator_collator__convert.c,v 1.1 2020/11/16 12:10:05 ryoon Exp $
* Fix build with textproc/icu-68.1.
--- ext/intl/collator/collator_convert.c.orig 2019-01-09 09:54:13.000000000 +0000
+++ ext/intl/collator/collator_convert.c
@@ -68,7 +68,7 @@ static void collator_convert_hash_item_f
/* Update current hash item with the converted value. */
MAKE_STD_ZVAL( znew_val );
- ZVAL_STRINGL( znew_val, (char*)new_val, UBYTES(new_val_len), FALSE );
+ ZVAL_STRINGL( znew_val, (char*)new_val, UBYTES(new_val_len), false );
if( hashKeyType == HASH_KEY_IS_STRING )
{
@@ -113,7 +113,7 @@ static void collator_convert_hash_item_f
/* Update current hash item with the converted value. */
MAKE_STD_ZVAL( znew_val );
- ZVAL_STRINGL( znew_val, (char*)new_val, new_val_len, FALSE );
+ ZVAL_STRINGL( znew_val, (char*)new_val, new_val_len, false );
if( hashKeyType == HASH_KEY_IS_STRING )
{
@@ -201,7 +201,7 @@ zval* collator_convert_zstr_utf16_to_utf
php_error( E_WARNING, "Error converting utf16 to utf8 in collator_convert_zval_utf16_to_utf8()" );
ALLOC_INIT_ZVAL( utf8_zval );
- ZVAL_STRINGL( utf8_zval, str, str_len, FALSE );
+ ZVAL_STRINGL( utf8_zval, str, str_len, false );
return utf8_zval;
}
@@ -232,7 +232,7 @@ zval* collator_convert_zstr_utf8_to_utf1
/* Set string. */
ALLOC_INIT_ZVAL( zstr );
- ZVAL_STRINGL( zstr, (char*)ustr, UBYTES(ustr_len), FALSE );
+ ZVAL_STRINGL( zstr, (char*)ustr, UBYTES(ustr_len), false );
return zstr;
}
@@ -307,7 +307,7 @@ zval* collator_convert_object_to_string(
zval_dtor( zstr );
/* Set string. */
- ZVAL_STRINGL( zstr, (char*)ustr, UBYTES(ustr_len), FALSE );
+ ZVAL_STRINGL( zstr, (char*)ustr, UBYTES(ustr_len), false );
/* Don't free ustr cause it's set in zstr without copy.
* efree( ustr );
$NetBSD: patch-ext_intl_collator_collator__error.c,v 1.1 2020/11/16 12:10:05 ryoon Exp $
--- ext/intl/collator/collator_error.c.orig 2019-01-09 09:54:13.000000000 +0000
+++ ext/intl/collator/collator_error.c
@@ -80,7 +80,7 @@ PHP_FUNCTION( collator_get_error_message
/* Return last error message. */
message = intl_error_get_message( COLLATOR_ERROR_P( co ) TSRMLS_CC );
- RETURN_STRING( (char*)message, FALSE );
+ RETURN_STRING( (char*)message, false );
}
/* }}} */
$NetBSD: patch-ext_intl_collator_collator__locale.c,v 1.1 2020/11/16 12:10:05 ryoon Exp $
--- ext/intl/collator/collator_locale.c.orig 2019-01-09 09:54:13.000000000 +0000
+++ ext/intl/collator/collator_locale.c
@@ -66,7 +66,7 @@ PHP_FUNCTION( collator_get_locale )
COLLATOR_CHECK_STATUS( co, "Error getting locale by type" );
/* Return it. */
- RETVAL_STRINGL( locale_name, strlen(locale_name), TRUE );
+ RETVAL_STRINGL( locale_name, strlen(locale_name), true );
}
/* }}} */
$NetBSD: patch-ext_intl_collator_collator__sort.c,v 1.1 2020/11/16 12:10:05 ryoon Exp $
--- ext/intl/collator/collator_sort.c.orig 2019-01-09 09:54:13.000000000 +0000
+++ ext/intl/collator/collator_sort.c
@@ -343,7 +343,7 @@ static void collator_sort_internal( int
*/
PHP_FUNCTION( collator_sort )
{
- collator_sort_internal( TRUE, INTERNAL_FUNCTION_PARAM_PASSTHRU );
+ collator_sort_internal( true, INTERNAL_FUNCTION_PARAM_PASSTHRU );
}
/* }}} */
@@ -535,7 +535,7 @@ PHP_FUNCTION( collator_sort_with_sort_ke
*/
PHP_FUNCTION( collator_asort )
{
- collator_sort_internal( FALSE, INTERNAL_FUNCTION_PARAM_PASSTHRU );
+ collator_sort_internal( false, INTERNAL_FUNCTION_PARAM_PASSTHRU );
}
/* }}} */
$NetBSD: patch-ext_intl_common_common__error.c,v 1.1 2020/11/16 12:10:05 ryoon Exp $
--- ext/intl/common/common_error.c.orig 2019-01-09 09:54:13.000000000 +0000
+++ ext/intl/common/common_error.c
@@ -38,7 +38,7 @@ PHP_FUNCTION( intl_get_error_code )
PHP_FUNCTION( intl_get_error_message )
{
char* message = intl_error_get_message( NULL TSRMLS_CC );
- RETURN_STRING( message, FALSE );
+ RETURN_STRING( message, false );
}
/* }}} */
$NetBSD: patch-ext_intl_dateformat_dateformat__attr.c,v 1.1 2020/11/16 12:10:05 ryoon Exp $
--- ext/intl/dateformat/dateformat_attr.c.orig 2019-01-09 09:54:13.000000000 +0000
+++ ext/intl/dateformat/dateformat_attr.c
@@ -88,7 +88,7 @@ PHP_FUNCTION( datefmt_get_pattern )
UChar value_buf[64];
int length = USIZE( value_buf );
UChar* value = value_buf;
- zend_bool is_pattern_localized =FALSE;
+ zend_bool is_pattern_localized =false;
DATE_FORMAT_METHOD_INIT_VARS;
@@ -131,7 +131,7 @@ PHP_FUNCTION( datefmt_set_pattern )
int value_len = 0;
int slength = 0;
UChar* svalue = NULL;
- zend_bool is_pattern_localized =FALSE;
+ zend_bool is_pattern_localized =false;
DATE_FORMAT_METHOD_INIT_VARS;
@@ -227,7 +227,7 @@ PHP_FUNCTION( datefmt_is_lenient )
*/
PHP_FUNCTION( datefmt_set_lenient )
{
- zend_bool isLenient = FALSE;
+ zend_bool isLenient = false;
DATE_FORMAT_METHOD_INIT_VARS;
$NetBSD: patch-ext_intl_locale_locale__methods.c,v 1.1 2020/11/16 12:10:05 ryoon Exp $
--- ext/intl/locale/locale_methods.c.orig 2019-01-09 09:54:13.000000000 +0000
+++ ext/intl/locale/locale_methods.c
@@ -211,7 +211,7 @@ static int getSingletonPos(const char* s
Get default locale */
PHP_NAMED_FUNCTION(zif_locale_get_default)
{
- RETURN_STRING( intl_locale_get_default( TSRMLS_C ), TRUE );
+ RETURN_STRING( intl_locale_get_default( TSRMLS_C ), true );
}
/* }}} */
@@ -409,12 +409,12 @@ static void get_icu_value_src_php( char*
if( tag_value){
efree( tag_value);
}
- RETURN_STRING( empty_result , TRUE);
+ RETURN_STRING( empty_result , true);
}
/* value found */
if( tag_value){
- RETURN_STRING( tag_value , FALSE);
+ RETURN_STRING( tag_value , false);
}
/* Error encountered while fetching the value */
@@ -599,7 +599,7 @@ static void get_icu_disp_value_src_php(
RETURN_FALSE;
}
- RETVAL_STRINGL( utf8value, utf8value_len , FALSE);
+ RETVAL_STRINGL( utf8value, utf8value_len , false);
}
/* }}} */
@@ -1062,11 +1062,11 @@ static int add_array_entry(const char* l
}
cur_key_name = (char*)ecalloc( 25, 25);
sprintf( cur_key_name , "%s%d", key_name , cnt++);
- add_assoc_string( hash_arr, cur_key_name , token ,TRUE );
+ add_assoc_string( hash_arr, cur_key_name , token ,true );
/* tokenize on the "_" or "-" and stop at singleton if any */
while( (token = php_strtok_r(NULL , DELIMITER , &last_ptr)) && (strlen(token)>1) ){
sprintf( cur_key_name , "%s%d", key_name , cnt++);
- add_assoc_string( hash_arr, cur_key_name , token , TRUE );
+ add_assoc_string( hash_arr, cur_key_name , token , true );
}
/*
if( strcmp(key_name, LOC_PRIVATE_TAG) == 0 ){
@@ -1075,7 +1075,7 @@ static int add_array_entry(const char* l
}
} else {
if( result == 1 ){
- add_assoc_string( hash_arr, key_name , key_value , TRUE );
+ add_assoc_string( hash_arr, key_name , key_value , true );
cur_result = 1;
}
}
@@ -1124,7 +1124,7 @@ PHP_FUNCTION(locale_parse)
grOffset = findOffset( LOC_GRANDFATHERED , loc_name );
if( grOffset >= 0 ){
- add_assoc_string( return_value , LOC_GRANDFATHERED_LANG_TAG , estrdup(loc_name) ,FALSE );
+ add_assoc_string( return_value , LOC_GRANDFATHERED_LANG_TAG , estrdup(loc_name) ,false );
}
else{
/* Not grandfathered */
@@ -1182,10 +1182,10 @@ PHP_FUNCTION(locale_get_all_variants)
if( result > 0 && variant){
/* Tokenize on the "_" or "-" */
token = php_strtok_r( variant , DELIMITER , &saved_ptr);
- add_next_index_stringl( return_value, token , strlen(token) ,TRUE );
+ add_next_index_stringl( return_value, token , strlen(token) ,true );
/* tokenize on the "_" or "-" and stop at singleton if any */
while( (token = php_strtok_r(NULL , DELIMITER, &saved_ptr)) && (strlen(token)>1) ){
- add_next_index_stringl( return_value, token , strlen(token) ,TRUE );
+ add_next_index_stringl( return_value, token , strlen(token) ,true );
}
}
if( variant ){
$NetBSD: patch-ext_intl_normalizer_normalizer__normalize.c,v 1.1 2020/11/16 12:10:05 ryoon Exp $
--- ext/intl/normalizer/normalizer_normalize.c.orig 2019-01-09 09:54:13.000000000 +0000
+++ ext/intl/normalizer/normalizer_normalize.c
@@ -159,7 +159,7 @@ PHP_FUNCTION( normalizer_normalize )
}
/* Return it. */
- RETVAL_STRINGL( ret_buf, ret_len, FALSE );
+ RETVAL_STRINGL( ret_buf, ret_len, false );
}
/* }}} */
@@ -179,7 +179,7 @@ PHP_FUNCTION( normalizer_is_normalized )
int uinput_len = 0;
UErrorCode status = U_ZERO_ERROR;
- UBool uret = FALSE;
+ UBool uret = false;
intl_error_reset( NULL TSRMLS_CC );
$NetBSD: patch-ext_intl_timezone_timezone__class.cpp,v 1.1 2020/11/16 12:10:05 ryoon Exp $
--- ext/intl/timezone/timezone_class.cpp.orig 2019-01-09 09:54:13.000000000 +0000
+++ ext/intl/timezone/timezone_class.cpp
@@ -315,7 +315,7 @@ static HashTable *TimeZone_get_debug_inf
int32_t rawOffset, dstOffset;
UDate now = Calendar::getNow();
- tz->getOffset(now, FALSE, rawOffset, dstOffset, uec);
+ tz->getOffset(now, false, rawOffset, dstOffset, uec);
if (U_FAILURE(uec)) {
return Z_ARRVAL(zv);
}
$NetBSD: patch-ext_intl_timezone_timezone__methods.cpp,v 1.1 2020/11/16 12:10:05 ryoon Exp $
--- ext/intl/timezone/timezone_methods.cpp.orig 2019-01-09 09:54:13.000000000 +0000
+++ ext/intl/timezone/timezone_methods.cpp
@@ -92,7 +92,7 @@ U_CFUNC PHP_FUNCTION(intltz_from_date_ti
RETURN_NULL();
}
- tz = timezone_convert_datetimezone(tzobj->type, tzobj, FALSE, NULL,
+ tz = timezone_convert_datetimezone(tzobj->type, tzobj, false, NULL,
"intltz_from_date_time_zone" TSRMLS_CC);
if (tz == NULL) {
RETURN_NULL();
--- pkgsrc/textproc/php-intl/Makefile 2020/11/05 09:09:14 1.43
+++ pkgsrc/textproc/php-intl/Makefile 2020/11/16 12:10:05 1.44
| @@ -1,18 +1,20 @@ | | | @@ -1,18 +1,20 @@ |
1 | # $NetBSD: Makefile,v 1.43 2020/11/05 09:09:14 ryoon Exp $ | | 1 | # $NetBSD: Makefile,v 1.44 2020/11/16 12:10:05 ryoon Exp $ |
2 | | | 2 | |
3 | MODNAME= intl | | 3 | MODNAME= intl |
4 | CATEGORIES+= textproc | | 4 | CATEGORIES+= textproc |
5 | COMMENT= PHP extension for i18n | | 5 | COMMENT= PHP extension for i18n |
6 | PKGREVISION= 5 | | 6 | PKGREVISION= 5 |
7 | LICENSE= php | | 7 | LICENSE= php |
8 | | | 8 | |
9 | USE_LANGUAGES= c c++11 | | 9 | USE_LANGUAGES= c c++11 |
10 | USE_PHP_EXT_PATCHES= yes | | 10 | USE_PHP_EXT_PATCHES= yes |
11 | CONFIGURE_ARGS+= --enable-${MODNAME}=shared,${BUILDLINK_DIR} | | 11 | CONFIGURE_ARGS+= --enable-${MODNAME}=shared,${BUILDLINK_DIR} |
12 | CPPFLAGS+= -DU_USING_ICU_NAMESPACE=1 | | 12 | CPPFLAGS+= -DU_USING_ICU_NAMESPACE=1 |
13 | | | 13 | |
14 | GCC_REQD+= 4.7 # minimum for -std=c++11 | | 14 | GCC_REQD+= 4.7 # minimum for -std=c++11 |
15 | | | 15 | |
| | | 16 | USE_PHP_EXT_PATCHES= yes |
| | | 17 | |
16 | .include "../../lang/php/ext.mk" | | 18 | .include "../../lang/php/ext.mk" |
17 | .include "../../textproc/icu/buildlink3.mk" | | 19 | .include "../../textproc/icu/buildlink3.mk" |
18 | .include "../../mk/bsd.pkg.mk" | | 20 | .include "../../mk/bsd.pkg.mk" |