From 626c312ce15edb2343a313165bde470c3b1a9ccd Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 11 Aug 2025 06:54:53 +0200 Subject: update to 1.5.4 drop patch merged upstream --- 57.patch | 46 ---------------------------------------------- 1 file changed, 46 deletions(-) delete mode 100644 57.patch (limited to '57.patch') diff --git a/57.patch b/57.patch deleted file mode 100644 index 7f033ae..0000000 --- a/57.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 3f159064025dbde3aa0a4004cc4777a8032092b0 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Thu, 17 Jul 2025 14:50:00 +0200 -Subject: [PATCH] use zend_ce_exception instead of zend_exception_get_default() - for 8.5 - ---- - gnupg.c | 4 ++-- - gnupg_keylistiterator.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/gnupg.c b/gnupg.c -index 2693539..475d16e 100644 ---- a/gnupg.c -+++ b/gnupg.c -@@ -64,7 +64,7 @@ PHPC_OBJ_DEFINE_HANDLER_VAR(gnupg); - break; \ - case 2: \ - zend_throw_exception(\ -- zend_exception_get_default(TSRMLS_C), \ -+ zend_ce_exception, \ - (char*) error, \ - 0 TSRMLS_CC \ - ); \ -@@ -169,7 +169,7 @@ static void php_gnupg_this_make(PHPC_THIS_DECLARE(gnupg), zval *options TSRMLS_D - if (gpgme_ctx_set_engine_info( - ctx, GPGME_PROTOCOL_OpenPGP, file_name, home_dir) != GPG_ERR_NO_ERROR) { - zend_throw_exception( -- zend_exception_get_default(TSRMLS_C), -+ zend_ce_exception, - (char*) "Setting engine info failed", - 0 TSRMLS_CC - ); -diff --git a/gnupg_keylistiterator.c b/gnupg_keylistiterator.c -index 9b285ee..020e941 100644 ---- a/gnupg_keylistiterator.c -+++ b/gnupg_keylistiterator.c -@@ -201,7 +201,7 @@ PHP_METHOD(gnupg_keylistiterator, rewind) - - if ((PHPC_THIS->err = gpgme_op_keylist_start( - PHPC_THIS->ctx, PHPC_THIS->pattern ? PHPC_THIS->pattern : "", 0)) != GPG_ERR_NO_ERROR){ -- zend_throw_exception(zend_exception_get_default(TSRMLS_C), (char *)gpg_strerror(PHPC_THIS->err), 1 TSRMLS_CC); -+ zend_throw_exception(zend_ce_exception, (char *)gpg_strerror(PHPC_THIS->err), 1 TSRMLS_CC); - } - if ((PHPC_THIS->err = gpgme_op_keylist_next(PHPC_THIS->ctx, &PHPC_THIS->gpgkey)) != GPG_ERR_NO_ERROR){ - RETURN_FALSE; -- cgit