gentoo auto-resync : 06:12:2024 - 02:07:38

3 files changed, 154 insertions, 1 deletions

diff --git a/dev-perl/XML-LibXML/Manifest b/dev-perl/XML-LibXML/Manifest
index a2525aad9122..a8e09cf28838 100644
--- a/dev-perl/XML-LibXML/Manifest
+++ b/dev-perl/XML-LibXML/Manifest
@@ -1,6 +1,7 @@
 AUX XML-LibXML-2.20.800-modern-c.patch 1873 BLAKE2B 3ecebf6822094014001865b1a8ecb174d724f0bc97d59ad3b1432c5d84dac22fa7b425800e14996ae30befd359313672504a1fcf0bbca014f541c0570c51b040 SHA512 60e059d74928fe766a8ecf91270eaf28d7204520b32cbbab0676b334018bbfd94196ef83ce54a8eadec7238a9640d208cc64262c222eccf51b3ef5636999fb02
+AUX XML-LibXML-2.21.0-libxml2-2.13.patch 5503 BLAKE2B b49259feef1b5b14c79f356ae5666a87a19e07badc12452fa497baca2cc7165448baec0cead4ecc80752abe6f40c643cefb00c304433077c8ff84225ff27e4bf SHA512 a6acee64e3e2c8460c777a0cb2152e1ff6198fa985e0d985fbbb2502606e56e92bb5d78dab2043832f457982038bf5abdd09af1f4f0f3fad26fa0b49a2da4314
 DIST XML-LibXML-2.0209.tar.gz 466118 BLAKE2B 665370499c16e60513263234c030d2be0d3a7c23563cae6ef06e125c3437057d8b835403b506c46caf864b6afff6e34370615d2508fb6891de99a0580bdf6f80 SHA512 3fd41775477ccb2eb9c72c72453436edcf2ed3db9aa1bbf53451c1407c5b6feeafd3ecc9f30507679f4dba15476044f43b5048da787c20a200831c0669b49262
 DIST XML-LibXML-2.0210.tar.gz 466316 BLAKE2B ebe5b6af158c68ef8df9b75f88445cf7e03ee41fcc3ba5c49216f2d27be63395a092a91a8ed8b4250ea1de3d627a2ca4df4a6af5cfff7bf5b2852bba33d99c86 SHA512 ae72b25ac6362152fa85ec9fed03fad694382bde29f459e1bd95b3ca4d1b0dffb76d2f8319bc6fbc6e291583696c3b95b41a23cc2bb509ce6f3fd7d74666fd77
 EBUILD XML-LibXML-2.20.900.ebuild 1967 BLAKE2B aa1ea0bc82b5d61c8a3bb021f73761d44a19c8e1aee4fbc58a7c56bddb800c39c8692d686184e1b03eb96a5c093a46187916701ce7183c1cbf9edd807ff4daba SHA512 18d2f81df566b8ebd8553eb6e010d5e37be8e91dc8a592f57544c0677b9e3f03472758eb4268fda822aac993bd1d06a8c31fbf11f7ac3d821c527eb37b413cdb
-EBUILD XML-LibXML-2.21.0.ebuild 1909 BLAKE2B cfa775669a5079eb797f9e08d2b6961660e8f39c926d9f32a7a168d9637f548548cf45ebdf86442282b813cfe32937af08336cf4f6129a5c8decdf5b34bfb315 SHA512 612d974c1f4f37fda4f5a34f7c6dc398fb568fe6416384700d0bff5a6679c8a7592cdfdae9def1578c80b02010636123bf5bfadce73d1130c746d3535f61c745
+EBUILD XML-LibXML-2.21.0.ebuild 1969 BLAKE2B 54364f1371720017c1b52c06b51cedbd1fe7f496d9502f7aeaa662b3d54af58ddb4f4187e1ab2de37cb1b2b6a42a650f0c3067fa158d4980e84ced12c2191b72 SHA512 f2bce855d7727175c53b316adf915cd0fb9849244c7b32eff0b002c8e8948f6a80e2994ed62696b08b3762b211297b911e9d92857ebb5536b91d75b7869775fb
 MISC metadata.xml 2848 BLAKE2B ab04e542e1e6bf7d2d56f131b33b0ff0a568e76c205358f7de0e631d0e1cf16804103f8ac6da9867662023d887d97e6d4b25941056af8ad1a60eb1f1e9074987 SHA512 70f9e3c83938f8d73cdb1a87b2a663d636d5a51ca5a2a969b473171a303acf00f214f96ab342b6a607e8e5024074b5602598df50dbf7f7604212c2331927932b
