- rel 28; fixed icu build

diff --git a/php-icu64.patch b/php-icu64.patch
index 98b53d524bf9631a2c5642a7f2337cb474b31a18..28e50fb547a55291e11bffa1c331fd3862e5774f 100644 (file)
--- a/php-icu64.patch
+++ b/php-icu64.patch
@@ -164,3 +164,14 @@
              *status = U_ILLEGAL_ARGUMENT_ERROR;
                        cleanup_zvals();
              break;
+--- php-5.4.45/ext/intl/php_intl.h~    2015-09-01 22:09:37.000000000 +0200
++++ php-5.4.45/ext/intl/php_intl.h     2019-10-19 22:42:30.454962149 +0200
+@@ -22,6 +22,8 @@
+ 
+ #include <php.h>
+ 
++#undef U_SHOW_CPLUSPLUS_API
++#define U_SHOW_CPLUSPLUS_API 0
+ #include "collator/collator_sort.h"
+ #include "grapheme/grapheme.h"
+ #include "intl_error.h"

diff --git a/php.spec b/php.spec
index e5dfbe1a0f00b95daddc74a672327ed88128e018..9dc377df5237940bb46b13ba6313c7504b576473 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -138,7 +138,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %undefine      with_filter
 %endif
 
-%define                rel     27
+%define                rel     28
 %define                orgname php
 %define                ver_suffix 54
 %define                php_suffix %{!?with_default_php:%{ver_suffix}}