diff options
| author | Remi Collet <remi@remirepo.net> | 2025-09-17 12:39:40 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2025-09-17 12:39:40 +0200 |
| commit | 9780c9f3594b246ebb3e69167ef0aade5e36cb6c (patch) | |
| tree | 957f51d2c7be70cbbd9fb9b6fc00b2d8920a4365 | |
| parent | 24d6dd8948e3c11bd36560e063d20324f27899c7 (diff) | |
https://github.com/php-memcached-dev/php-memcached/pull/574
| -rw-r--r-- | 574.patch | 25 | ||||
| -rw-r--r-- | php-pecl-memcached.spec | 8 |
2 files changed, 32 insertions, 1 deletions
diff --git a/574.patch b/574.patch new file mode 100644 index 0000000..128f348 --- /dev/null +++ b/574.patch @@ -0,0 +1,25 @@ +From b9fc8475be7239e7b144d41cd2ad79677c996ac2 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Wed, 30 Jul 2025 12:54:49 +0200 +Subject: [PATCH] use Zend/zend_smart_string.h + +--- + php_memcached_private.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/php_memcached_private.h b/php_memcached_private.h +index 2c22ecba..b7d2a5e1 100644 +--- a/php_memcached_private.h ++++ b/php_memcached_private.h +@@ -43,7 +43,11 @@ + #include <ext/standard/info.h> + #include <zend_extensions.h> + #include <zend_exceptions.h> ++#if PHP_VERSION_ID < 70200 + #include <ext/standard/php_smart_string.h> ++#else ++#include <Zend/zend_smart_string.h> ++#endif + #include <ext/standard/php_var.h> + #include <ext/standard/basic_functions.h> + diff --git a/php-pecl-memcached.spec b/php-pecl-memcached.spec index a3c89c4..e8bdfd2 100644 --- a/php-pecl-memcached.spec +++ b/php-pecl-memcached.spec @@ -42,13 +42,14 @@ Summary: Extension to work with the Memcached caching daemon Name: %{?scl_prefix}php-pecl-memcached Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} -Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: PHP-3.01 URL: https://pecl.php.net/package/%{pecl_name} Source0: https://pecl.php.net/get/%{sources}.tgz Patch0: 573.patch +Patch1: 574.patch BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 7.0 @@ -131,6 +132,7 @@ sed -e 's/role="test"/role="src"/' \ cd %{sources} %patch -P0 -p1 +%patch -P1 -p1 %if %{with fastlz} rm -r fastlz @@ -314,6 +316,10 @@ exit $ret %changelog +* Wed Jul 30 2025 Remi Collet <remi@remirepo.net> - 3.3.0-4 +- add patch for PHP 8.5.0alpha4 from + https://github.com/php-memcached-dev/php-memcached/pull/574 + * Tue Jul 15 2025 Remi Collet <remi@remirepo.net> - 3.3.0-3 - add patch for PHP 8.5.0alpha2 from https://github.com/php-memcached-dev/php-memcached/pull/573 |