From 1b09241409f29b7a123eb0ba69019503fc5b1059 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 7 Sep 2021 09:09:38 +0200 Subject: fix intl build on F35 --- php-5.6.37-icu62.patch | 2 +- php.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/php-5.6.37-icu62.patch b/php-5.6.37-icu62.patch index dd145bc..9d6e669 100644 --- a/php-5.6.37-icu62.patch +++ b/php-5.6.37-icu62.patch @@ -556,7 +556,7 @@ index e8428e1cbbe8..52408f8e9183 100644 PHP_SETUP_ICU(INTL_SHARED_LIBADD) PHP_SUBST(INTL_SHARED_LIBADD) PHP_REQUIRE_CXX() -+ INTL_COMMON_FLAGS="$ICU_INCS -Wno-write-strings -D__STDC_LIMIT_MACROS" ++ INTL_COMMON_FLAGS="$ICU_INCS -Wno-write-strings -DU_DEFINE_FALSE_AND_TRUE=1 -D__STDC_LIMIT_MACROS" if test "$icu_version" -ge "4002"; then icu_spoof_src=" spoofchecker/spoofchecker_class.c \ spoofchecker/spoofchecker.c\ diff --git a/php.spec b/php.spec index 14bc6b1..030dc35 100644 --- a/php.spec +++ b/php.spec @@ -132,7 +132,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: %{?scl_prefix}php Version: 5.6.40 -Release: 29%{?dist} +Release: 30%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -1971,6 +1971,9 @@ EOF %changelog +* Tue Sep 7 2021 Remi Collet - 5.6.40-30 +- fix intl build on F35 + * Thu Aug 26 2021 Remi Collet - 5.6.40-29 - Fix #81211 Symlinks are followed when creating PHAR archive -- cgit