commit f241fdd562422303a85cdc954309d36eca0d72d8
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Sat Oct 19 21:56:23 2019 +0200
- rel 20; fixed icu build
php-icu64.patch | 16 ++++++++++++++--
php.spec | 2 +-
2 files changed, 15 insertions(+), 3 deletions(-)
---
diff --git a/php.spec b/php.spec
index 69d348a..0634fed 100644
--- 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}}
diff --git a/php-icu64.patch b/php-icu64.patch
index 63f56f9..c5154fa 100644
--- 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,
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/f241fdd562422303a85cdc954309d36eca0d72d8
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
