From 5eae6e9157586e142a775af27f8babee1775b387 Mon Sep 17 00:00:00 2001 From: Chris 'BinGOs' Williams Date: Sun, 12 Aug 2012 09:20:59 +0100 Subject: [PATCH] Update Encode to CPAN version 2.46 [DELTA] $Revision: 2.46 $ $Date: 2012/08/12 05:49:30 $ ! Encode.pm Fixed: RT#78917 for I18N-Charset: Fails with Encode 2.45 To be more exact, 2.45 broke Encode->encodings(':all') https://rt.cpan.org/Ticket/Bug/Display.html?id=78917 --- Porting/Maintainers.pl | 2 +- cpan/Encode/Changes | 10 ++++++++-- cpan/Encode/Encode.pm | 7 +++---- cpan/Encode/META.json | 4 ++-- cpan/Encode/META.yml | 4 ++-- cpan/Encode/Unicode/Unicode.xs | 2 +- cpan/Encode/encoding.pm | 2 +- cpan/Encode/lib/Encode/Unicode/UTF7.pm | 2 +- cpan/Encode/t/Unicode.t | 2 +- 9 files changed, 20 insertions(+), 15 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 256ece5..1ab23a6 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -622,7 +622,7 @@ use File::Glob qw(:case); 'Encode' => { 'MAINTAINER' => 'dankogai', - 'DISTRIBUTION' => 'DANKOGAI/Encode-2.45.tar.gz', + 'DISTRIBUTION' => 'DANKOGAI/Encode-2.46.tar.gz', 'FILES' => q[cpan/Encode], 'UPSTREAM' => 'cpan', }, diff --git a/cpan/Encode/Changes b/cpan/Encode/Changes index f48a02f..6bacb71 100644 --- a/cpan/Encode/Changes +++ b/cpan/Encode/Changes @@ -1,8 +1,14 @@ # Revision history for Perl extension Encode. # -# $Id: Changes,v 2.45 2012/08/05 23:08:49 dankogai Exp dankogai $ +# $Id: Changes,v 2.46 2012/08/12 05:49:30 dankogai Exp dankogai $ # -$Revision: 2.45 $ $Date: 2012/08/05 23:08:49 $ +$Revision: 2.46 $ $Date: 2012/08/12 05:49:30 $ +! Encode.pm + Fixed: RT#78917 for I18N-Charset: Fails with Encode 2.45 + To be more exact, 2.45 broke Encode->encodings(':all') + https://rt.cpan.org/Ticket/Bug/Display.html?id=78917 + +2.45 2012/08/05 23:08:49 ! lib/Encode/Alias.pm Addressed RT#78125: Missed Mac Alias x-mac-ce https://rt.cpan.org/Ticket/Display.html?id=78125 diff --git a/cpan/Encode/Encode.pm b/cpan/Encode/Encode.pm index ed3c6e3..db9cd05 100644 --- a/cpan/Encode/Encode.pm +++ b/cpan/Encode/Encode.pm @@ -1,10 +1,10 @@ # -# $Id: Encode.pm,v 2.45 2012/08/05 23:08:49 dankogai Exp dankogai $ +# $Id: Encode.pm,v 2.46 2012/08/12 05:49:30 dankogai Exp dankogai $ # package Encode; use strict; use warnings; -our $VERSION = sprintf "%d.%02d", q$Revision: 2.45 $ =~ /(\d+)/g; +our $VERSION = sprintf "%d.%02d", q$Revision: 2.46 $ =~ /(\d+)/g; use constant DEBUG => !!$ENV{PERL_ENCODE_DEBUG}; use XSLoader (); XSLoader::load( __PACKAGE__, $VERSION ); @@ -61,9 +61,8 @@ eval { }; sub encodings { - #my $class = shift; my %enc; - if ( @_ and $_[0] eq ":all" ) { + if ( @_ and $_[1] eq ":all" ) { %enc = ( %Encoding, %ExtModule ); } else { diff --git a/cpan/Encode/META.json b/cpan/Encode/META.json index d35ca3f..44e6079 100644 --- a/cpan/Encode/META.json +++ b/cpan/Encode/META.json @@ -4,7 +4,7 @@ "unknown" ], "dynamic_config" : 1, - "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.120921", + "generated_by" : "ExtUtils::MakeMaker version 6.6302, CPAN::Meta::Converter version 2.120921", "license" : [ "unknown" ], @@ -35,5 +35,5 @@ } }, "release_status" : "stable", - "version" : "2.45" + "version" : "2.46" } diff --git a/cpan/Encode/META.yml b/cpan/Encode/META.yml index bcd3f7b..0492b90 100644 --- a/cpan/Encode/META.yml +++ b/cpan/Encode/META.yml @@ -7,7 +7,7 @@ build_requires: configure_requires: ExtUtils::MakeMaker: 0 dynamic_config: 1 -generated_by: 'ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.120921' +generated_by: 'ExtUtils::MakeMaker version 6.6302, CPAN::Meta::Converter version 2.120921' license: unknown meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -18,4 +18,4 @@ no_index: - t - inc requires: {} -version: 2.45 +version: 2.46 diff --git a/cpan/Encode/Unicode/Unicode.xs b/cpan/Encode/Unicode/Unicode.xs index 84dfd46..026f8fb 100644 --- a/cpan/Encode/Unicode/Unicode.xs +++ b/cpan/Encode/Unicode/Unicode.xs @@ -1,5 +1,5 @@ /* - $Id: Unicode.xs,v 2.9 2012/08/05 23:08:49 dankogai Exp dankogai $ + $Id: Unicode.xs,v 2.9 2012/08/05 23:08:49 dankogai Exp $ */ #define PERL_NO_GET_CONTEXT diff --git a/cpan/Encode/encoding.pm b/cpan/Encode/encoding.pm index b5335ea..61144e3 100644 --- a/cpan/Encode/encoding.pm +++ b/cpan/Encode/encoding.pm @@ -1,4 +1,4 @@ -# $Id: encoding.pm,v 2.10 2012/08/05 23:08:49 dankogai Exp dankogai $ +# $Id: encoding.pm,v 2.10 2012/08/05 23:08:49 dankogai Exp $ package encoding; our $VERSION = '2.6_01'; diff --git a/cpan/Encode/lib/Encode/Unicode/UTF7.pm b/cpan/Encode/lib/Encode/Unicode/UTF7.pm index 2e0e4d1..ea9257b 100644 --- a/cpan/Encode/lib/Encode/Unicode/UTF7.pm +++ b/cpan/Encode/lib/Encode/Unicode/UTF7.pm @@ -1,5 +1,5 @@ # -# $Id: UTF7.pm,v 2.6 2012/08/05 23:08:49 dankogai Exp dankogai $ +# $Id: UTF7.pm,v 2.6 2012/08/05 23:08:49 dankogai Exp $ # package Encode::Unicode::UTF7; use strict; diff --git a/cpan/Encode/t/Unicode.t b/cpan/Encode/t/Unicode.t index b86ed06..2cc5d54 100644 --- a/cpan/Encode/t/Unicode.t +++ b/cpan/Encode/t/Unicode.t @@ -1,5 +1,5 @@ # -# $Id: Unicode.t,v 2.3 2012/08/05 23:08:49 dankogai Exp dankogai $ +# $Id: Unicode.t,v 2.3 2012/08/05 23:08:49 dankogai Exp $ # # This script is written entirely in ASCII, even though quoted literals # do include non-BMP unicode characters -- Are you happy, jhi? -- 2.7.4