diff options
| -rw-r--r-- | 1.patch | 29 | ||||
| -rw-r--r-- | REFLECTION | 2 | ||||
| -rw-r--r-- | php-pecl-sync.spec | 14 |
3 files changed, 8 insertions, 37 deletions
diff --git a/1.patch b/1.patch deleted file mode 100644 index 36c509e..0000000 --- a/1.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 65bfe3f660587b4fbac6f5fdef6051a42ccc8b26 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Thu, 10 Dec 2020 10:56:16 +0100 -Subject: [PATCH] Fix for PHP 8 - ---- - sync.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/sync.c b/sync.c -index a9157fb..ca66792 100644 ---- a/sync.c -+++ b/sync.c -@@ -33,6 +33,15 @@ - #define PHP_FE_END {NULL, NULL, NULL} - #endif - -+/* for PHP 8 */ -+#ifndef TSRMLS_D -+#define TSRMLS_D void -+#define TSRMLS_DC -+#define TSRMLS_C -+#define TSRMLS_CC -+#define TSRMLS_FETCH() -+#endif -+ - /* {{{ sync_module_entry - */ - zend_module_entry sync_module_entry = { @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #117 sync version 1.1.1 ] { +Extension [ <persistent> extension #119 sync version 1.1.2 ] { - Classes [5] { Class [ <internal:sync> class SyncMutex ] { diff --git a/php-pecl-sync.spec b/php-pecl-sync.spec index 820ede6..26cebba 100644 --- a/php-pecl-sync.spec +++ b/php-pecl-sync.spec @@ -1,6 +1,6 @@ # remirepo spec file for php-pecl-sync # -# Copyright (c) 2014-2020 Remi Collet +# Copyright (c) 2014-2021 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -21,15 +21,13 @@ Summary: Named and unnamed synchronization objects Name: %{?sub_prefix}php-pecl-%{pecl_name} -Version: 1.1.1 -Release: 7%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Version: 1.1.2 +Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: MIT Group: Development/Languages URL: https://pecl.php.net/package/%{pecl_name} Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz -Patch0: https://patch-diff.githubusercontent.com/raw/php/pecl-system-sync/pull/1.patch - BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel @@ -81,8 +79,6 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS -%patch0 -p1 -b .pr1 - # Sanity check, really often broken extver=$(sed -n '/#define PHP_SYNC_VERSION/{s/.* "//;s/".*$//;p}' php_sync.h) if test "x${extver}" != "x%{version}"; then @@ -207,6 +203,10 @@ export TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}. %changelog +* Sat Apr 10 2021 Remi Collet <remi@remirepo.net> - 1.1.2-1 +- update to 1.1.2 +- drop patch merged upstream + * Thu Dec 10 2020 Remi Collet <remi@remirepo.net> - 1.1.1-7 - add patch for PHP 8 from https://github.com/php/pecl-system-sync/pull/1 |