diff options
| author | Remi Collet <remi@remirepo.net> | 2025-07-18 09:50:08 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2025-07-18 09:50:08 +0200 |
| commit | b5fa73c3dde77eaaf4f24523052c6f49fa377cf3 (patch) | |
| tree | da83f1fd0bbc86ac85c5a1720f99ce991d97c558 | |
| parent | c81c1fb0e2c560cf39fc25d38a0f9041a6d273c9 (diff) | |
https://github.com/php/pecl-search_engine-solr/pull/88
| -rw-r--r-- | 88.patch | 23 | ||||
| -rw-r--r-- | php-pecl-solr2.spec | 10 |
2 files changed, 32 insertions, 1 deletions
diff --git a/88.patch b/88.patch new file mode 100644 index 0000000..7ff51ab --- /dev/null +++ b/88.patch @@ -0,0 +1,23 @@ +From 53db37e10f28261844ac9e82493b3a9e0b20e7e8 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Fri, 18 Jul 2025 09:46:45 +0200 +Subject: [PATCH] use zend_ce_exception instead of zend_exception_get_default() + for 8.5 + +--- + src/php_solr.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/php_solr.h b/src/php_solr.h +index 278182f9..d7511a14 100644 +--- a/src/php_solr.h ++++ b/src/php_solr.h +@@ -126,7 +126,7 @@ extern ZEND_API zend_class_entry *zend_ce_iterator; + #define solr_ce_Serializable zend_ce_serializable + #define solr_ce_ArrayAccess zend_ce_arrayaccess + #define solr_ce_Iterator zend_ce_iterator +-#define solr_ce_Exception zend_exception_get_default() ++#define solr_ce_Exception zend_ce_exception + /* }}} */ + + extern zend_object_handlers solr_object_handlers; diff --git a/php-pecl-solr2.spec b/php-pecl-solr2.spec index 183561f..d08dc2c 100644 --- a/php-pecl-solr2.spec +++ b/php-pecl-solr2.spec @@ -30,13 +30,15 @@ Summary: Object oriented API to Apache Solr Summary(fr): API orientée objet pour Apache Solr Name: %{?scl_prefix}php-pecl-solr2 Version: 2.8.1 -Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: PHP-3.01 Group: Development/Languages URL: https://pecl.php.net/package/solr Source0: https://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz +Patch0: 88.patch + BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 7.4 @@ -94,6 +96,8 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd %{sources} +%patch -P0 -p1 + : Check version extver=$(sed -n '/#define PHP_SOLR_VERSION /{s/.* "//;s/".*$//;p}' src/php_solr_version.h) if test "x${extver}" != "x%{version}%{?prever}"; then @@ -209,6 +213,10 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Fri Jul 18 2025 Remi Collet <remi@remirepo.net> - 2.8.1-2 +- add fix for PHP 8.5.0alpha2 using patch from + https://github.com/php/pecl-search_engine-solr/pull/88 + * Wed Apr 23 2025 Remi Collet <remi@remirepo.net> - 2.8.1-1 - update to 2.8.1 |