pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/lang/php73
Module Name: pkgsrc
Committed By: markd
Date: Wed Nov 11 20:05:10 UTC 2020
Modified Files:
pkgsrc/lang/php73: distinfo
Added Files:
pkgsrc/lang/php73/patches:
patch-ext_intl_breakiterator_codepointiterator__internal.cpp
patch-ext_intl_collator_collator__sort.c
patch-ext_intl_dateformat_dateformat__attr.c
patch-ext_intl_normalizer_normalizer__normalize.c
patch-ext_intl_timezone_timezone__class.cpp
patch-ext_intl_timezone_timezone__methods.cpp
Log Message:
php73: Fix build with ICU 68
Untested - but since the same patches work for 72 and 74, assume they work
for 73.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/lang/php73/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/lang/php73/patches/patch-ext_intl_breakiterator_codepointiterator__internal.cpp \
pkgsrc/lang/php73/patches/patch-ext_intl_collator_collator__sort.c \
pkgsrc/lang/php73/patches/patch-ext_intl_dateformat_dateformat__attr.c \
pkgsrc/lang/php73/patches/patch-ext_intl_normalizer_normalizer__normalize.c \
pkgsrc/lang/php73/patches/patch-ext_intl_timezone_timezone__class.cpp \
pkgsrc/lang/php73/patches/patch-ext_intl_timezone_timezone__methods.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/lang/php73/distinfo
diff -u pkgsrc/lang/php73/distinfo:1.28 pkgsrc/lang/php73/distinfo:1.29
--- pkgsrc/lang/php73/distinfo:1.28 Fri Oct 30 07:12:38 2020
+++ pkgsrc/lang/php73/distinfo Wed Nov 11 20:05:10 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2020/10/30 07:12:38 taca Exp $
+$NetBSD: distinfo,v 1.29 2020/11/11 20:05:10 markd Exp $
SHA1 (php-7.3.24.tar.xz) = f66e514ea8fa1c20db1be93a572aa7e65cbd53c6
RMD160 (php-7.3.24.tar.xz) = 94247454b0bdc790ad6d7701790c1821179a93db
@@ -7,6 +7,12 @@ Size (php-7.3.24.tar.xz) = 12138212 byte
SHA1 (patch-configure) = 08b80528ba90c705398e8841c232382663479a3b
SHA1 (patch-disable-filter-url) = 0a2c19c18f089448a8d842e99738b292ab9e5640
SHA1 (patch-ext_gd_config.m4) = eaecfb31b18700dd642c067ed82748d4f6be2335
+SHA1 (patch-ext_intl_breakiterator_codepointiterator__internal.cpp) = c6702b071a1881ed35a1c1adc0e07ce53335e2e7
+SHA1 (patch-ext_intl_collator_collator__sort.c) = 7fdb751cabb24eb4097cfb5cf23ba217a9893530
+SHA1 (patch-ext_intl_dateformat_dateformat__attr.c) = 08a26ec534b67ed029426e4aa3bd26cb6761aead
+SHA1 (patch-ext_intl_normalizer_normalizer__normalize.c) = 10a215438db81c9f1f002f9409ebd56de6d65617
+SHA1 (patch-ext_intl_timezone_timezone__class.cpp) = da8e7a227c04f366aa9aab08c5042826baa965fe
+SHA1 (patch-ext_intl_timezone_timezone__methods.cpp) = 48dc73ca68df2454549bb81de6da6753bbb097bc
SHA1 (patch-ext_phar_Makefile.frag) = 53ea5c58b0bc27d236118d5750a74b1cba43e5dd
SHA1 (patch-ext_recode_recode.c) = 639bf762302c7a30c88d3f3fa862494e0f847bdb
SHA1 (patch-ext_tidy_config.m4) = 380f4e8927582b2781faf58b17ad81b6dc967ba7
Added files:
Index: pkgsrc/lang/php73/patches/patch-ext_intl_breakiterator_codepointiterator__internal.cpp
diff -u /dev/null pkgsrc/lang/php73/patches/patch-ext_intl_breakiterator_codepointiterator__internal.cpp:1.1
--- /dev/null Wed Nov 11 20:05:10 2020
+++ pkgsrc/lang/php73/patches/patch-ext_intl_breakiterator_codepointiterator__internal.cpp Wed Nov 11 20:05:10 2020
@@ -0,0 +1,63 @@
+$NetBSD: patch-ext_intl_breakiterator_codepointiterator__internal.cpp,v 1.1 2020/11/11 20:05:10 markd Exp $
+
+Use stdbool true/false macros.
+
+--- ext/intl/breakiterator/codepointiterator_internal.cpp.orig 2020-10-27 15:01:59.000000000 +0000
++++ ext/intl/breakiterator/codepointiterator_internal.cpp
+@@ -58,7 +58,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();
+@@ -78,17 +78,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
+@@ -109,7 +109,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)
+@@ -128,7 +128,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();
+ }
+@@ -280,7 +280,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;
+ }
Index: pkgsrc/lang/php73/patches/patch-ext_intl_collator_collator__sort.c
diff -u /dev/null pkgsrc/lang/php73/patches/patch-ext_intl_collator_collator__sort.c:1.1
--- /dev/null Wed Nov 11 20:05:10 2020
+++ pkgsrc/lang/php73/patches/patch-ext_intl_collator_collator__sort.c Wed Nov 11 20:05:10 2020
@@ -0,0 +1,24 @@
+$NetBSD: patch-ext_intl_collator_collator__sort.c,v 1.1 2020/11/11 20:05:10 markd Exp $
+
+Use stdbool true/false macros.
+
+--- ext/intl/collator/collator_sort.c.orig 2020-10-27 15:01:59.000000000 +0000
++++ ext/intl/collator/collator_sort.c
+@@ -346,7 +346,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 );
+ }
+ /* }}} */
+
+@@ -540,7 +540,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 );
+ }
+ /* }}} */
+
Index: pkgsrc/lang/php73/patches/patch-ext_intl_dateformat_dateformat__attr.c
diff -u /dev/null pkgsrc/lang/php73/patches/patch-ext_intl_dateformat_dateformat__attr.c:1.1
--- /dev/null Wed Nov 11 20:05:10 2020
+++ pkgsrc/lang/php73/patches/patch-ext_intl_dateformat_dateformat__attr.c Wed Nov 11 20:05:10 2020
@@ -0,0 +1,33 @@
+$NetBSD: patch-ext_intl_dateformat_dateformat__attr.c,v 1.1 2020/11/11 20:05:10 markd Exp $
+
+Use stdbool true/false macros.
+
+--- ext/intl/dateformat/dateformat_attr.c.orig 2020-10-27 15:01:59.000000000 +0000
++++ ext/intl/dateformat/dateformat_attr.c
+@@ -88,7 +88,7 @@ PHP_FUNCTION( datefmt_get_pattern )
+ UChar value_buf[64];
+ uint32_t 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 )
+ size_t value_len = 0;
+ int32_t 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;
+
Index: pkgsrc/lang/php73/patches/patch-ext_intl_normalizer_normalizer__normalize.c
diff -u /dev/null pkgsrc/lang/php73/patches/patch-ext_intl_normalizer_normalizer__normalize.c:1.1
--- /dev/null Wed Nov 11 20:05:10 2020
+++ pkgsrc/lang/php73/patches/patch-ext_intl_normalizer_normalizer__normalize.c Wed Nov 11 20:05:10 2020
@@ -0,0 +1,24 @@
+$NetBSD: patch-ext_intl_normalizer_normalizer__normalize.c,v 1.1 2020/11/11 20:05:10 markd Exp $
+
+Use stdbool true/false macros.
+
+--- ext/intl/normalizer/normalizer_normalize.c.orig 2020-10-27 15:01:59.000000000 +0000
++++ ext/intl/normalizer/normalizer_normalize.c
+@@ -90,7 +90,7 @@ static UBool intl_is_normalized(zend_lon
+ const UNormalizer2 *norm = intl_get_normalizer(form, err);
+
+ if(U_FAILURE(*err)) {
+- return FALSE;
++ return false;
+ }
+
+ return unorm2_isNormalized(norm, uinput, uinput_len, err);
+@@ -261,7 +261,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 );
+
Index: pkgsrc/lang/php73/patches/patch-ext_intl_timezone_timezone__class.cpp
diff -u /dev/null pkgsrc/lang/php73/patches/patch-ext_intl_timezone_timezone__class.cpp:1.1
--- /dev/null Wed Nov 11 20:05:10 2020
+++ pkgsrc/lang/php73/patches/patch-ext_intl_timezone_timezone__class.cpp Wed Nov 11 20:05:10 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-ext_intl_timezone_timezone__class.cpp,v 1.1 2020/11/11 20:05:10 markd Exp $
+
+Use stdbool true/false macros.
+
+--- ext/intl/timezone/timezone_class.cpp.orig 2020-10-27 15:01:59.000000000 +0000
++++ ext/intl/timezone/timezone_class.cpp
+@@ -325,7 +325,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 debug_info;
+ }
Index: pkgsrc/lang/php73/patches/patch-ext_intl_timezone_timezone__methods.cpp
diff -u /dev/null pkgsrc/lang/php73/patches/patch-ext_intl_timezone_timezone__methods.cpp:1.1
--- /dev/null Wed Nov 11 20:05:10 2020
+++ pkgsrc/lang/php73/patches/patch-ext_intl_timezone_timezone__methods.cpp Wed Nov 11 20:05:10 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-ext_intl_timezone_timezone__methods.cpp,v 1.1 2020/11/11 20:05:10 markd Exp $
+
+Use stdbool true/false macros.
+
+--- ext/intl/timezone/timezone_methods.cpp.orig 2020-10-27 15:01:59.000000000 +0000
++++ ext/intl/timezone/timezone_methods.cpp
+@@ -95,7 +95,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");
+ if (tz == NULL) {
+ RETURN_NULL();
Home |
Main Index |
Thread Index |
Old Index