[packages/php/PHP_7_0] - rel 5; fixed icu build
arekm
arekm at pld-linux.org
Sat Oct 19 21:35:15 CEST 2019
commit 64d6d11b46e309c9b5cc4f854f9df6a61c1659a5
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sat Oct 19 21:35:04 2019 +0200
- rel 5; 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 5da4993..9cdf7b1 100644
--- a/php.spec
+++ b/php.spec
@@ -150,7 +150,7 @@ Summary(ru.UTF-8): PHP Версии 7 - язык препроцессирова
Summary(uk.UTF-8): PHP Версії 7 - мова препроцесування HTML-файлів, виконувана на сервері
Name: %{orgname}%{php_suffix}
Version: 7.0.33
-Release: 4
+Release: 5
Epoch: 4
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
diff --git a/php-icu64.patch b/php-icu64.patch
index f11af7d..2f0b549 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/64d6d11b46e309c9b5cc4f854f9df6a61c1659a5
More information about the pld-cvs-commit
mailing list