openkylin
/
libxml-sax-perl
mirror of https://gitee.com/openkylin/libxml-sax-perl.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

format patches

This commit is contained in:
luoyaoming 2024-05-06 21:49:25 +08:00
parent 8dc79bcc7a
commit 674611b954
6 changed files with 113 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/patches/Fix-another-typo-in-POD.patch vendored
View File

@ -1,6 +1,5 @@
From: intrigeri <intrigeri@boum.org> From: intrigeri <intrigeri@boum.org>
Date: Sun, 21 Jul 2019 13:47:20 +0000 Date: Sun, 21 Jul 2019 13:47:20 +0000
Origin: https://github.com/grantm/XML-SAX/pull/4
Subject: Fix another typo in POD Subject: Fix another typo in POD
--- ---

39
debian/patches/charset-decoding vendored
View File

@ -1,21 +1,17 @@
Description: Fix charset decoding in the PurePerl module (#405186) From: Niko Tyni <ntyni@iki.fi>
Author: Niko Tyni <ntyni@iki.fi> Date: Sun, 4 Nov 2007 20:46:58 +0200
Date: Sun, 04 Nov 2007 20:46:58 +0200 Subject: Fix charset decoding in the PurePerl module (#405186)
--- a/lib/XML/SAX/PurePerl/Productions.pm ---
+++ b/lib/XML/SAX/PurePerl/Productions.pm lib/XML/SAX/PurePerl.pm | 2 +-
@@ -39,7 +39,7 @@ lib/XML/SAX/PurePerl/Productions.pm | 2 +-
# can't do this one without unicode 2 files changed, 2 insertions(+), 2 deletions(-)
# $CombiningChar = qr/^$/msx;
diff --git a/lib/XML/SAX/PurePerl.pm b/lib/XML/SAX/PurePerl.pm
- $NameChar = qr/^ (?: $BaseChar | $Digit | [._:-] | $Extender )+ $/x; index 7940736..21ad55e 100644
+ $NameChar = qr/ (?: $BaseChar | $Digit | [._:-] | $Extender )+ /x;
PERL
die $@ if $@;
}
--- a/lib/XML/SAX/PurePerl.pm --- a/lib/XML/SAX/PurePerl.pm
+++ b/lib/XML/SAX/PurePerl.pm +++ b/lib/XML/SAX/PurePerl.pm
@@ -677,7 +677,7 @@ @@ -677,7 +677,7 @@ sub Name {
return unless length($name); return unless length($name);
@ -24,3 +20,16 @@ Date: Sun, 04 Nov 2007 20:46:58 +0200
return $name; return $name;
} }
diff --git a/lib/XML/SAX/PurePerl/Productions.pm b/lib/XML/SAX/PurePerl/Productions.pm
index 25d49fb..49911ba 100644
--- a/lib/XML/SAX/PurePerl/Productions.pm
+++ b/lib/XML/SAX/PurePerl/Productions.pm
@@ -39,7 +39,7 @@ if ($] < 5.006) {
# can't do this one without unicode
# $CombiningChar = qr/^$/msx;
- $NameChar = qr/^ (?: $BaseChar | $Digit | [._:-] | $Extender )+ $/x;
+ $NameChar = qr/ (?: $BaseChar | $Digit | [._:-] | $Extender )+ /x;
PERL
die $@ if $@;
}

97
debian/patches/parserdetails-debian vendored
View File

