diff options
| author | Dmitry Shachnev <mitya57@gmail.com> | 2017-10-17 19:45:29 +0300 |
|---|---|---|
| committer | Dmitry Shachnev <mitya57@gmail.com> | 2017-10-17 19:45:29 +0300 |
| commit | 5d4aa008bdbb8685fbdd296e8096ffb29298bd8b (patch) | |
| tree | 7cc86439055f05cfb684b1c6fece63c5af1f2bd9 | |
| parent | c3ce24e16d03febc29563bb07365fd58dd2c09db (diff) | |
| download | pkg-kde-tools-5d4aa008bdbb8685fbdd296e8096ffb29298bd8b.tar.gz | |
Adapt to SymbolFile API changes in libdpkg-perl 1.19.0.
Closes: #878892.
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | perllib/Debian/PkgKde/SymbolsHelper/SymbolFile.pm | 11 | ||||
| -rwxr-xr-x | pkgkde-gensymbols | 10 |
3 files changed, 12 insertions, 10 deletions
diff --git a/debian/changelog b/debian/changelog index d1f0bed..d356f23 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ pkg-kde-tools (0.15.28) UNRELEASED; urgency=medium [ Dmitry Shachnev ] * Bump libdpkg-perl build-dependency too, to make the tests pass. + * Adapt to SymbolFile API changes in libdpkg-perl 1.19.0 (Closes: #878892). -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Tue, 17 Oct 2017 19:05:10 +0300 diff --git a/perllib/Debian/PkgKde/SymbolsHelper/SymbolFile.pm b/perllib/Debian/PkgKde/SymbolsHelper/SymbolFile.pm index 081d543..42c7d2b 100644 --- a/perllib/Debian/PkgKde/SymbolsHelper/SymbolFile.pm +++ b/perllib/Debian/PkgKde/SymbolsHelper/SymbolFile.pm @@ -30,11 +30,12 @@ use Debian::PkgKde::SymbolsHelper::Substs; # Use Debian::PkgKde::SymbolsHelper::Symbol as base symbol sub parse { - my ($self, $fh, $file, $seen, $obj_ref, $base_symbol) = @_; - unless (defined $base_symbol) { - $base_symbol = 'Debian::PkgKde::SymbolsHelper::Symbol'; + my ($self, $fh, $file, %opts) = @_; + my $state = $opts{state} //= {}; + unless (defined $state->{base_symbol}) { + $state->{base_symbol} = 'Debian::PkgKde::SymbolsHelper::Symbol'; } - if (!defined $seen) { + unless (defined $state->{seen}) { # Read 'SymbolsHelper-Confirmed' header open(my $fh, "<", $file) or error("unable to open symbol file '$file' for reading"); @@ -46,7 +47,7 @@ sub parse { $self->set_confirmed(split(/\s+/, $1)); } } - return $self->SUPER::parse($fh, $file, $seen, $obj_ref, $base_symbol); + return $self->SUPER::parse($fh, $file, %opts); } sub set_confirmed { diff --git a/pkgkde-gensymbols b/pkgkde-gensymbols index 0f0a065..2277bf1 100755 --- a/pkgkde-gensymbols +++ b/pkgkde-gensymbols @@ -25,12 +25,12 @@ my $old_symbolfile_parse; sub new_symbolfile_parse { # Use Debian::PkgKde::SymbolsHelper::Symbol as base symbol - my ($self, $fh, $file, $seen, $obj_ref, $base_symbol) = @_; - unless (defined $base_symbol) { - $base_symbol = 'Debian::PkgKde::SymbolsHelper::Symbol'; + my ($self, $fh, $file, %opts) = @_; + my $state = $opts{state} //= {}; + unless (defined $state->{base_symbol}) { + $state->{base_symbol} = 'Debian::PkgKde::SymbolsHelper::Symbol'; } - return &$old_symbolfile_parse($self, $fh, $file, $seen, $obj_ref, - $base_symbol); + return &$old_symbolfile_parse($self, $fh, $file, %opts); } sub check_dpkg_version { |