In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/0f33e03c7e91f63bcd07b5ddfc00101715fa1fc0?hp=7536d89cbce91521d429eb00373816730c7342de>
- Log ----------------------------------------------------------------- commit 0f33e03c7e91f63bcd07b5ddfc00101715fa1fc0 Author: Steve Hay <[email protected]> Date: Thu Aug 11 08:21:52 2016 +0100 Upgrade Encode from version 2.85 to 2.86 This incorporates all current blead customizations. ----------------------------------------------------------------------- Summary of changes: Porting/Maintainers.pl | 15 +-------------- cpan/Encode/Encode.pm | 4 ++-- cpan/Encode/Encode.xs | 29 +++++++++++++++++++++++------ cpan/Encode/Makefile.PL | 2 +- cpan/Encode/bin/encguess | 2 +- cpan/Encode/bin/piconv | 2 +- cpan/Encode/bin/ucmlint | 2 +- cpan/Encode/encoding.pm | 10 ++++++---- cpan/Encode/t/cow.t | 2 +- cpan/Encode/t/decode.t | 2 +- cpan/Encode/t/enc_data.t | 2 +- cpan/Encode/t/enc_eucjp.t | 2 +- cpan/Encode/t/enc_module.t | 2 +- cpan/Encode/t/enc_utf8.t | 2 +- cpan/Encode/t/jperl.t | 2 +- t/porting/customized.dat | 8 -------- 16 files changed, 43 insertions(+), 45 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 0bf2b63..4d36de8 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -406,21 +406,8 @@ use File::Glob qw(:case); }, 'Encode' => { - 'DISTRIBUTION' => 'DANKOGAI/Encode-2.85.tar.gz', + 'DISTRIBUTION' => 'DANKOGAI/Encode-2.86.tar.gz', 'FILES' => q[cpan/Encode], - CUSTOMIZED => [ - # https://rt.cpan.org/Ticket/Display.html?id=111421 - # https://rt.cpan.org/Ticket/Display.html?id=116196 - qw( encoding.pm - Byte/Makefile.PL - t/enc_data.t - t/enc_eucjp.t - t/enc_module.t - t/enc_utf8.t - t/encoding.t - t/jperl.t - ), - ], }, 'encoding::warnings' => { diff --git a/cpan/Encode/Encode.pm b/cpan/Encode/Encode.pm index f9e607a..bda8e1b 100644 --- a/cpan/Encode/Encode.pm +++ b/cpan/Encode/Encode.pm @@ -1,10 +1,10 @@ # -# $Id: Encode.pm,v 2.85 2016/08/04 03:15:58 dankogai Exp dankogai $ +# $Id: Encode.pm,v 2.86 2016/08/10 18:08:01 dankogai Exp $ # package Encode; use strict; use warnings; -our $VERSION = sprintf "%d.%02d", q$Revision: 2.85 $ =~ /(\d+)/g; +our $VERSION = sprintf "%d.%02d", q$Revision: 2.86 $ =~ /(\d+)/g; use constant DEBUG => !!$ENV{PERL_ENCODE_DEBUG}; use XSLoader (); XSLoader::load( __PACKAGE__, $VERSION ); diff --git a/cpan/Encode/Encode.xs b/cpan/Encode/Encode.xs index b9b079e..6b4fae9 100644 --- a/cpan/Encode/Encode.xs +++ b/cpan/Encode/Encode.xs @@ -1,5 +1,5 @@ /* - $Id: Encode.xs,v 2.36 2016/08/04 03:15:58 dankogai Exp dankogai $ + $Id: Encode.xs,v 2.37 2016/08/10 18:08:45 dankogai Exp dankogai $ */ #define PERL_NO_GET_CONTEXT @@ -482,6 +482,10 @@ MODULE = Encode PACKAGE = Encode::utf8 PREFIX = Method_ PROTOTYPES: DISABLE +#ifndef SvIsCOW +# define SvIsCOW(sv) (SvREADONLY(sv) && SvFAKE(sv)) +#endif + void Method_decode_xs(obj,src,check_sv = &PL_sv_no) SV * obj @@ -499,7 +503,13 @@ CODE: dSP; ENTER; SAVETMPS; if (src == &PL_sv_undef || SvROK(src)) src = sv_2mortal(newSV(0)); check = SvROK(check_sv) ? ENCODE_PERLQQ|ENCODE_LEAVE_SRC : SvIV(check_sv); - if (!(check & ENCODE_LEAVE_SRC) && SvIsCOW(src)) sv_force_normal(src); // disassociate from any other scalars before doing in-place modifications + if (!(check & ENCODE_LEAVE_SRC) && SvIsCOW(src)) { + /* + * disassociate from any other scalars before doing + * in-place modifications + */ + sv_force_normal(src); + } s = (U8 *) SvPV(src, slen); e = (U8 *) SvEND(src); /* @@ -712,6 +722,17 @@ CODE: XSRETURN(1); } + +#ifndef SvPV_force_nolen +# define SvPV_force_nolen(sv) SvPV_force_flags_nolen(sv, SV_GMAGIC) +#endif + +#ifndef SvPV_force_flags_nolen +# define SvPV_force_flags_nolen(sv, flags) \ + ((SvFLAGS(sv) & (SVf_POK|SVf_THINKFIRST)) == SVf_POK \ + ? SvPVX(sv) : sv_pvn_force_flags(sv, &PL_na, flags)) +#endif + void Method_encode(obj,src,check_sv = &PL_sv_no) SV * obj @@ -923,10 +944,6 @@ CODE: OUTPUT: RETVAL -#ifndef SvIsCOW -# define SvIsCOW(sv) (SvREADONLY(sv) && SvFAKE(sv)) -#endif - SV * _utf8_on(sv) SV * sv diff --git a/cpan/Encode/Makefile.PL b/cpan/Encode/Makefile.PL index f885584..c87153b 100644 --- a/cpan/Encode/Makefile.PL +++ b/cpan/Encode/Makefile.PL @@ -1,5 +1,5 @@ # -# $Id: Makefile.PL,v 2.17 2016/08/04 03:15:58 dankogai Exp dankogai $ +# $Id: Makefile.PL,v 2.17 2016/08/04 03:15:58 dankogai Exp $ # use 5.007003; use strict; diff --git a/cpan/Encode/bin/encguess b/cpan/Encode/bin/encguess index 982449a..0f344ea 100644 --- a/cpan/Encode/bin/encguess +++ b/cpan/Encode/bin/encguess @@ -61,7 +61,7 @@ encguess - guess character encodings of files =head1 VERSION -$Id: encguess,v 0.2 2016/08/04 03:15:58 dankogai Exp dankogai $ +$Id: encguess,v 0.2 2016/08/04 03:15:58 dankogai Exp $ =head1 SYNOPSIS diff --git a/cpan/Encode/bin/piconv b/cpan/Encode/bin/piconv index 8249eee..2218d16 100644 --- a/cpan/Encode/bin/piconv +++ b/cpan/Encode/bin/piconv @@ -1,5 +1,5 @@ #!./perl -# $Id: piconv,v 2.8 2016/08/04 03:15:58 dankogai Exp dankogai $ +# $Id: piconv,v 2.8 2016/08/04 03:15:58 dankogai Exp $ # BEGIN { pop @INC if $INC[-1] eq '.' } use 5.8.0; diff --git a/cpan/Encode/bin/ucmlint b/cpan/Encode/bin/ucmlint index 0627aae..a240f2c 100644 --- a/cpan/Encode/bin/ucmlint +++ b/cpan/Encode/bin/ucmlint @@ -1,6 +1,6 @@ #!/usr/local/bin/perl # -# $Id: ucmlint,v 2.3 2016/08/04 03:15:58 dankogai Exp dankogai $ +# $Id: ucmlint,v 2.3 2016/08/04 03:15:58 dankogai Exp $ # BEGIN { pop @INC if $INC[-1] eq '.' } diff --git a/cpan/Encode/encoding.pm b/cpan/Encode/encoding.pm index fffcaf7..754b3ac 100644 --- a/cpan/Encode/encoding.pm +++ b/cpan/Encode/encoding.pm @@ -1,6 +1,6 @@ -# $Id: encoding.pm,v 2.17 2015/09/15 13:53:27 dankogai Exp dankogai $ +# $Id: encoding.pm,v 2.18 2016/08/10 18:08:45 dankogai Exp dankogai $ package encoding; -our $VERSION = '2.17_01'; +our $VERSION = sprintf "%d.%02d", q$Revision: 2.18 $ =~ /(\d+)/g; use Encode; use strict; @@ -160,10 +160,12 @@ sub import { ${^E_NCODING} = $enc; } } - HAS_PERLIO or return 1; + if (! HAS_PERLIO ) { + return 1; + } } else { - warnings::warnif("deprecate",$deprecate) if $deprecate; + warnings::warnif("deprecated",$deprecate) if $deprecate; defined( ${^ENCODING} ) and undef ${^ENCODING}; undef ${^E_NCODING} if PERL_5_21_7; diff --git a/cpan/Encode/t/cow.t b/cpan/Encode/t/cow.t index ab34e05..9932e9d 100644 --- a/cpan/Encode/t/cow.t +++ b/cpan/Encode/t/cow.t @@ -1,5 +1,5 @@ # -# $Id: cow.t,v 1.2 2016/08/04 03:15:58 dankogai Exp dankogai $ +# $Id: cow.t,v 1.2 2016/08/04 03:15:58 dankogai Exp $ # use strict; use Encode (); diff --git a/cpan/Encode/t/decode.t b/cpan/Encode/t/decode.t index 1062c2d..6b24a8f 100644 --- a/cpan/Encode/t/decode.t +++ b/cpan/Encode/t/decode.t @@ -1,5 +1,5 @@ # -# $Id: decode.t,v 1.2 2016/08/04 03:15:58 dankogai Exp dankogai $ +# $Id: decode.t,v 1.2 2016/08/04 03:15:58 dankogai Exp $ # use strict; use Encode qw(decode_utf8 FB_CROAK find_encoding decode); diff --git a/cpan/Encode/t/enc_data.t b/cpan/Encode/t/enc_data.t index b401595..99ea78d 100644 --- a/cpan/Encode/t/enc_data.t +++ b/cpan/Encode/t/enc_data.t @@ -1,4 +1,4 @@ -# $Id: enc_data.t,v 2.2 2013/02/18 02:23:56 dankogai Exp $ +# $Id: enc_data.t,v 2.3 2016/08/10 18:08:45 dankogai Exp dankogai $ BEGIN { require Config; import Config; diff --git a/cpan/Encode/t/enc_eucjp.t b/cpan/Encode/t/enc_eucjp.t index 37fccba..952a8ae 100644 --- a/cpan/Encode/t/enc_eucjp.t +++ b/cpan/Encode/t/enc_eucjp.t @@ -1,4 +1,4 @@ -# $Id: enc_eucjp.t,v 2.2 2013/02/18 02:23:56 dankogai Exp $ +# $Id: enc_eucjp.t,v 2.3 2016/08/10 18:08:45 dankogai Exp dankogai $ # This is the twin of enc_utf8.t . BEGIN { diff --git a/cpan/Encode/t/enc_module.t b/cpan/Encode/t/enc_module.t index 3004ed2..8796a9b 100644 --- a/cpan/Encode/t/enc_module.t +++ b/cpan/Encode/t/enc_module.t @@ -1,4 +1,4 @@ -# $Id: enc_module.t,v 2.2 2013/02/18 02:23:56 dankogai Exp $ +# $Id: enc_module.t,v 2.3 2016/08/10 18:08:45 dankogai Exp dankogai $ # This file is in euc-jp BEGIN { require Config; import Config; diff --git a/cpan/Encode/t/enc_utf8.t b/cpan/Encode/t/enc_utf8.t index 047452f..7ffaac0 100644 --- a/cpan/Encode/t/enc_utf8.t +++ b/cpan/Encode/t/enc_utf8.t @@ -1,4 +1,4 @@ -# $Id: enc_utf8.t,v 2.2 2013/02/18 02:23:56 dankogai Exp $ +# $Id: enc_utf8.t,v 2.3 2016/08/10 18:08:45 dankogai Exp dankogai $ # This is the twin of enc_eucjp.t . BEGIN { diff --git a/cpan/Encode/t/jperl.t b/cpan/Encode/t/jperl.t index 5f437ff..475d8bc 100644 --- a/cpan/Encode/t/jperl.t +++ b/cpan/Encode/t/jperl.t @@ -1,5 +1,5 @@ # -# $Id: jperl.t,v 2.2 2013/02/18 02:23:56 dankogai Exp $ +# $Id: jperl.t,v 2.3 2016/08/10 18:08:45 dankogai Exp dankogai $ # # This script is written in euc-jp diff --git a/t/porting/customized.dat b/t/porting/customized.dat index 7333b95..ba31fe0 100644 --- a/t/porting/customized.dat +++ b/t/porting/customized.dat @@ -2,14 +2,6 @@ CPAN cpan/CPAN/lib/App/Cpan.pm 3cef68c2a44a4996b432bc25622e3a544a188aa5 CPAN cpan/CPAN/lib/CPAN.pm 4616a44963045f7bd07bb7f8e5f99bbd789af4e5 CPAN cpan/CPAN/scripts/cpan 22610ed0301d48a269d1739afd2f7f84359d956f Digest cpan/Digest/Digest.pm 43f7f544cb11842b2f55c73e28930da50774e081 -Encode cpan/Encode/Byte/Makefile.PL 54f446297d614331ef3f51e8310faff27cc44f90 -Encode cpan/Encode/encoding.pm 90ea1844e5ae863a17dd40ac6a0f27f438db9c1f -Encode cpan/Encode/t/enc_data.t e8b94d651a6519e186a2b74245f0002c4bb62160 -Encode cpan/Encode/t/enc_eucjp.t 9d73fce7d5ae83036be546d1603262baffd68cdb -Encode cpan/Encode/t/enc_module.t aad4fcde7389ad55731206f62284dadf21ffe274 -Encode cpan/Encode/t/enc_utf8.t 7d1c9a4260c0c6b263eff30539e591c417e602a9 -Encode cpan/Encode/t/encoding.t ed051c17c92510713b24217c22384815088834a8 -Encode cpan/Encode/t/jperl.t 584a3813e7bc680ee6ec1d54253bbf861bda8215 ExtUtils::Constant cpan/ExtUtils-Constant/t/Constant.t a0369c919e216fb02767a637666bb4577ad79b02 File::Path cpan/File-Path/lib/File/Path.pm fd8ce4420a0c113d3f47dd3223859743655c1da8 File::Path cpan/File-Path/t/Path_win32.t 94b9276557ce7f80b91f6fd9bfa7a0cd9bf9683e -- Perl5 Master Repository
