diff options
| -rw-r--r-- | 6.patch | 22 | ||||
| -rw-r--r-- | PHPINFO | 4 | ||||
| -rw-r--r-- | REFLECTION | 2 | ||||
| -rw-r--r-- | php-pecl-xmldiff.spec | 33 |
4 files changed, 48 insertions, 13 deletions
@@ -0,0 +1,22 @@ +From e3212dc9d47f834647e6c1726e50fce5c1aa1c7c Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Tue, 15 Jul 2025 15:05:20 +0200 +Subject: [PATCH] use zend_ce_exception + +--- + xmldiff.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/xmldiff.cpp b/xmldiff.cpp +index 47e6210..290d733 100644 +--- a/xmldiff.cpp ++++ b/xmldiff.cpp +@@ -280,7 +280,7 @@ PHP_MINIT_FUNCTION(xmldiff) + + INIT_CLASS_ENTRY(ce, "XMLDiff\\Exception", NULL); + #if PHP_MAJOR_VERSION >= 7 +- XMLDiffException_ce = zend_register_internal_class_ex(&ce, zend_exception_get_default()); ++ XMLDiffException_ce = zend_register_internal_class_ex(&ce, zend_ce_exception); + #else + XMLDiffException_ce = zend_register_internal_class_ex( + &ce, NULL, "exception" TSRMLS_CC @@ -2,6 +2,6 @@ xmldiff xmldiff support => enabled -xmldiff version => 1.1.3 +xmldiff version => 1.1.5 diffmark library => system -Revision => $Id: xmldiff.cpp 350542 2020-09-10 12:08:03Z remi $ +Revision => $Id$ @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #106 xmldiff version 1.1.3 ] { +Extension [ <persistent> extension #114 xmldiff version 1.1.5 ] { - Dependencies { Dependency [ dom (Required) ] diff --git a/php-pecl-xmldiff.spec b/php-pecl-xmldiff.spec index e8f3589..7289e0d 100644 --- a/php-pecl-xmldiff.spec +++ b/php-pecl-xmldiff.spec @@ -1,8 +1,8 @@ # remirepo spec file for php-pecl-xmldiff # -# 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 # @@ -10,24 +10,21 @@ %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global pecl_name xmldiff -%if "%{php_version}" < "5.6" -# After dom -%global ini_name %{pecl_name}.ini -%else # After 20-dom %global ini_name 40-%{pecl_name}.ini -%endif %global sources %{pecl_name}-%{version} %global _configure ../%{sources}/configure Summary: XML diff and merge Name: %{?scl_prefix}php-pecl-%{pecl_name} -Version: 1.1.4 -Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Version: 1.1.5 +Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: BSD-2-Clause URL: https://pecl.php.net/package/%{pecl_name} Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz +Patch0: 6.patch + BuildRequires: %{?dtsprefix}gcc BuildRequires: make BuildRequires: %{?scl_prefix}php-devel @@ -76,6 +73,8 @@ sed -e '/name="diffmark/d' \ -i package.xml cd %{sources} +%patch -P0 -p1 + # drop bundled library to ensure it is not used rm -rf diffmark @@ -205,6 +204,20 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Thu Sep 25 2025 Remi Collet <remi@remirepo.net> - 1.1.5-4 +- rebuild for PHP 8.5.0RC1 + +* Wed Jul 30 2025 Remi Collet <remi@remirepo.net> - 1.1.5-3 +- rebuild for 8.5.0alpha3 + +* Tue Jul 15 2025 Remi Collet <remi@remirepo.net> - 1.1.5-2 +- add patch for PHP 8.5.0alpha2 from + https://github.com/php/pecl-xml-xmldiff/pull/6 + +* Sun Feb 23 2025 Remi Collet <remi@remirepo.net> - 1.1.5-1 +- update to 1.1.5 +- re-license spec file to CECILL-2.1 + * Wed Nov 27 2024 Remi Collet <remi@remirepo.net> - 1.1.4-1 - update to 1.1.4 - drop patch merged upstream |