[packages/php/PHP_5_4] - rel 28; fixed icu build

arekm arekm at pld-linux.org
Sat Oct 19 22:47:08 CEST 2019


commit bd6df3f2d8be140adcc5ae7d7ef2d433e137c34c
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat Oct 19 22:47:00 2019 +0200

    - rel 28; fixed icu build

 php-icu64.patch | 11 +++++++++++
 php.spec        |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)
---
diff --git a/php.spec b/php.spec
index e5dfbe1..9dc377d 100644
--- 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}}
diff --git a/php-icu64.patch b/php-icu64.patch
index 98b53d5..28e50fb 100644
--- 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"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/bd6df3f2d8be140adcc5ae7d7ef2d433e137c34c



More information about the pld-cvs-commit mailing list