diff options
| -rw-r--r-- | 10.patch | 42 | ||||
| -rw-r--r-- | php-pecl-trie.spec | 41 |
2 files changed, 57 insertions, 26 deletions
diff --git a/10.patch b/10.patch new file mode 100644 index 0000000..ff4a563 --- /dev/null +++ b/10.patch @@ -0,0 +1,42 @@ +From 917069332cb88706202ea70fd06f762944271cf9 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Thu, 17 Jul 2025 16:41:44 +0200 +Subject: [PATCH] SPL is always there + +--- + common.cpp | 2 -- + php_trie.cpp | 5 ----- + 2 files changed, 7 deletions(-) + +diff --git a/common.cpp b/common.cpp +index 1673811..65e1dfb 100644 +--- a/common.cpp ++++ b/common.cpp +@@ -23,9 +23,7 @@ using namespace trie; + #include "config.h" + #endif + +-#ifdef HAVE_SPL + #include "ext/spl/spl_exceptions.h" +-#endif + + /* For compatibility with older PHP versions */ + #ifndef ZEND_PARSE_PARAMETERS_NONE +diff --git a/php_trie.cpp b/php_trie.cpp +index c6081bc..2c17f76 100644 +--- a/php_trie.cpp ++++ b/php_trie.cpp +@@ -530,13 +530,8 @@ PHP_MINIT_FUNCTION(php_trie) + sizeof("DEFAULT_BURST_THRESHOLD") - 1, + DEFAULT_BURST_THRESHOLD); + +-#ifdef HAVE_SPL + phptrie_exception_ce = zend_register_internal_class_ex( + &exception_ce, spl_ce_RuntimeException); +-#else +- phptrie_exception_ce = zend_register_internal_class_ex( +- &exception_ce, zend_exception_get_default()); +-#endif + + zend_class_implements(phphattrie_ce, 2, zend_ce_arrayaccess, php_json_serializable_ce); + zend_class_implements(phptrie_ce, 2, zend_ce_arrayaccess, php_json_serializable_ce); diff --git a/php-pecl-trie.spec b/php-pecl-trie.spec index 461bee1..d71d075 100644 --- a/php-pecl-trie.spec +++ b/php-pecl-trie.spec @@ -1,8 +1,8 @@ # remirepo spec file for php-pecl-trie # -# Copyright (c) 2020-2023 Remi Collet -# License: CC-BY-SA-4.0 -# http://creativecommons.org/licenses/by-sa/4.0/ +# SPDX-FileCopyrightText: Copyright 2024-2025 Remi Collet +# SPDX-License-Identifier: CECILL-2.1 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # # Please, preserve the changelog entries # @@ -18,13 +18,15 @@ Summary: PHP Trie extension Name: %{?scl_prefix}php-pecl-trie Version: 0.1.2 -Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 3%{?dist}%{!?scl:%{!?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 # headers only library Source1: https://github.com/Tessil/hat-trie/archive/v%{libver}.tar.gz +Patch0: 10.patch + BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 7.3 @@ -56,10 +58,12 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO # Don't install/register tests sed -e 's/role="test"/role="src"/' \ - %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \ + -e '/LICENSE/s/role="doc"/role="src"/' \ -i package.xml cd %{sources} +%patch -P0 -p1 + # Sanity check, really often broken extver=$(sed -n '/#define PHP_TRIE_EXT_EXTVER/{s/.* "//;s/".*$//;p}' php_trie_ext.h) if test "x${extver}" != "x%{version}%{?prever:-%{prever}}"; then @@ -132,26 +136,6 @@ do install -Dpm 644 %{sources}/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i done -%if 0%{?fedora} < 24 && 0%{?rhel} < 8 -# when pear installed alone, after us -%triggerin -- %{?scl_prefix}php-pear -if [ -x %{__pecl} ] ; then - %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : -fi - -# posttrans as pear can be installed after us -%posttrans -if [ -x %{__pecl} ] ; then - %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : -fi - -%postun -if [ $1 -eq 0 -a -x %{__pecl} ] ; then - %{pecl_uninstall} %{pecl_name} >/dev/null || : -fi -%endif - - %check cd %{sources} OPT="-n" @@ -180,7 +164,7 @@ TEST_PHP_ARGS="$OPT -d extension=$PWD/../ZTS/modules/%{pecl_name}.so" \ %files -%{?_licensedir:%license %{sources}/LICENSE} +%license %{sources}/LICENSE %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -194,6 +178,11 @@ TEST_PHP_ARGS="$OPT -d extension=$PWD/../ZTS/modules/%{pecl_name}.so" \ %changelog +* Thu Jul 17 2025 Remi Collet <remi@remirepo.net> - 0.1.2-3 +- add fixes for PHP 8.5.0alpha2 using patch from + https://github.com/ace411/php-trie-ext/pull/10 +- re-license spec file to CECILL-2.1 + * Fri Sep 1 2023 Remi Collet <remi@remirepo.net> - 0.1.2-2 - build out of sources tree |