CVS commit: pkgsrc/lang/php72

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Thu Nov 12 10:59:05 UTC 2020

Modified Files:
        pkgsrc/lang/php72: distinfo
        pkgsrc/lang/php72/patches:
            patch-ext_intl_normalizer_normalizer__normalize.c

Log Message:
php72: commit the actual normalize.c patch


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 pkgsrc/lang/php72/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/php72/patches/patch-ext_intl_normalizer_normalizer__normalize.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/php72/distinfo
diff -u pkgsrc/lang/php72/distinfo:1.59 pkgsrc/lang/php72/distinfo:1.60
--- pkgsrc/lang/php72/distinfo:1.59     Wed Nov 11 20:01:34 2020
+++ pkgsrc/lang/php72/distinfo  Thu Nov 12 10:59:05 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.59 2020/11/11 20:01:34 markd Exp $
+$NetBSD: distinfo,v 1.60 2020/11/12 10:59:05 markd Exp $
 
 SHA1 (php-7.2.34.tar.xz) = 3dfe7bbed49e53f6ff76ca0b8c9162f78b1cc679
 RMD160 (php-7.2.34.tar.xz) = 52a993c201241e2dce521bad225f07330505b2cc
@@ -10,7 +10,7 @@ SHA1 (patch-ext_gd_config.m4) = eaecfb31
 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_normalizer_normalizer__normalize.c) = 91aec32bd34ca94e9c3c544a57b2800986ac506b
 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

Index: pkgsrc/lang/php72/patches/patch-ext_intl_normalizer_normalizer__normalize.c
diff -u pkgsrc/lang/php72/patches/patch-ext_intl_normalizer_normalizer__normalize.c:1.1 pkgsrc/lang/php72/patches/patch-ext_intl_normalizer_normalizer__normalize.c:1.2
--- pkgsrc/lang/php72/patches/patch-ext_intl_normalizer_normalizer__normalize.c:1.1     Wed Nov 11 20:01:34 2020
+++ pkgsrc/lang/php72/patches/patch-ext_intl_normalizer_normalizer__normalize.c Thu Nov 12 10:59:05 2020
@@ -1,19 +1,10 @@
-$NetBSD: patch-ext_intl_normalizer_normalizer__normalize.c,v 1.1 2020/11/11 20:01:34 markd Exp $
+$NetBSD: patch-ext_intl_normalizer_normalizer__normalize.c,v 1.2 2020/11/12 10:59:05 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.orig    2020-09-30 05:15:54.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 )
+@@ -178,7 +178,7 @@ PHP_FUNCTION( normalizer_is_normalized )
        int             uinput_len = 0;
        UErrorCode      status = U_ZERO_ERROR;