From 29a98a321b32fec455cca9ec87b1731d3be1bac3 Mon Sep 17 00:00:00 2001 From: "Shencb@123" <1944340417@qq.com> Date: Mon, 26 Aug 2024 20:16:27 +0800 Subject: [PATCH 01/10] support clang --- 0001-modify-perl-libxml-mm.c.patch | 43 ++++++++++++++++++++++++++++++ perl-XML-LibXML.spec | 3 +++ 2 files changed, 46 insertions(+) create mode 100644 0001-modify-perl-libxml-mm.c.patch diff --git a/0001-modify-perl-libxml-mm.c.patch b/0001-modify-perl-libxml-mm.c.patch new file mode 100644 index 0000000..a1bffe6 --- /dev/null +++ b/0001-modify-perl-libxml-mm.c.patch @@ -0,0 +1,43 @@ +From 1ea163faf5c1c8f46fbdd0a1052128cbd06a3a3d Mon Sep 17 00:00:00 2001 +From: "Shencb@123" <1944340417@qq.com> +Date: Mon, 26 Aug 2024 19:56:30 +0800 +Subject: [PATCH] modify perl-libxml-mm.c + +--- + perl-libxml-mm.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/perl-libxml-mm.c b/perl-libxml-mm.c +index a3e78a2..f4215c4 100644 +--- a/perl-libxml-mm.c ++++ b/perl-libxml-mm.c +@@ -121,7 +121,7 @@ PmmFreeHashTable(xmlHashTablePtr table) + extern SV* PROXY_NODE_REGISTRY_MUTEX; + + /* Utility method used by PmmDumpRegistry */ +-void PmmRegistryDumpHashScanner(void * payload, void * data, xmlChar * name) ++void PmmRegistryDumpHashScanner(void * payload, void * data,const xmlChar * name) + { + LocalProxyNodePtr lp = (LocalProxyNodePtr) payload; + ProxyNodePtr node = (ProxyNodePtr) lp->proxy; +@@ -215,7 +215,7 @@ PmmRegisterProxyNode(ProxyNodePtr proxy) + /* PP: originally this was static inline void, but on AIX the compiler + did not chew it, so I'm removing the inline */ + static void +-PmmRegistryHashDeallocator(void *payload, xmlChar *name) ++PmmRegistryHashDeallocator(void *payload,const xmlChar *name) + { + Safefree((LocalProxyNodePtr) payload); + } +@@ -279,7 +279,7 @@ PmmRegistryREFCNT_dec(ProxyNodePtr proxy) + * internal, used by PmmCloneProxyNodes + */ + void * +-PmmRegistryHashCopier(void *payload, xmlChar *name) ++PmmRegistryHashCopier(void *payload,const xmlChar *name) + { + ProxyNodePtr proxy = ((LocalProxyNodePtr) payload)->proxy; + LocalProxyNodePtr lp; +-- +2.45.2.windows.1 + diff --git a/perl-XML-LibXML.spec b/perl-XML-LibXML.spec index 7207974..1a72cbd 100644 --- a/perl-XML-LibXML.spec +++ b/perl-XML-LibXML.spec @@ -7,6 +7,8 @@ License: (GPL+ or Artistic) and MIT URL: https://metacpan.org/release/XML-LibXML Source0: https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/XML-LibXML-%{version}.tar.gz +Patch0001: 0001-modify-perl-libxml-mm.c.patch + BuildRequires: coreutils, findutils, glibc-common, libxml2-devel BuildRequires: perl-interpreter, perl-devel, perl-generators, sed BuildRequires: perl(Config), perl(Cwd), perl(Devel::CheckLib), perl(ExtUtils::MakeMaker) @@ -49,6 +51,7 @@ sed -i -e '/^inc\// d' MANIFEST %build perl Makefile.PL SKIP_SAX_INSTALL=1 INSTALLDIRS=vendor OPTIMIZE="%{optflags}" %make_build +%patch 1 -p1 %install make pure_install DESTDIR=$RPM_BUILD_ROOT NO_PACKLIST=1 -- Gitee From 6e81becdc15b95024a705c8da31171ade4b5eb29 Mon Sep 17 00:00:00 2001 From: "Shencb@123" <1944340417@qq.com> Date: Mon, 26 Aug 2024 20:33:34 +0800 Subject: [PATCH 02/10] support clang --- perl-XML-LibXML.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/perl-XML-LibXML.spec b/perl-XML-LibXML.spec index 1a72cbd..47c0a99 100644 --- a/perl-XML-LibXML.spec +++ b/perl-XML-LibXML.spec @@ -7,8 +7,6 @@ License: (GPL+ or Artistic) and MIT URL: https://metacpan.org/release/XML-LibXML Source0: https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/XML-LibXML-%{version}.tar.gz -Patch0001: 0001-modify-perl-libxml-mm.c.patch - BuildRequires: coreutils, findutils, glibc-common, libxml2-devel BuildRequires: perl-interpreter, perl-devel, perl-generators, sed BuildRequires: perl(Config), perl(Cwd), perl(Devel::CheckLib), perl(ExtUtils::MakeMaker) @@ -48,10 +46,11 @@ done sed -i -e '/^inc\// d' MANIFEST +patch -p1 -i 0001-modify-perl-libxml-mm.c.patch + %build perl Makefile.PL SKIP_SAX_INSTALL=1 INSTALLDIRS=vendor OPTIMIZE="%{optflags}" %make_build -%patch 1 -p1 %install make pure_install DESTDIR=$RPM_BUILD_ROOT NO_PACKLIST=1 -- Gitee From 782a1fdac962a9905ad609e5dddd277fb28c1517 Mon Sep 17 00:00:00 2001 From: "Shencb@123" <1944340417@qq.com> Date: Mon, 26 Aug 2024 20:43:41 +0800 Subject: [PATCH 03/10] support clang --- perl-XML-LibXML.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-XML-LibXML.spec b/perl-XML-LibXML.spec index 47c0a99..8dfa683 100644 --- a/perl-XML-LibXML.spec +++ b/perl-XML-LibXML.spec @@ -46,7 +46,7 @@ done sed -i -e '/^inc\// d' MANIFEST -patch -p1 -i 0001-modify-perl-libxml-mm.c.patch +patch -p1 0001-modify-perl-libxml-mm.c.patch %build perl Makefile.PL SKIP_SAX_INSTALL=1 INSTALLDIRS=vendor OPTIMIZE="%{optflags}" -- Gitee From 1a623c8b66f034d61a07e140e2488ec3fea00db3 Mon Sep 17 00:00:00 2001 From: "Shencb@123" <1944340417@qq.com> Date: Mon, 26 Aug 2024 20:53:26 +0800 Subject: [PATCH 04/10] support clang --- perl-XML-LibXML.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-XML-LibXML.spec b/perl-XML-LibXML.spec index 8dfa683..1f7c0e3 100644 --- a/perl-XML-LibXML.spec +++ b/perl-XML-LibXML.spec @@ -46,7 +46,7 @@ done sed -i -e '/^inc\// d' MANIFEST -patch -p1 0001-modify-perl-libxml-mm.c.patch +patch -p1 -i. %build perl Makefile.PL SKIP_SAX_INSTALL=1 INSTALLDIRS=vendor OPTIMIZE="%{optflags}" -- Gitee From 200b10e80bf13e0df7f6faa354e0473e9c547945 Mon Sep 17 00:00:00 2001 From: "Shencb@123" <1944340417@qq.com> Date: Mon, 26 Aug 2024 20:58:46 +0800 Subject: [PATCH 05/10] support clang --- perl-XML-LibXML.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-XML-LibXML.spec b/perl-XML-LibXML.spec index 1f7c0e3..47c0a99 100644 --- a/perl-XML-LibXML.spec +++ b/perl-XML-LibXML.spec @@ -46,7 +46,7 @@ done sed -i -e '/^inc\// d' MANIFEST -patch -p1 -i. +patch -p1 -i 0001-modify-perl-libxml-mm.c.patch %build perl Makefile.PL SKIP_SAX_INSTALL=1 INSTALLDIRS=vendor OPTIMIZE="%{optflags}" -- Gitee From e9e40c4ff57e021343b3cb3b6ea4e176648698b9 Mon Sep 17 00:00:00 2001 From: "Shencb@123" <1944340417@qq.com> Date: Mon, 26 Aug 2024 21:02:41 +0800 Subject: [PATCH 06/10] support clang --- perl-XML-LibXML.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-XML-LibXML.spec b/perl-XML-LibXML.spec index 47c0a99..8dfa683 100644 --- a/perl-XML-LibXML.spec +++ b/perl-XML-LibXML.spec @@ -46,7 +46,7 @@ done sed -i -e '/^inc\// d' MANIFEST -patch -p1 -i 0001-modify-perl-libxml-mm.c.patch +patch -p1 0001-modify-perl-libxml-mm.c.patch %build perl Makefile.PL SKIP_SAX_INSTALL=1 INSTALLDIRS=vendor OPTIMIZE="%{optflags}" -- Gitee From 7933420cc71e4e010d29314d3b3bbd3372e1b5ee Mon Sep 17 00:00:00 2001 From: "Shencb@123" <1944340417@qq.com> Date: Mon, 26 Aug 2024 21:11:55 +0800 Subject: [PATCH 07/10] support clang --- perl-XML-LibXML.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/perl-XML-LibXML.spec b/perl-XML-LibXML.spec index 8dfa683..9f39a70 100644 --- a/perl-XML-LibXML.spec +++ b/perl-XML-LibXML.spec @@ -7,6 +7,8 @@ License: (GPL+ or Artistic) and MIT URL: https://metacpan.org/release/XML-LibXML Source0: https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/XML-LibXML-%{version}.tar.gz +Patch0001: 0001-modify-perl-libxml-mm.c.patch + BuildRequires: coreutils, findutils, glibc-common, libxml2-devel BuildRequires: perl-interpreter, perl-devel, perl-generators, sed BuildRequires: perl(Config), perl(Cwd), perl(Devel::CheckLib), perl(ExtUtils::MakeMaker) @@ -46,12 +48,12 @@ done sed -i -e '/^inc\// d' MANIFEST -patch -p1 0001-modify-perl-libxml-mm.c.patch - %build perl Makefile.PL SKIP_SAX_INSTALL=1 INSTALLDIRS=vendor OPTIMIZE="%{optflags}" %make_build +%patch 1 -p1 + %install make pure_install DESTDIR=$RPM_BUILD_ROOT NO_PACKLIST=1 find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -delete -- Gitee From a1262a889bc28d0f88238d7af6afd21808925ba3 Mon Sep 17 00:00:00 2001 From: "Shencb@123" <1944340417@qq.com> Date: Mon, 26 Aug 2024 21:19:30 +0800 Subject: [PATCH 08/10] support clang --- perl-XML-LibXML.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/perl-XML-LibXML.spec b/perl-XML-LibXML.spec index 9f39a70..8749b55 100644 --- a/perl-XML-LibXML.spec +++ b/perl-XML-LibXML.spec @@ -48,12 +48,12 @@ done sed -i -e '/^inc\// d' MANIFEST +%patch 1 -p1 + %build perl Makefile.PL SKIP_SAX_INSTALL=1 INSTALLDIRS=vendor OPTIMIZE="%{optflags}" %make_build -%patch 1 -p1 - %install make pure_install DESTDIR=$RPM_BUILD_ROOT NO_PACKLIST=1 find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -delete -- Gitee From fadea1ea8094c98871010f8d96e7503824dba84f Mon Sep 17 00:00:00 2001 From: "Shencb@123" <1944340417@qq.com> Date: Mon, 26 Aug 2024 21:24:41 +0800 Subject: [PATCH 09/10] support clang --- perl-XML-LibXML.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/perl-XML-LibXML.spec b/perl-XML-LibXML.spec index 8749b55..19fc830 100644 --- a/perl-XML-LibXML.spec +++ b/perl-XML-LibXML.spec @@ -48,8 +48,6 @@ done sed -i -e '/^inc\// d' MANIFEST -%patch 1 -p1 - %build perl Makefile.PL SKIP_SAX_INSTALL=1 INSTALLDIRS=vendor OPTIMIZE="%{optflags}" %make_build -- Gitee From c5063ed9d50c1f8a01f835716cccb35d88a86330 Mon Sep 17 00:00:00 2001 From: "Shencb@123" <1944340417@qq.com> Date: Wed, 28 Aug 2024 17:25:42 +0800 Subject: [PATCH 10/10] support clang --- perl-XML-LibXML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/perl-XML-LibXML.spec b/perl-XML-LibXML.spec index 19fc830..c54396c 100644 --- a/perl-XML-LibXML.spec +++ b/perl-XML-LibXML.spec @@ -1,6 +1,6 @@ Name: perl-XML-LibXML Version: 2.0209 -Release: 1 +Release: 2 Epoch: 1 Summary: Perl Binding for libxml2 License: (GPL+ or Artistic) and MIT @@ -84,6 +84,9 @@ fi %{_mandir}/man*/* %changelog +* Thu Aug 10 2024 shen-chenbang <1944340417@qq.com> - 1:2.0210-1 +- Update to 2.0210 + * Thu Aug 10 2023 liyanan - 1:2.0209-1 - Update to 2.0209 -- Gitee