pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc php56: Fix php-intl module build with textproc/icu-68.1
details: https://anonhg.NetBSD.org/pkgsrc/rev/4214b5afb65b
branches: trunk
changeset: 441994:4214b5afb65b
user: ryoon <ryoon%pkgsrc.org@localhost>
date: Mon Nov 16 12:10:05 2020 +0000
description:
php56: Fix php-intl module build with textproc/icu-68.1
diffstat:
lang/php56/distinfo | 13 +-
lang/php56/patches/patch-ext_intl_breakiterator_codepointiterator__internal.cpp | 61 +++++++
lang/php56/patches/patch-ext_intl_collator_collator__convert.c | 51 ++++++
lang/php56/patches/patch-ext_intl_collator_collator__error.c | 13 +
lang/php56/patches/patch-ext_intl_collator_collator__locale.c | 13 +
lang/php56/patches/patch-ext_intl_collator_collator__sort.c | 22 ++
lang/php56/patches/patch-ext_intl_common_common__error.c | 13 +
lang/php56/patches/patch-ext_intl_dateformat_dateformat__attr.c | 31 +++
lang/php56/patches/patch-ext_intl_locale_locale__methods.c | 82 ++++++++++
lang/php56/patches/patch-ext_intl_normalizer_normalizer__normalize.c | 22 ++
lang/php56/patches/patch-ext_intl_timezone_timezone__class.cpp | 13 +
lang/php56/patches/patch-ext_intl_timezone_timezone__methods.cpp | 13 +
textproc/php-intl/Makefile | 4 +-
13 files changed, 349 insertions(+), 2 deletions(-)
diffs (truncated from 423 to 300 lines):
diff -r 295f5f290039 -r 4214b5afb65b lang/php56/distinfo
--- a/lang/php56/distinfo Mon Nov 16 12:00:44 2020 +0000
+++ b/lang/php56/distinfo Mon Nov 16 12:10:05 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.56 2019/11/25 03:12:50 taca Exp $
+$NetBSD: distinfo,v 1.57 2020/11/16 12:10:05 ryoon Exp $
SHA1 (PHP-5.6.31-OpenSSL-1.1.0-compatibility-20170801.patch) = 980b9f3f2e62a7360904b5b2107a4213bd052caa
RMD160 (PHP-5.6.31-OpenSSL-1.1.0-compatibility-20170801.patch) = 4eeb1cc0364da69920c3d101a2f1a882550721a7
@@ -13,6 +13,17 @@
SHA1 (patch-disable-filter-url) = a2b08912d81f2872bf1834fa4cefddb044c9d0f8
SHA1 (patch-ext_gd_config.m4) = b92ab4c7fe8aceaef7787a607a7d2eac258fee19
SHA1 (patch-ext_imap_config.m4) = 9c6ed6966366c4fe1b7cfd34b5910e2ff0e68577
+SHA1 (patch-ext_intl_breakiterator_codepointiterator__internal.cpp) = f4cf2a1cc650ed9a4291924c2ed9fcbd7061e33b
+SHA1 (patch-ext_intl_collator_collator__convert.c) = 91f5b8458eebc0c2f3871f76a522f627e4cf4fbf
+SHA1 (patch-ext_intl_collator_collator__error.c) = 94a26ee166506f7f77dd762e9c789d0e803f2b3c
+SHA1 (patch-ext_intl_collator_collator__locale.c) = ab48d5fac5a80b1c4c25fef61993a889a8014e3f
+SHA1 (patch-ext_intl_collator_collator__sort.c) = f21e117180a7c8d999e13e77ff078e55c3481562
+SHA1 (patch-ext_intl_common_common__error.c) = 2afa6a5c908de7347e49030b7d4b5e8f41b6eda5
+SHA1 (patch-ext_intl_dateformat_dateformat__attr.c) = 4567753a7f6d4a6229ab8ab67f16f668aeb8bf6f
+SHA1 (patch-ext_intl_locale_locale__methods.c) = 10e946194686539178e52116303951e3a1c8397c
+SHA1 (patch-ext_intl_normalizer_normalizer__normalize.c) = 8031fa56c927781f3094d484a2cf15d365f9e1f6
+SHA1 (patch-ext_intl_timezone_timezone__class.cpp) = b76ba1df02e854b9fae27c4c3dd554fba91aadfa
+SHA1 (patch-ext_intl_timezone_timezone__methods.cpp) = fc3a99380f1c29553621cb864493d6d79b4d737a
SHA1 (patch-ext_mssql_php__mssql.c) = c4fa9231dc539ffb027f1beb6f182f21ddb94a3c
SHA1 (patch-ext_pcre_pcrelib_config.h) = 26588e9932ee715e32c872a1c7e2f9c640bd9cf8
SHA1 (patch-ext_pdo__mysql_config.m4) = 9d25c673fc151e1b8ae137f2a0fc540189ef5398
diff -r 295f5f290039 -r 4214b5afb65b lang/php56/patches/patch-ext_intl_breakiterator_codepointiterator__internal.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/php56/patches/patch-ext_intl_breakiterator_codepointiterator__internal.cpp Mon Nov 16 12:10:05 2020 +0000
@@ -0,0 +1,61 @@
+$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;
+ }
diff -r 295f5f290039 -r 4214b5afb65b lang/php56/patches/patch-ext_intl_collator_collator__convert.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/php56/patches/patch-ext_intl_collator_collator__convert.c Mon Nov 16 12:10:05 2020 +0000
@@ -0,0 +1,51 @@
+$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 );
diff -r 295f5f290039 -r 4214b5afb65b lang/php56/patches/patch-ext_intl_collator_collator__error.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/php56/patches/patch-ext_intl_collator_collator__error.c Mon Nov 16 12:10:05 2020 +0000
@@ -0,0 +1,13 @@
+$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 );
+ }
+ /* }}} */
+
diff -r 295f5f290039 -r 4214b5afb65b lang/php56/patches/patch-ext_intl_collator_collator__locale.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/php56/patches/patch-ext_intl_collator_collator__locale.c Mon Nov 16 12:10:05 2020 +0000
@@ -0,0 +1,13 @@
+$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 );
+ }
+ /* }}} */
+
diff -r 295f5f290039 -r 4214b5afb65b lang/php56/patches/patch-ext_intl_collator_collator__sort.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/php56/patches/patch-ext_intl_collator_collator__sort.c Mon Nov 16 12:10:05 2020 +0000
@@ -0,0 +1,22 @@
+$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 );
+ }
+ /* }}} */
+
diff -r 295f5f290039 -r 4214b5afb65b lang/php56/patches/patch-ext_intl_common_common__error.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/php56/patches/patch-ext_intl_common_common__error.c Mon Nov 16 12:10:05 2020 +0000
@@ -0,0 +1,13 @@
+$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 );
+ }
+ /* }}} */
+
diff -r 295f5f290039 -r 4214b5afb65b lang/php56/patches/patch-ext_intl_dateformat_dateformat__attr.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/php56/patches/patch-ext_intl_dateformat_dateformat__attr.c Mon Nov 16 12:10:05 2020 +0000
@@ -0,0 +1,31 @@
+$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;
+
diff -r 295f5f290039 -r 4214b5afb65b lang/php56/patches/patch-ext_intl_locale_locale__methods.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/php56/patches/patch-ext_intl_locale_locale__methods.c Mon Nov 16 12:10:05 2020 +0000
@@ -0,0 +1,82 @@
+$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);
+
+ }
+ /* }}} */
Home |
Main Index |
Thread Index |
Old Index