add patch for PHP 8.5.0alpha2 (sent to author)

2 files changed, 68 insertions, 8 deletions

diff --git a/0001-use-zend_ce_exception-instead-of-zend_exception_get_.patch b/0001-use-zend_ce_exception-instead-of-zend_exception_get_.patch
new file mode 100644
index 0000000..acbfcf2
--- /dev/null
+++ b/0001-use-zend_ce_exception-instead-of-zend_exception_get_.patch
@@ -0,0 +1,49 @@
+From 78f56ef5c90109564eb37a65baec69fa8f29b108 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Thu, 17 Jul 2025 11:35:34 +0200
+Subject: [PATCH] use zend_ce_exception instead of zend_exception_get_default()
+ for 8.5
+
+---
+ util.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/util.c b/util.c
+index adde54d..8002297 100644
+--- a/util.c
++++ b/util.c
+@@ -34,7 +34,7 @@ php_socket_t php_ev_zval_to_fd(zval *pfd)
+ 		/* PHP stream or PHP socket resource  */
+ 		if ((stream = (php_stream *)zend_fetch_resource2(Z_RES_P(pfd), NULL, php_file_le_stream(), php_file_le_pstream())) != NULL) {
+ 			if (php_stream_is(stream, PHP_STREAM_IS_MEMORY) || php_stream_is(stream, PHP_STREAM_IS_TEMP)) {
+-				zend_throw_exception(zend_exception_get_default(),
++				zend_throw_exception(zend_ce_exception,
+ 						"Cannot fetch file descriptor from memory based stream", 0);
+ 				return -1;
+ 			}
+@@ -42,7 +42,7 @@ php_socket_t php_ev_zval_to_fd(zval *pfd)
+ 			php_stream_from_zval_no_verify(stream, pfd);
+ 
+ 			if (stream == NULL) {
+-				zend_throw_exception(zend_exception_get_default(), "Stream resource is invalid", 0);
++				zend_throw_exception(zend_ce_exception, "Stream resource is invalid", 0);
+ 				return -1;
+ 			}
+ 
+@@ -88,11 +88,11 @@ php_socket_t php_ev_zval_to_fd(zval *pfd)
+ 		/* Numeric fd */
+ 		file_desc = Z_LVAL_P(pfd);
+ 		if (file_desc < 0) {
+-			zend_throw_exception(zend_exception_get_default(), "Invalid file descriptor", 0);
++			zend_throw_exception(zend_ce_exception, "Invalid file descriptor", 0);
+ 			return -1;
+ 		}
+ 	} else {
+-		zend_throw_exception(zend_exception_get_default(), "Invalid file descriptor", 0);
++		zend_throw_exception(zend_ce_exception, "Invalid file descriptor", 0);
+ 		return -1;
+ 	}
+ 
+-- 
+2.50.1
+
diff --git a/php-pecl-ev.spec b/php-pecl-ev.spec
index 5c20be5..7c6d0b1 100644
--- a/php-pecl-ev.spec
+++ b/php-pecl-ev.spec
@@ -1,8 +1,8 @@
 # remirepo spec file for php-pecl-ev
 #
-# Copyright (c) 2013-2024 Remi Collet
-# License: CC-BY-SA-4.0
-# http://creativecommons.org/licenses/by-sa/4.0/
+# SPDX-FileCopyrightText:  Copyright 2013-2025 Remi Collet
+# SPDX-License-Identifier: CECILL-2.1
+# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 #
 # Please, preserve the changelog entries
 #
@@ -14,6 +14,8 @@
 %bcond_without           tests
 
 %global pecl_name        ev
+%global pie_vend         osmanov
+%global pie_proj         pecl-ev
 %global with_zts         0%{!?_without_zts:%{?__ztsphp:1}}
 # After 20-sockets
 %global ini_name         40-%{pecl_name}.ini
@@ -26,11 +28,13 @@
 Summary:        Provides interface to libev library
 Name:           %{?scl_prefix}php-pecl-%{pecl_name}
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}%{?upstream_postver:+%{upstream_postver}}
-Release:        2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Release:        3%{?dist}%{!?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:         0001-use-zend_ce_exception-instead-of-zend_exception_get_.patch
+
 BuildRequires:  make
 BuildRequires:  %{?dtsprefix}gcc
 BuildRequires:  %{?scl_prefix}php-devel >= 8.0
@@ -43,10 +47,12 @@ Requires:       %{?scl_prefix}php(zend-abi) = %{php_zend_api}
 Requires:       %{?scl_prefix}php(api) = %{php_core_api}
 Requires:       %{?scl_prefix}php-sockets%{?_isa}
 
-Provides:       %{?scl_prefix}php-%{pecl_name}               = %{version}
-Provides:       %{?scl_prefix}php-%{pecl_name}%{?_isa}       = %{version}
-Provides:       %{?scl_prefix}php-pecl(%{pecl_name})         = %{version}
-Provides:       %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
+Provides:       %{?scl_prefix}php-%{pecl_name}                 = %{version}
+Provides:       %{?scl_prefix}php-%{pecl_name}%{?_isa}         = %{version}
+Provides:       %{?scl_prefix}php-pecl(%{pecl_name})           = %{version}
+Provides:       %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa}   = %{version}
+Provides:       %{?scl_prefix}php-pie(%{pie_vend}/%{pie_proj}) = %{version}
+Provides:       %{?scl_prefix}php-%{pie_vend}-%{pie_proj}      = %{version}
 
 
 %description
@@ -65,6 +71,8 @@ sed -e 's/role="test"/role="src"/' \
     -i package.xml
 
 cd %{sources}
+%patch -P0 -p1
+
 # Sanity check, really often broken
 extver=$(sed -n '/define PHP_EV_VERSION/{s/.* "//;s/".*$//;p}' php_ev.h)
 if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}%{?upstream_postver}"; then
@@ -176,6 +184,9 @@ TEST_PHP_ARGS="$DEPMOD -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \
 
 
 %changelog
+* Thu Jul 17 2025 Remi Collet <remi@remirepo.net> - 1.2.0-3
+- add patch for PHP 8.5.0alpha2 (sent to author)
+
 * Tue Sep 24 2024 Remi Collet <remi@remirepo.net> - 1.2.0-2
 - rebuild for 8.4.0RC1