Hello community,
here is the log from the commit of package perl-Perl-Tidy for openSUSE:Factory
checked in at 2013-10-06 14:55:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-Perl-Tidy (Old)
and /work/SRC/openSUSE:Factory/.perl-Perl-Tidy.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Perl-Tidy"
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-Perl-Tidy/perl-Perl-Tidy.changes
2013-08-13 10:19:00.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.perl-Perl-Tidy.new/perl-Perl-Tidy.changes
2013-10-06 14:55:30.000000000 +0200
@@ -1,0 +2,10 @@
+Fri Oct 4 09:11:17 UTC 2013 - co...@suse.com
+
+- updated to 20130922
+ - Fixed RT #88020. --converge was not working with wide characters.
+ - Fixed RT #78156. package NAMESPACE VERSION syntax not accepted.
+ - First attempt to fix RT #88588. INDEX END tag change in pod2html breaks
+ perltidy -html. I put in a patch which should work but I don't yet have
+ a way of testing it.
+
+-------------------------------------------------------------------
Old:
----
Perl-Tidy-20130806.tar.gz
New:
----
Perl-Tidy-20130922.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-Perl-Tidy.spec ++++++
--- /var/tmp/diff_new_pack.vX4KrW/_old 2013-10-06 14:55:30.000000000 +0200
+++ /var/tmp/diff_new_pack.vX4KrW/_new 2013-10-06 14:55:30.000000000 +0200
@@ -17,7 +17,7 @@
Name: perl-Perl-Tidy
-Version: 20130806
+Version: 20130922
Release: 0
%define cpan_name Perl-Tidy
Summary: Parses and beautifies perl source
++++++ Perl-Tidy-20130806.tar.gz -> Perl-Tidy-20130922.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Perl-Tidy-20130806/CHANGES
new/Perl-Tidy-20130922/CHANGES
--- old/Perl-Tidy-20130806/CHANGES 2013-08-06 02:50:55.000000000 +0200
+++ new/Perl-Tidy-20130922/CHANGES 2013-09-22 16:40:31.000000000 +0200
@@ -1,4 +1,13 @@
Perltidy Change Log
+ 2013 09 22
+ - Fixed RT #88020. --converge was not working with wide characters.
+
+ - Fixed RT #78156. package NAMESPACE VERSION syntax not accepted.
+
+ - First attempt to fix RT #88588. INDEX END tag change in pod2html
breaks
+ perltidy -html. I put in a patch which should work but I don't yet have
+ a way of testing it.
+
2013 08 06
- Fixed RT #87107, spelling
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Perl-Tidy-20130806/META.yml
new/Perl-Tidy-20130922/META.yml
--- old/Perl-Tidy-20130806/META.yml 2013-08-06 02:50:57.000000000 +0200
+++ new/Perl-Tidy-20130922/META.yml 2013-09-22 16:43:36.000000000 +0200
@@ -1,6 +1,6 @@
--- #YAML:1.0
name: Perl-Tidy
-version: 20130806
+version: 20130922
abstract: indent and reformat perl scripts
author:
- Steve Hancock <perlt...@perltidy.sourceforge.net>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Perl-Tidy-20130806/bin/perltidy
new/Perl-Tidy-20130922/bin/perltidy
--- old/Perl-Tidy-20130806/bin/perltidy 2013-08-06 02:50:54.000000000 +0200
+++ new/Perl-Tidy-20130922/bin/perltidy 2013-09-22 16:43:35.000000000 +0200
@@ -3093,7 +3093,7 @@
=head1 VERSION
-This man page documents perltidy version 20130806.
+This man page documents perltidy version 20130922.
=head1 CREDITS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Perl-Tidy-20130806/docs/perltidy.1
new/Perl-Tidy-20130922/docs/perltidy.1
--- old/Perl-Tidy-20130806/docs/perltidy.1 2013-08-06 02:50:55.000000000
+0200
+++ new/Perl-Tidy-20130922/docs/perltidy.1 2013-09-22 16:40:31.000000000
+0200
@@ -124,7 +124,7 @@
.\" ========================================================================
.\"
.IX Title "PERLTIDY 1"
-.TH PERLTIDY 1 "2013-08-05" "perl v5.14.2" "User Contributed Perl
Documentation"
+.TH PERLTIDY 1 "2013-09-22" "perl v5.14.2" "User Contributed Perl
Documentation"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -3183,7 +3183,7 @@
\&\fIperlstyle\fR\|(1), \fIPerl::Tidy\fR\|(3)
.SH "VERSION"
.IX Header "VERSION"
-This man page documents perltidy version 20130806.
+This man page documents perltidy version 20130922.
.SH "CREDITS"
.IX Header "CREDITS"
Michael Cartmell supplied code for adaptation to \s-1VMS\s0 and helped with
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Perl-Tidy-20130806/lib/Perl/Tidy.pm
new/Perl-Tidy-20130922/lib/Perl/Tidy.pm
--- old/Perl-Tidy-20130806/lib/Perl/Tidy.pm 2013-08-06 02:49:53.000000000
+0200
+++ new/Perl-Tidy-20130922/lib/Perl/Tidy.pm 2013-09-22 16:42:59.000000000
+0200
@@ -78,7 +78,7 @@
use File::Copy;
BEGIN {
- ( $VERSION = q($Id: Tidy.pm,v 1.74 2013/08/06 13:56:49 perltidy Exp $) )
=~ s/^.*\s+(\d+)\/(\d+)\/(\d+).*$/$1$2$3/; # all one line for MakeMaker
+ ( $VERSION = q($Id: Tidy.pm,v 1.74 2013/09/22 13:56:49 perltidy Exp $) )
=~ s/^.*\s+(\d+)\/(\d+)\/(\d+).*$/$1$2$3/; # all one line for MakeMaker
}
sub streamhandle {
@@ -980,6 +980,11 @@
if ($do_convergence_test) {
eval "use Digest::MD5 qw(md5_hex)";
$do_convergence_test = !$@;
+
+ # Trying to avoid problems with ancient versions of perl because
+ # I don't know in which version number utf8::encode was introduced.
+ eval { my $string = "perltidy"; utf8::encode($string) };
+ $do_convergence_test = $do_convergence_test && !$@;
}
# save objects to allow redirecting output during iterations
@@ -1094,7 +1099,10 @@
EOM
}
elsif ($do_convergence_test) {
- my $digest = md5_hex($sink_buffer);
+
+ # Patch for [rt.cpan.org #88020]
+ # Use utf8::encode since md5_hex() only operates on bytes.
+ my $digest = md5_hex( utf8::encode($sink_buffer) );
if ( !$saw_md5{$digest} ) {
$saw_md5{$digest} = $iter;
}
@@ -5228,6 +5236,7 @@
my $html_fh = $self->{_html_fh};
my @toc;
my $in_toc;
+ my $ul_level = 0;
my $no_print;
# This routine will write the html selectively and store the toc
@@ -5260,8 +5269,34 @@
$title = escape_html($title);
$html_print->("<h1>$title</h1>\n");
}
+
+ # check for start of index, old pod2html
+ # before Pod::Html VERSION 1.15_02 it is delimited by comments as:
+ # <!-- INDEX BEGIN -->
+ # <ul>
+ # ...
+ # </ul>
+ # <!-- INDEX END -->
+ #
elsif ( $line =~ /^\s*<!-- INDEX BEGIN -->\s*$/i ) {
- $in_toc = 1;
+ $in_toc = 'INDEX';
+
+ # when frames are used, an extra table of contents in the
+ # contents panel is confusing, so don't print it
+ $no_print = $rOpts->{'frames'}
+ || !$rOpts->{'html-table-of-contents'};
+ $html_print->("<h2>Doc Index:</h2>\n") if $rOpts->{'frames'};
+ $html_print->($line);
+ }
+
+ # check for start of index, new pod2html
+ # After Pod::Html VERSION 1.15_02 it is delimited as:
+ # <ul id="index">
+ # ...
+ # </ul>
+ elsif ( $line =~ /^\s*<ul\s+id="index">/i ) {
+ $in_toc = 'UL';
+ $ul_level = 1;
# when frames are used, an extra table of contents in the
# contents panel is confusing, so don't print it
@@ -5271,20 +5306,48 @@
$html_print->($line);
}
- # Copy the perltidy toc, if any, after the Pod::Html toc
+ # Check for end of index, old pod2html
elsif ( $line =~ /^\s*<!-- INDEX END -->\s*$/i ) {
$saw_index = 1;
$html_print->($line);
+
+ # Copy the perltidy toc, if any, after the Pod::Html toc
if ($toc_string) {
$html_print->("<hr />\n") if $rOpts->{'frames'};
$html_print->("<h2>Code Index:</h2>\n");
my @toc = map { $_ .= "\n" } split /\n/, $toc_string;
$html_print->(@toc);
}
- $in_toc = 0;
+ $in_toc = "";
$no_print = 0;
}
+ # must track <ul> depth level for new pod2html
+ elsif ( $line =~ /\s*<ul>\s*$/i && $in_toc eq 'UL' ) {
+ $ul_level++;
+ $html_print->($line);
+ }
+
+ # Check for end of index, for new pod2html
+ elsif ( $line =~ /\s*<\/ul>/i && $in_toc eq 'UL' ) {
+ $ul_level--;
+ $html_print->($line);
+
+ # Copy the perltidy toc, if any, after the Pod::Html toc
+ if ( $ul_level <= 0 ) {
+ $saw_index = 1;
+ if ($toc_string) {
+ $html_print->("<hr />\n") if $rOpts->{'frames'};
+ $html_print->("<h2>Code Index:</h2>\n");
+ my @toc = map { $_ .= "\n" } split /\n/, $toc_string;
+ $html_print->(@toc);
+ }
+ $in_toc = "";
+ $ul_level = 0;
+ $no_print = 0;
+ }
+ }
+
# Copy one perltidy section after each marker
elsif ( $line =~ /^(.*)<!-- pERLTIDY sECTION -->(.*)$/ ) {
$line = $2;
@@ -15339,7 +15402,8 @@
# 3 - ignore =>
# 4 - always open up if vt=0
# 5 - stable: even for one line blocks if vt=0
- if ( !$is_long_term
+ if (
+ !$is_long_term
##BUBBA: TYPO && $tokens_to_go[$i_opening] =~ /^[\(\{\]L]$/
&& $tokens_to_go[$i_opening] =~ /^[\(\{\[]$/
&& $index_before_arrow[ $depth + 1 ] > 0
@@ -17821,8 +17885,8 @@
)
);
##BUBBA: RT #81854
- $forced_breakpoint_to_go[$iend_1] = 0 unless
- $old_breakpoint_to_go[$iend_1]
+ $forced_breakpoint_to_go[$iend_1] = 0
+ unless $old_breakpoint_to_go[$iend_1];
}
# handle leading 'and'
@@ -27863,7 +27927,15 @@
# package NAMESPACE VERSION BLOCK
my ( $next_nonblank_token, $i_next ) =
find_next_nonblank_token( $i, $rtokens, $max_token_index );
- if ( $next_nonblank_token =~ /^[v\.\d;\{\}]$/ ) {
+
+ # check that something recognizable follows, but do not parse.
+ # A VERSION number will be parsed later as a number or v-string in the
+ # normal way. What is important is to set the statement type if
+ # everything looks okay so that the operator_expected() routine
+ # knows that the number is in a package statement.
+ # Examples of valid primitive tokens that might follow are:
+ # 1235 . ; { } v3 v
+ if ( $next_nonblank_token =~ /^([v\.\d;\{\}])|v\d|\d+$/ ) {
$statement_type = $tok;
}
else {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Perl-Tidy-20130806/lib/Perl/Tidy.pod
new/Perl-Tidy-20130922/lib/Perl/Tidy.pod
--- old/Perl-Tidy-20130806/lib/Perl/Tidy.pod 2013-08-06 02:50:10.000000000
+0200
+++ new/Perl-Tidy-20130922/lib/Perl/Tidy.pod 2013-09-22 16:35:15.000000000
+0200
@@ -416,7 +416,7 @@
=head1 VERSION
-This man page documents Perl::Tidy version 20130806.
+This man page documents Perl::Tidy version 20130922.
=head1 LICENSE
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
