- rel 20; fixed icu build

diff --git a/php-icu64.patch b/php-icu64.patch
index 63f56f90b154865e6b112a0a9f1d956f7eb02e2e..c5154fa4a1857eb9e6ff9cdccf1e8f4623cf4ab4 100644 (file)
--- a/php-icu64.patch
+++ b/php-icu64.patch
@@ -167,7 +167,7 @@
  #endif
  
  #include <unicode/calendar.h>
-+#include <unicode/gregocal.h>
++
 +#include <unicode/datefmt.h>
  
  extern "C" {
@@ -176,7 +176,7 @@
  
 +using icu::Locale;
 +using icu::Calendar;
-+using icu::GregorianCalendar;
++
 +using icu::DateFormat;
 +
  int datefmt_process_calendar_arg(zval* calendar_zv,
@@ -261,3 +261,15 @@
  U_CFUNC PHP_METHOD(IntlTimeZone, __construct)
  {
        zend_throw_exception( NULL,
+
+--- php-7.0.33/ext/intl/dateformat/dateformat_helpers.cpp~     2018-12-04 18:22:53.000000000 +0100
++++ php-7.0.33/ext/intl/dateformat/dateformat_helpers.cpp      2019-10-19 21:29:32.416045611 +0200
+@@ -28,6 +28,8 @@ extern "C" {
+ #include "../calendar/calendar_class.h"
+ }
+ 
++using icu::GregorianCalendar;
++
+ int datefmt_process_calendar_arg(zval* calendar_zv,
+                                                                Locale const& locale,
+                                                                const char *func_name,

diff --git a/php.spec b/php.spec
index 69d348a991986d23a3325e299a86b2103defa179..0634fed12f91203edcf57b1a3bf4589c0b7c7219 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -140,7 +140,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %undefine      with_filter
 %endif
 
-%define                rel     19
+%define                rel     20
 %define                orgname php
 %define                ver_suffix 55
 %define                php_suffix %{!?with_default_php:%{ver_suffix}}