diff options
| -rw-r--r-- | 398.patch | 25 | ||||
| -rw-r--r-- | php-pecl-igbinary.spec | 25 |
2 files changed, 37 insertions, 13 deletions
diff --git a/398.patch b/398.patch new file mode 100644 index 0000000..117abd2 --- /dev/null +++ b/398.patch @@ -0,0 +1,25 @@ +From c7fe8aad3d7894bb85f5a189eba60dec9203950d Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Wed, 30 Jul 2025 11:38:30 +0200 +Subject: [PATCH] use Zend/zend_smart_string.h + +--- + src/php7/php_igbinary.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/php7/php_igbinary.h b/src/php7/php_igbinary.h +index 07312b76..d64c3702 100644 +--- a/src/php7/php_igbinary.h ++++ b/src/php7/php_igbinary.h +@@ -32,7 +32,11 @@ ZEND_END_MODULE_GLOBALS(igbinary) + #include "TSRM.h" + #endif + ++#if PHP_VERSION_ID < 70200 + #include "ext/standard/php_smart_string.h" ++#else ++#include "Zend/zend_smart_string.h" ++#endif + + /** Module init function. */ + PHP_MINIT_FUNCTION(igbinary); diff --git a/php-pecl-igbinary.spec b/php-pecl-igbinary.spec index ba25715..7240fde 100644 --- a/php-pecl-igbinary.spec +++ b/php-pecl-igbinary.spec @@ -3,10 +3,9 @@ # # Fedora spec file for php-pecl-igbinary # -# Copyright (c) 2010-2024 Remi Collet -# License: CC-BY-SA-4.0 -# http://creativecommons.org/licenses/by-sa/4.0/ -# +# SPDX-FileCopyrightText: Copyright 2010-2025 Remi Collet +# SPDX-License-Identifier: CECILL-2.1 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # Please, preserve the changelog entries # @@ -28,12 +27,13 @@ Summary: Replacement for the standard PHP serializer Name: %{?scl_prefix}php-pecl-igbinary Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 3%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 4%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: BSD-3-Clause URL: https://pecl.php.net/package/igbinary Source0: https://pecl.php.net/get/%{sources}.tgz Patch0: 393.patch +Patch1: 398.patch BuildRequires: make BuildRequires: %{?dtsprefix}gcc @@ -94,7 +94,8 @@ These are the files needed to compile programs using Igbinary sed -e '/COPYING/s/role="doc"/role="src"/' -i package.xml pushd %{sources} -%patch -P0 -p1 +%patch -P0 -p1 -b .pr393 +%patch -P1 -p1 -b .pr398 # Check version subdir=php7 @@ -209,13 +210,6 @@ REPORT_EXIT_STATUS=1 \ %{__ztsphp} --no-php-ini \ --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \ --modules | grep '^%{pecl_name}$' - -%if %{with tests} -: upstream ZTS test suite -TEST_PHP_ARGS="-n $MOD -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \ -REPORT_EXIT_STATUS=1 \ -%{__ztsphp} -n run-tests.php $OPTS -%endif %endif @@ -243,6 +237,11 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Wed Jul 30 2025 Remi Collet <remi@remirepo.net> - 3.2.16-4 +- fix for PHP 8.5.0alpha3 using patch from + https://github.com/igbinary/igbinary/pull/398 +- re-license spec file to CECILL-2.1 + * Mon Sep 30 2024 Remi Collet <remi@remirepo.net> - 3.2.16-3 - fix test suite with PHP 8.4 using patch from https://github.com/igbinary/igbinary/pull/393 |