diff options
| author | Remi Collet <remi@remirepo.net> | 2021-07-23 12:05:39 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2021-07-23 12:05:39 +0200 |
| commit | ee94c3459a9d61a6e20b8f64612f0681b9d0633c (patch) | |
| tree | 724afd82107e53ae35cb6c2f878f0d9c4cf26153 | |
| parent | 523246f0321476672349c4b1b7cb97e3fe68ccfb (diff) | |
add patch for PHP 8.1.0beta1 from
https://github.com/php-memcached-dev/php-memcached/pull/487
| -rw-r--r-- | 487.patch | 33 | ||||
| -rw-r--r-- | php-pecl-memcached.spec | 8 |
2 files changed, 40 insertions, 1 deletions
diff --git a/487.patch b/487.patch new file mode 100644 index 0000000..97761f4 --- /dev/null +++ b/487.patch @@ -0,0 +1,33 @@ +From 70ec7c2717deeeb03c8ca49fa36860b7f2476eb3 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Fri, 23 Jul 2021 12:00:19 +0200 +Subject: [PATCH] fix zend_dtoa API change in 8.1.0beta1 + +--- + g_fmt.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/g_fmt.c b/g_fmt.c +index 73f82fd0..f456790c 100644 +--- a/g_fmt.c ++++ b/g_fmt.c +@@ -27,12 +27,17 @@ + * // Teddy Grenman <teddy.grenman@iki.fi>, 2010-05-18. + */ + +-#include <zend_operators.h> ++#include <php.h> + + char *php_memcached_g_fmt(register char *b, double x) { + register int i, k; + register char *s; +- int decpt, j, sign; ++ int decpt, j; ++#if PHP_VERSION_ID < 80100 ++ int sign; ++#else ++ bool sign; ++#endif + char *b0, *s0, *se; + + b0 = b; diff --git a/php-pecl-memcached.spec b/php-pecl-memcached.spec index 6e732aa..7cc45d1 100644 --- a/php-pecl-memcached.spec +++ b/php-pecl-memcached.spec @@ -33,7 +33,7 @@ Summary: Extension to work with the Memcached caching daemon Name: %{?sub_prefix}php-pecl-memcached Version: 3.1.5 -Release: 8%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 9%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: PHP URL: https://pecl.php.net/package/%{pecl_name} @@ -48,6 +48,7 @@ Patch5: https://patch-diff.githubusercontent.com/raw/php-memcached-dev/php Patch6: https://patch-diff.githubusercontent.com/raw/php-memcached-dev/php-memcached/pull/472.patch Patch7: https://patch-diff.githubusercontent.com/raw/php-memcached-dev/php-memcached/pull/473.patch Patch8: https://patch-diff.githubusercontent.com/raw/php-memcached-dev/php-memcached/pull/486.patch +Patch9: https://patch-diff.githubusercontent.com/raw/php-memcached-dev/php-memcached/pull/487.patch BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 7 @@ -174,6 +175,7 @@ cd NTS %patch6 -p1 -b .pr472 %patch7 -p1 -b .pr473 %patch8 -p1 -b .pr486 +%patch9 -p1 -b .pr486 %endif %if %{with fastlz} @@ -375,6 +377,10 @@ exit $ret %changelog +* Fri Jul 23 2021 Remi Collet <remi@remirepo.net> - 3.1.5-9 +- add patch for PHP 8.1.0beta1 from + https://github.com/php-memcached-dev/php-memcached/pull/487 + * Tue Jul 13 2021 Remi Collet <remi@remirepo.net> - 3.1.5-8 - rebuild using remi-libmemcached-awesome (relocated on /opt/remi) |