diff options
| author | Remi Collet <remi@remirepo.net> | 2025-12-20 07:50:40 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2025-12-20 07:50:40 +0100 |
| commit | 321a95a254dd41e949d376bf2b86207d05ecf80f (patch) | |
| tree | 89b4e6b283cc241e1787d6901686ea0254a82666 | |
| parent | 647432468be2b1ca2ddce44bc26dcb7a3e0a3334 (diff) | |
drop patch merged upstream
| -rw-r--r-- | 6.patch | 22 | ||||
| -rw-r--r-- | PHPINFO | 2 | ||||
| -rw-r--r-- | REFLECTION | 2 | ||||
| -rw-r--r-- | php-pecl-xmldiff.spec | 11 |
4 files changed, 8 insertions, 29 deletions
diff --git a/6.patch b/6.patch deleted file mode 100644 index 587c241..0000000 --- a/6.patch +++ /dev/null @@ -1,22 +0,0 @@ -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.5 +xmldiff version => 1.1.6 diffmark library => system Revision => $Id$ @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #114 xmldiff version 1.1.5 ] { +Extension [ <persistent> extension #128 xmldiff version 1.1.6 ] { - Dependencies { Dependency [ dom (Required) ] diff --git a/php-pecl-xmldiff.spec b/php-pecl-xmldiff.spec index 7289e0d..8093495 100644 --- a/php-pecl-xmldiff.spec +++ b/php-pecl-xmldiff.spec @@ -17,14 +17,12 @@ Summary: XML diff and merge Name: %{?scl_prefix}php-pecl-%{pecl_name} -Version: 1.1.5 -Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Version: 1.1.6 +Release: 1%{?dist} 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 @@ -73,7 +71,6 @@ 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 @@ -204,6 +201,10 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Sat Dec 20 2025 Remi Collet <remi@remirepo.net> - 1.1.6-1 +- update to 1.1.6 +- drop patch merged upstream + * Thu Sep 25 2025 Remi Collet <remi@remirepo.net> - 1.1.5-4 - rebuild for PHP 8.5.0RC1 |