diff --git a/dev-perl/XML-LibXML/XML-LibXML-2.21.0.ebuild b/dev-perl/XML-LibXML/XML-LibXML-2.21.0.ebuild
index 01657ca39124..1e29dc86274a 100644
--- a/dev-perl/XML-LibXML/XML-LibXML-2.21.0.ebuild
+++ b/dev-perl/XML-LibXML/XML-LibXML-2.21.0.ebuild
@@ -47,6 +47,10 @@ PERL_RM_FILES=(
 	"t/11memory.t"
 )
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.21.0-libxml2-2.13.patch
+)
+
 src_compile() {
 	export SKIP_SAX_INSTALL=1
 	perl-module_src_compile
diff --git a/dev-perl/XML-LibXML/files/XML-LibXML-2.21.0-libxml2-2.13.patch b/dev-perl/XML-LibXML/files/XML-LibXML-2.21.0-libxml2-2.13.patch
new file mode 100644
index 000000000000..e1ebd2bd1c4b
--- /dev/null
+++ b/dev-perl/XML-LibXML/files/XML-LibXML-2.21.0-libxml2-2.13.patch
@@ -0,0 +1,148 @@
+https://github.com/shlomif/perl-XML-LibXML/pull/87
+
+From bee8338fd1cbd7aad4bf60c2965833343b6ead6f Mon Sep 17 00:00:00 2001
+From: Nick Wellnhofer <wellnhofer@aevum.de>
+Date: Tue, 21 May 2024 15:17:30 +0200
+Subject: [PATCH] Fix test suite with libxml2 2.13.0
+
+---
+ t/02parse.t                        | 7 ++++++-
+ t/08findnodes.t                    | 8 +++++++-
+ t/19die_on_invalid_utf8_rt_58848.t | 2 +-
+ t/25relaxng.t                      | 4 ++--
+ t/26schema.t                       | 4 ++--
+ t/60error_prev_chain.t             | 8 ++++----
+ 6 files changed, 22 insertions(+), 11 deletions(-)
+
+diff --git a/t/02parse.t b/t/02parse.t
+index b111507b..40aa5f13 100644
+--- a/t/02parse.t
++++ b/t/02parse.t
+@@ -884,7 +884,12 @@ EOXML
+         eval {
+            $doc2    = $parser->parse_string( $xmldoc );
+         };
+-        isnt($@, '', "error parsing $xmldoc");
++        # https://gitlab.gnome.org/GNOME/libxml2/-/commit/b717abdd
++        if (XML::LibXML::LIBXML_RUNTIME_VERSION() < 21300) {
++            isnt($@, '', "error parsing $xmldoc");
++        } else {
++            is( $doc2->documentElement()->firstChild()->nodeName(), "foo" );
++        }
+ 
+         $parser->validation(1);
+ 
+diff --git a/t/08findnodes.t b/t/08findnodes.t
+index 016c85a1..e9417bc5 100644
+--- a/t/08findnodes.t
++++ b/t/08findnodes.t
+@@ -123,7 +123,13 @@ my $docstring = q{
+ my @ns = $root->findnodes('namespace::*');
+ # TEST
+ 
+-is(scalar(@ns), 2, ' TODO : Add test name' );
++# https://gitlab.gnome.org/GNOME/libxml2/-/commit/aca16fb3
++# fixed xmlCopyNamespace with XML namespace.
++if (XML::LibXML::LIBXML_RUNTIME_VERSION() < 21300) {
++    is(scalar(@ns), 2, ' TODO : Add test name' );
++} else {
++    is(scalar(@ns), 3, ' TODO : Add test name' );
++}
+ 
+ # bad xpaths
+ # TEST:$badxpath=4;
+diff --git a/t/19die_on_invalid_utf8_rt_58848.t b/t/19die_on_invalid_utf8_rt_58848.t
+index aa8ad105..4160cb27 100644
+--- a/t/19die_on_invalid_utf8_rt_58848.t
++++ b/t/19die_on_invalid_utf8_rt_58848.t
+@@ -16,7 +16,7 @@ use XML::LibXML;
+     my $err = $@;
+ 
+     # TEST
+-    like ("$err", qr{parser error : Input is not proper UTF-8},
++    like ("$err", qr{not proper UTF-8|Invalid bytes in character encoding},
+         'Parser error.',
+     );
+ }
+diff --git a/t/25relaxng.t b/t/25relaxng.t
+index 93e61883..71383b2a 100644
+--- a/t/25relaxng.t
++++ b/t/25relaxng.t
+@@ -132,7 +132,7 @@ print "# 6 check that no_network => 1 works\n";
+ {
+     my $rng = eval { XML::LibXML::RelaxNG->new( location => $netfile, no_network => 1 ) };
+     # TEST
+-    like( $@, qr{I/O error : Attempt to load network entity}, 'RNG from file location with external import and no_network => 1 throws an exception.' );
++    like( $@, qr{Attempt to load network entity}, 'RNG from file location with external import and no_network => 1 throws an exception.' );
+     # TEST
+     ok( !defined $rng, 'RNG from file location with external import and no_network => 1 is not loaded.' );
+ }
+@@ -152,7 +152,7 @@ print "# 6 check that no_network => 1 works\n";
+ </grammar>
+ EOF
+     # TEST
+-    like( $@, qr{I/O error : Attempt to load network entity}, 'RNG from buffer with external import and no_network => 1 throws an exception.' );
++    like( $@, qr{Attempt to load network entity}, 'RNG from buffer with external import and no_network => 1 throws an exception.' );
+     # TEST
+     ok( !defined $rng, 'RNG from buffer with external import and no_network => 1 is not loaded.' );
+ }
+diff --git a/t/26schema.t b/t/26schema.t
+index 17f641e4..c404cedd 100644
+--- a/t/26schema.t
++++ b/t/26schema.t
+@@ -117,7 +117,7 @@ EOF
+ {
+     my $schema = eval { XML::LibXML::Schema->new( location => $netfile, no_network => 1 ) };
+     # TEST
+-    like( $@, qr{I/O error : Attempt to load network entity}, 'Schema from file location with external import and no_network => 1 throws an exception.' );
++    like( $@, qr{Attempt to load network entity}, 'Schema from file location with external import and no_network => 1 throws an exception.' );
+     # TEST
+     ok( !defined $schema, 'Schema from file location with external import and no_network => 1 is not loaded.' );
+ }
+@@ -129,7 +129,7 @@ EOF
+ </xsd:schema>
+ EOF
+     # TEST
+-    like( $@, qr{I/O error : Attempt to load network entity}, 'Schema from buffer with external import and no_network => 1 throws an exception.' );
++    like( $@, qr{Attempt to load network entity}, 'Schema from buffer with external import and no_network => 1 throws an exception.' );
+     # TEST
+     ok( !defined $schema, 'Schema from buffer with external import and no_network => 1 is not loaded.' );
+ }
+diff --git a/t/60error_prev_chain.t b/t/60error_prev_chain.t
+index e48215c4..55ac0b2e 100644
+--- a/t/60error_prev_chain.t
++++ b/t/60error_prev_chain.t
+@@ -16,13 +16,11 @@ use XML::LibXML;
+ 
+ {
+     my $parser = XML::LibXML->new();
+-    $parser->validation(0);
+-    $parser->load_ext_dtd(0);
+ 
+     eval
+     {
+         local $^W = 0;
+-        $parser->parse_file('example/JBR-ALLENtrees.htm');
++        $parser->parse_string('<doc>&ldquo;&nbsp;&rdquo;</doc>');
+     };
+ 
+     my $err = $@;
+@@ -31,7 +29,7 @@ use XML::LibXML;
+     if( $err && !ref($err) ) {
+       plan skip_all => 'The local libxml library does not support errors as objects to $@';
+     }
+-    plan tests => 1;
++    plan tests => 2;
+ 
+     while (defined($err) && $count < 200)
+     {
+@@ -44,6 +42,8 @@ use XML::LibXML;
+ 
+     # TEST
+     ok ((!$err), "Reached the end of the chain.");
++    # TEST
++    is ($count, 3, "Correct number of errors reported")
+ }
+ 
+ =head1 COPYRIGHT & LICENSE
+