diff options
| author | Remi Collet <remi@remirepo.net> | 2024-11-27 13:09:19 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2024-11-27 13:09:19 +0100 |
| commit | c8862c955d488e83e0201b5016f11a5931ebf667 (patch) | |
| tree | 842cb7d94c52b5839370d8ce29c78982ee7621ef | |
| parent | 58a9c96b46b5622614150bec697ee0ceef3dfe5f (diff) | |
drop patch merged upstream
| -rw-r--r-- | 2.patch | 24 | ||||
| -rw-r--r-- | php-pecl-xmldiff.spec | 12 |
2 files changed, 6 insertions, 30 deletions
diff --git a/2.patch b/2.patch deleted file mode 100644 index 546b936..0000000 --- a/2.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 6113283a3c2c44075eada797e5c294e185e09943 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Mon, 30 Sep 2024 08:53:27 +0200 -Subject: [PATCH] Fix DOM_RET_OBJ calls for 8.4 - ---- - php_xmldiff.h | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/php_xmldiff.h b/php_xmldiff.h -index 9ab2d08..c9be5c7 100644 ---- a/php_xmldiff.h -+++ b/php_xmldiff.h -@@ -190,7 +190,9 @@ php_xmldiff_do_diff_memory(const char *from, size_t from_len, const char *to, si - PHP_XMLDIFF_API xmlChar * - php_xmldiff_do_merge_memory(const char *src, size_t src_len, const char *diff, size_t diff_len, struct ze_xmldiff_obj *zxo TSRMLS_DC); - --#if PHP_MAJOR_VERSION >= 7 || PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 3 -+#if PHP_MAJOR_VERSION > 8 || PHP_MAJOR_VERSION == 8 && PHP_MINOR_VERSION > 3 -+# define XMLDIFF_DOM_RET_OBJ(obj, ret, domobject) DOM_RET_OBJ(obj, domobject) -+#elif PHP_MAJOR_VERSION >= 7 || PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 3 - # define XMLDIFF_DOM_RET_OBJ DOM_RET_OBJ - #elif PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION == 3 && PHP_RELEASE_VERSION > 6 - # define XMLDIFF_DOM_RET_OBJ DOM_RET_OBJ_EX diff --git a/php-pecl-xmldiff.spec b/php-pecl-xmldiff.spec index 7f8d9c1..e8f3589 100644 --- a/php-pecl-xmldiff.spec +++ b/php-pecl-xmldiff.spec @@ -22,14 +22,12 @@ Summary: XML diff and merge Name: %{?scl_prefix}php-pecl-%{pecl_name} -Version: 1.1.3 -Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Version: 1.1.4 +Release: 1%{?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: 2.patch - BuildRequires: %{?dtsprefix}gcc BuildRequires: make BuildRequires: %{?scl_prefix}php-devel @@ -78,8 +76,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 @@ -209,6 +205,10 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Wed Nov 27 2024 Remi Collet <remi@remirepo.net> - 1.1.4-1 +- update to 1.1.4 +- drop patch merged upstream + * Mon Sep 30 2024 Remi Collet <remi@remirepo.net> - 1.1.3-4 - fix PHP 8.4 build using patch from https://github.com/php/pecl-xml-xmldiff/pull/2 |