@ -1,43 +1,29 @@
Description: The Debian way of handling ParserDetails.ini From: Originally by Ardo van Rangelrooij <ardo@debian.org>
Use update-perl-sax-parsers(8) instead. Date: Mon, 6 May 2024 21:49:25 +0800
. Subject: The Debian way of handling ParserDetails.ini
* SAX.pm: the meat of the modifications
+ add XML::SAX->save_parsers_debian(), used by update-perl-sax-parsers
+ disable XML::SAX->save_parsers() with a helpful error message for
users trying to install SAX parsers manually from CPAN
* Makefile.PL: Don't try to modify ParserDetails.ini when building the package
* t/01known.t, t/99cleanup.t: Skip tests related to XML::SAX->save_parsers()
Author: Originally by Ardo van Rangelrooij <ardo@debian.org>
Author: Cleanups and quilt conversion by Niko Tyni <ntyni@iki.fi>
Author: Ansgar Burchardt <ansgar@43-1.org> (XML::SAX::Debian)
--- a/t/01known.t Use update-perl-sax-parsers(8) instead.
+++ b/t/01known.t
@@ -1,6 +1,9 @@ * SAX.pm: the meat of the modifications
-use Test; + add XML::SAX->save_parsers_debian(), used by update-perl-sax-parsers
+use Test::More; + disable XML::SAX->save_parsers() with a helpful error message for
BEGIN { plan tests => 3 } users trying to install SAX parsers manually from CPAN
+SKIP: { * Makefile.PL: Don't try to modify ParserDetails.ini when building the package
+skip 'Tests skipped due to Debian modifications', 3; * t/01known.t, t/99cleanup.t: Skip tests related to XML::SAX->save_parsers()
use XML::SAX; ---
ok(XML::SAX->save_parsers); Makefile.PL | 4 ++++
ok(XML::SAX->load_parsers); lib/XML/SAX.pm | 13 +++++++++++++
ok(@{XML::SAX->parsers}, 0); lib/XML/SAX/Debian.pm | 47 +++++++++++++++++++++++++++++++++++++++++++++++
+} t/01known.t | 5 ++++-
--- a/t/99cleanup.t t/99cleanup.t | 2 +-
+++ b/t/99cleanup.t 5 files changed, 69 insertions(+), 2 deletions(-)
@@ -1,7 +1,7 @@ create mode 100644 lib/XML/SAX/Debian.pm
use Test;
BEGIN { plan tests => 1 } diff --git a/Makefile.PL b/Makefile.PL
use File::Spec; index e3ff75d..dc59cfc 100644
-ok(unlink(
+skip('Test skipped due to Debian modifications', unlink(
File::Spec->catdir(qw(blib lib XML SAX ParserDetails.ini))),
1,
'delete ParserDetails.ini'
--- a/Makefile.PL --- a/Makefile.PL
+++ b/Makefile.PL +++ b/Makefile.PL
@@ -27,6 +27,10 @@ @@ -27,6 +27,10 @@ sub MY::install {
package MY; package MY;
my $script = shift->SUPER::install(@_); my $script = shift->SUPER::install(@_);
@ -48,9 +34,11 @@ Author: Ansgar Burchardt <ansgar@43-1.org> (XML::SAX::Debian)
# Only modify existing ParserDetails.ini if user agrees # Only modify existing ParserDetails.ini if user agrees
my $write_ini_ok = 0; my $write_ini_ok = 0;
diff --git a/lib/XML/SAX.pm b/lib/XML/SAX.pm
index 7cd93d2..5297a2b 100644
--- a/lib/XML/SAX.pm --- a/lib/XML/SAX.pm
+++ b/lib/XML/SAX.pm +++ b/lib/XML/SAX.pm
@@ -179,6 +179,15 @@ @@ -179,6 +179,15 @@ sub add_parser {
sub save_parsers { sub save_parsers {
my $class = shift; my $class = shift;
@ -66,7 +54,7 @@ Author: Ansgar Burchardt <ansgar@43-1.org> (XML::SAX::Debian)
# get directory from wherever XML::SAX is installed # get directory from wherever XML::SAX is installed
my $dir = $INC{'XML/SAX.pm'}; my $dir = $INC{'XML/SAX.pm'};
$dir = dirname($dir); $dir = dirname($dir);
@@ -212,6 +221,10 @@ @@ -212,6 +221,10 @@ sub do_warn {
warn(@_) unless $ENV{HARNESS_ACTIVE}; warn(@_) unless $ENV{HARNESS_ACTIVE};
} }
@ -77,6 +65,9 @@ Author: Ansgar Burchardt <ansgar@43-1.org> (XML::SAX::Debian)
1; 1;
__END__ __END__
diff --git a/lib/XML/SAX/Debian.pm b/lib/XML/SAX/Debian.pm
new file mode 100644
index 0000000..e767c73
--- /dev/null --- /dev/null
+++ b/lib/XML/SAX/Debian.pm +++ b/lib/XML/SAX/Debian.pm
@@ -0,0 +1,47 @@ @@ -0,0 +1,47 @@
@ -127,3 +118,31 @@ Author: Ansgar Burchardt <ansgar@43-1.org> (XML::SAX::Debian)
+} +}
+ +
+1; +1;
diff --git a/t/01known.t b/t/01known.t
index a2db4f1..a9e2536 100644
--- a/t/01known.t
+++ b/t/01known.t
@@ -1,6 +1,9 @@
-use Test;
+use Test::More;
BEGIN { plan tests => 3 }
+SKIP: {
+skip 'Tests skipped due to Debian modifications', 3;
use XML::SAX;
ok(XML::SAX->save_parsers);
ok(XML::SAX->load_parsers);
ok(@{XML::SAX->parsers}, 0);
+}
diff --git a/t/99cleanup.t b/t/99cleanup.t
index 32e196c..72f8438 100644
--- a/t/99cleanup.t
+++ b/t/99cleanup.t
@@ -1,7 +1,7 @@
use Test;
BEGIN { plan tests => 1 }
use File::Spec;
-ok(unlink(
+skip('Test skipped due to Debian modifications', unlink(
File::Spec->catdir(qw(blib lib XML SAX ParserDetails.ini))),
1,
'delete ParserDetails.ini'

13
debian/patches/pod-spelling vendored
View File

@ -1,11 +1,18 @@
Author: gregor herrmann <gregoa@debian.org> From: gregor herrmann <gregoa@debian.org>
Description: fix spelling errors in POD Date: Mon, 6 May 2024 21:49:25 +0800
Subject: fix spelling errors in POD
Origin: https://github.com/grantm/XML-SAX/pull/4 Origin: https://github.com/grantm/XML-SAX/pull/4
Forwarded: yes Forwarded: yes
---
lib/XML/SAX/Intro.pod | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/XML/SAX/Intro.pod b/lib/XML/SAX/Intro.pod
index 33c77d4..2c66b3b 100644
--- a/lib/XML/SAX/Intro.pod --- a/lib/XML/SAX/Intro.pod
+++ b/lib/XML/SAX/Intro.pod +++ b/lib/XML/SAX/Intro.pod
@@ -242,7 +242,7 @@ @@ -242,7 +242,7 @@ the values later seen by end_element.
=head2 characters =head2 characters

13
debian/patches/skip-test-with-nonfree-file vendored
View File

@ -1,7 +1,16 @@
Description: Skip a test depending on a non-free input file (testfiles/xmltest.xml) From: openKylin Developers <packaging@lists.openkylin.top>
Date: Mon, 6 May 2024 21:49:25 +0800
Subject: Skip a test depending on a non-free input file
(testfiles/xmltest.xml)
Origin: vendor Origin: vendor
Bug-Debian: https://bugs.debian.org/452872 Bug-Debian: https://bugs.debian.org/452872
---
t/16large.t | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/t/16large.t b/t/16large.t
index 537dd8d..d925b44 100644
--- a/t/16large.t --- a/t/16large.t
+++ b/t/16large.t +++ b/t/16large.t
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
@ -10,7 +19,7 @@ Bug-Debian: https://bugs.debian.org/452872
BEGIN { plan tests => 3 } BEGIN { plan tests => 3 }
use XML::SAX::PurePerl; use XML::SAX::PurePerl;
use XML::SAX::PurePerl::DebugHandler; use XML::SAX::PurePerl::DebugHandler;
@@ -9,8 +9,10 @@ @@ -9,8 +9,10 @@ ok($handler);
my $parser = XML::SAX::PurePerl->new(Handler => $handler); my $parser = XML::SAX::PurePerl->new(Handler => $handler);
ok($parser); ok($parser);

13
debian/patches/sort-ini-entries vendored
View File

@ -1,13 +1,20 @@
From: Roland Clobus <rclobus@rclobus.nl> From: Roland Clobus <rclobus@rclobus.nl>
Date: Wed, 1 Sep 2021 15:10:00+0200 Date: Wed, 1 Sep 2021 15:10:00 +0200
Subject: Sort the entries in the .ini-files. This generates the files with a constant content Subject: Sort the entries in the .ini-files. This generates the files with a
constant content
Bug-Debian: https://bugs.debian.org/993444 Bug-Debian: https://bugs.debian.org/993444
Forwarded: https://rt.cpan.org/Ticket/Display.html?id=139175 Forwarded: https://rt.cpan.org/Ticket/Display.html?id=139175
Bug: https://rt.cpan.org/Ticket/Display.html?id=139175 Bug: https://rt.cpan.org/Ticket/Display.html?id=139175
---
lib/XML/SAX/Debian.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/XML/SAX/Debian.pm b/lib/XML/SAX/Debian.pm
index e767c73..d1297dc 100644
--- a/lib/XML/SAX/Debian.pm --- a/lib/XML/SAX/Debian.pm
+++ b/lib/XML/SAX/Debian.pm +++ b/lib/XML/SAX/Debian.pm
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@ sub save_parsers_debian {
foreach my $p (@{ $class->parsers }) { foreach my $p (@{ $class->parsers }) {
print $fh "[$p->{Name}]\n"; print $fh "[$p->{Name}]\n";