update to 1.2.1HEADmaster

drop patch merged upstream

4 files changed, 8 insertions, 57 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
deleted file mode 100644
index acbfcf2..0000000
--- a/0001-use-zend_ce_exception-instead-of-zend_exception_get_.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-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/PHPINFO b/PHPINFO
index 047e5b3..e95fde1 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -3,4 +3,4 @@ ev
 
 Ev support => enabled
 Debug support => disabled
-Version => 1.2.0
+Version => 1.2.1
diff --git a/REFLECTION b/REFLECTION
index be5cb76..fb68cd4 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #72 ev version 1.2.0 ] {
+Extension [ <persistent> extension #78 ev version 1.2.1 ] {
 
   - Dependencies {
     Dependency [ sockets (Optional) ]
diff --git a/php-pecl-ev.spec b/php-pecl-ev.spec
index 7c6d0b1..7c1170b 100644
--- a/php-pecl-ev.spec
+++ b/php-pecl-ev.spec
@@ -19,7 +19,7 @@
 %global with_zts         0%{!?_without_zts:%{?__ztsphp:1}}
 # After 20-sockets
 %global ini_name         40-%{pecl_name}.ini
-%global upstream_version 1.2.0
+%global upstream_version 1.2.1
 #global upstream_prever  RC1
 #global upstream_postver r1
 %global sources          %{pecl_name}-%{upstream_version}%{?upstream_prever}%{?upstream_postver}
@@ -28,13 +28,11 @@
 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:        3%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Release:        1%{?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
@@ -71,8 +69,6 @@ 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
@@ -184,6 +180,10 @@ TEST_PHP_ARGS="$DEPMOD -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \
 
 
 %changelog
+* Thu Jul 17 2025 Remi Collet <remi@remirepo.net> - 1.2.1-1
+- update to 1.2.1
+- drop patch merged upstream
+
 * Thu Jul 17 2025 Remi Collet <remi@remirepo.net> - 1.2.0-3
 - add patch for PHP 8.5.0alpha2 (sent to author)