diff options
| -rw-r--r-- | 266.patch | 57 | ||||
| -rw-r--r-- | PHPINFO | 4 | ||||
| -rw-r--r-- | REFLECTION | 4 | ||||
| -rw-r--r-- | php-pecl-ice.spec | 10 |
4 files changed, 9 insertions, 66 deletions
diff --git a/266.patch b/266.patch deleted file mode 100644 index aa160b5..0000000 --- a/266.patch +++ /dev/null @@ -1,57 +0,0 @@ -From f9ab74b28ce6a0add3a24c57c7c7f9f5fa1dc9d7 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Mon, 27 Apr 2020 10:15:06 +0200 -Subject: [PATCH] fix build with recent GCC - ---- - build/php7/ice.c | 9 ++++++--- - build/php7/php_ice.h | 2 +- - 2 files changed, 7 insertions(+), 4 deletions(-) - -diff --git a/build/php7/ice.c b/build/php7/ice.c -index 304c911d..fb0d45e2 100644 ---- a/build/php7/ice.c -+++ b/build/php7/ice.c -@@ -21,6 +21,9 @@ - #include "kernel/fcall.h" - #include "kernel/memory.h" - -+#ifdef ZTS -+ZEND_TSRMLS_CACHE_DEFINE() -+#endif - - - zend_class_entry *ice_i18n_plural_pluralinterface_ce; -@@ -320,9 +323,6 @@ static void php_zephir_init_module_globals(zend_ice_globals *ice_globals TSRMLS_ - static PHP_RINIT_FUNCTION(ice) - { - zend_ice_globals *ice_globals_ptr; --#ifdef ZTS -- tsrm_ls = ts_resource(0); --#endif - ice_globals_ptr = ZEPHIR_VGLOBAL; - - php_zephir_init_globals(ice_globals_ptr); -@@ -368,6 +368,9 @@ static PHP_MINFO_FUNCTION(ice) - - static PHP_GINIT_FUNCTION(ice) - { -+#ifdef ZTS -+ ZEND_TSRMLS_CACHE_UPDATE(); -+#endif - php_zephir_init_globals(ice_globals); - php_zephir_init_module_globals(ice_globals); - } -diff --git a/build/php7/php_ice.h b/build/php7/php_ice.h -index ee20ead9..20906e49 100644 ---- a/build/php7/php_ice.h -+++ b/build/php7/php_ice.h -@@ -53,7 +53,7 @@ ZEND_EXTERN_MODULE_GLOBALS(ice) - #endif - - #ifdef ZTS -- void ***tsrm_ls; -+ ZEND_TSRMLS_CACHE_EXTERN() - #define ZEPHIR_VGLOBAL ((zend_ice_globals *) (*((void ***) tsrm_get_ls_cache()))[TSRM_UNSHUFFLE_RSRC_ID(ice_globals_id)]) - #else - #define ZEPHIR_VGLOBAL &(ice_globals) @@ -5,8 +5,8 @@ ice Simple and fast PHP framework delivered as C-extension.<br>Copyright (c) 2014-2020 Ice Team. ice => enabled Author => Ice Team -Version => 1.6.0 -Build Date => Apr 27 2020 00:00:00 +Version => 1.6.1 +Build Date => May 11 2020 00:00:00 Powered by Zephir => Version 0.12.18-$Id$ Website => http://www.iceframework.org @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #76 ice version 1.6.0 ] { +Extension [ <persistent> extension #76 ice version 1.6.1 ] { - Dependencies { } @@ -14649,7 +14649,7 @@ Extension [ <persistent> extension #76 ice version 1.6.0 ] { Constant [ public int STABLE ] { 4 } Constant [ public int MAJOR ] { 1 } Constant [ public int MINOR ] { 6 } - Constant [ public int PATCH ] { 0 } + Constant [ public int PATCH ] { 1 } Constant [ public int STAGE ] { 4 } Constant [ public int BUILD ] { 0 } } diff --git a/php-pecl-ice.spec b/php-pecl-ice.spec index 478dce4..7aab123 100644 --- a/php-pecl-ice.spec +++ b/php-pecl-ice.spec @@ -18,14 +18,12 @@ Summary: Simple and fast PHP framework Name: %{?sub_prefix}php-pecl-%{pecl_name} -Version: 1.6.0 +Version: 1.6.1 Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: BSD URL: https://pecl.php.net/package/%{pecl_name} Source0: https://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz -Patch0: https://patch-diff.githubusercontent.com/raw/ice/framework/pull/266.patch - BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 7.1 BuildRequires: %{?scl_prefix}php-pear @@ -85,8 +83,6 @@ sed -e 's/role="test"/role="src"/' \ mv %{pecl_name}-%{version}%{?prever} NTS cd NTS -%patch0 -p3 - # Sanity check, really often broken extver=$(sed -n '/#define PHP_ICE_VERSION/{s/.* "//;s/".*$//;p}' php_ice.h) if test "x${extver}" != "x%{version}%{?prever}"; then @@ -212,6 +208,10 @@ cd ../ZTS %changelog +* Mon May 11 2020 Remi Collet <remi@remirepo.net> - 1.6.1-1 +- update to 1.6.1 +- drop patch merged upstream in zephir + * Mon Apr 27 2020 Remi Collet <remi@remirepo.net> - 1.6.0-1 - initial package - fix build with recent GCC using patch from |