Update version from CPAN to 0.9929

[DELTA] 0.9929 * Upgrade to ppport 3.62 * Import fix for core build warning
Perl · May 24, 2021 · ff6af44 · ff6af44
1 parent 9ae7f79
commit ff6af44
Show file tree

Hide file tree

Showing 14 changed files with 13 additions and 172 deletions.
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
@@ -1249,7 +1249,7 @@ package Maintainers;
     },
 
     'version' => {
-        'DISTRIBUTION' => 'LEONT/version-0.9928.tar.gz',
+        'DISTRIBUTION' => 'LEONT/version-0.9929.tar.gz',
         'FILES'        => q[cpan/version vutil.c vutil.h vxs.inc],
         'EXCLUDED' => [
             qr{^vutil/lib/},
@@ -1265,11 +1265,7 @@ package Maintainers;
         # to delete an entire block out of lib/version.pm, since that code is
         # only necessary with the CPAN release.
         'CUSTOMIZED'   => [
-            qw( lib/version.pm
-                vutil.c
-                vxs.inc
-                ),
-        ],
+         ],
 
         'MAP' => {
             'vutil/'         => '',

diff --git a/cpan/version/lib/version.pm b/cpan/version/lib/version.pm
@@ -8,7 +8,7 @@ if ($] >= 5.015) {
     warnings::register_categories(qw/version/);
 }
 
-our $VERSION = 0.9928;
+our $VERSION = 0.9929;
 our $CLASS = 'version';
 our (@ISA, $STRICT, $LAX);
 

diff --git a/cpan/version/lib/version/regex.pm b/cpan/version/lib/version/regex.pm
@@ -2,7 +2,7 @@ package version::regex;
 
 use strict;
 
-our $VERSION = 0.9928;
+our $VERSION = 0.9929;
 
 #--------------------------------------------------------------------------#
 # Version regexp components

diff --git a/cpan/version/t/01base.t b/cpan/version/t/01base.t
@@ -14,7 +14,7 @@ BEGIN {
         )
     );
     require $coretests;
-    use_ok('version', 0.9928);
+    use_ok('version', 0.9929);
 }
 
 BaseTests("version","new","qv");

diff --git a/cpan/version/t/02derived.t b/cpan/version/t/02derived.t
@@ -15,7 +15,7 @@ BEGIN {
         )
     );
     require $coretests;
-    use_ok("version", 0.9928);
+    use_ok("version", 0.9929);
     # If we made it this far, we are ok.
 }
 

diff --git a/cpan/version/t/03require.t b/cpan/version/t/03require.t
@@ -19,7 +19,7 @@ BEGIN {
 # Don't want to use, because we need to make sure that the import doesn't
 # fire just yet (some code does this to avoid importing qv() and delare()).
 require_ok("version");
-is $version::VERSION, 0.9928, "Make sure we have the correct class";
+is $version::VERSION, 0.9929, "Make sure we have the correct class";
 ok(!"main"->can("qv"), "We don't have the imported qv()");
 ok(!"main"->can("declare"), "We don't have the imported declare()");
 

diff --git a/cpan/version/t/05sigdie.t b/cpan/version/t/05sigdie.t
@@ -14,7 +14,7 @@ BEGIN {
 }
 
 BEGIN {
-    use version 0.9928;
+    use version 0.9929;
 }
 
 pass "Didn't get caught by the wrong DIE handler, which is a good thing";
diff --git a/cpan/version/t/06noop.t b/cpan/version/t/06noop.t
@@ -7,7 +7,7 @@
 use Test::More qw/no_plan/;
 
 BEGIN {
-    use_ok('version', 0.9928);
+    use_ok('version', 0.9929);
 }
 
 my $v1 = 'version'->new('1.2');

diff --git a/cpan/version/t/07locale.t b/cpan/version/t/07locale.t
@@ -11,7 +11,7 @@ use Test::More tests => 8;
 use Config;
 
 BEGIN {
-    use_ok('version', 0.9928);
+    use_ok('version', 0.9929);
 }
 
 SKIP: {
@@ -77,7 +77,7 @@ EOF
 	eval "use lib '.'; use $package;";
 	unlike($warning, qr"Version string '1,7' contains invalid data",
 	    'Handle locale action-at-a-distance');
-    }
+}
 
 __DATA__
 af_ZA

diff --git a/cpan/version/t/08_corelist.t b/cpan/version/t/08_corelist.t
@@ -5,7 +5,7 @@
 #########################
 
 use Test::More tests => 3;
-use_ok("version", 0.9928);
+use_ok("version", 0.9929);
 
 # do strict lax tests in a sub to isolate a package to test importing
 SKIP: {

diff --git a/cpan/version/t/09_list_util.t b/cpan/version/t/09_list_util.t
@@ -4,7 +4,7 @@
 #########################
 
 use strict;
-use_ok("version", 0.9928);
+use_ok("version", 0.9929);
 use Test::More;
 
 BEGIN {

diff --git a/t/porting/customized.dat b/t/porting/customized.dat
@@ -21,6 +21,3 @@ Pod::Perldoc cpan/Pod-Perldoc/lib/Pod/Perldoc.pm 582be34c077c9ff44d99914724a0cc2
 Test::Harness cpan/Test-Harness/t/source.t aaa3939591114c0c52ecd44159218336d1f762b9
 Win32API::File cpan/Win32API-File/File.pm 8fd212857f821cb26648878b96e57f13bf21b99e
 Win32API::File cpan/Win32API-File/File.xs beb870fed4490d2faa547b4a8576b8d64d1d27c5
-version cpan/version/lib/version.pm 9a4d4c2a89cc95c0c946de6742d6df41e546c12c
-version vutil.c 5fd47f345ad3e612f9f3fe440cccbcbf88264bb6
-version vxs.inc d23e4fac6211d3b35b367e80ef23b8ab5fa9d0eb
diff --git a/vutil.c b/vutil.c
@@ -8,8 +8,6 @@
 #define VERSION_MAX 0x7FFFFFFF
 
 /*
-=for apidoc_section Versioning
-
 =for apidoc prescan_version
 
 Validate that a given string can be parsed as a version object, but doesn't

diff --git a/vutil.h b/vutil.h
@@ -10,122 +10,12 @@
  * AV *av2 = MUTABLE_AV(sv); <== GOOD: it may warn
  */
 
-#ifndef MUTABLE_PTR
-#  if defined(__GNUC__) && !defined(PERL_GCC_BRACE_GROUPS_FORBIDDEN)
-#    define MUTABLE_PTR(p) ({ void *_p = (p); _p; })
-#  else
-#    define MUTABLE_PTR(p) ((void *) (p))
-#  endif
-#endif
-
-#ifndef MUTABLE_AV
-#  define MUTABLE_AV(p)	((AV *)MUTABLE_PTR(p))
-#endif
-#ifndef MUTABLE_CV
-#  define MUTABLE_CV(p)	((CV *)MUTABLE_PTR(p))
-#endif
-#ifndef MUTABLE_GV
-#  define MUTABLE_GV(p)	((GV *)MUTABLE_PTR(p))
-#endif
-#ifndef MUTABLE_HV
-#  define MUTABLE_HV(p)	((HV *)MUTABLE_PTR(p))
-#endif
-#ifndef MUTABLE_IO
-#  define MUTABLE_IO(p)	((IO *)MUTABLE_PTR(p))
-#endif
-#ifndef MUTABLE_SV
-#  define MUTABLE_SV(p)	((SV *)MUTABLE_PTR(p))
-#endif
-
-#ifndef SvPVx_nolen_const
-#  if defined(__GNUC__) && !defined(PERL_GCC_BRACE_GROUPS_FORBIDDEN)
-#    define SvPVx_nolen_const(sv) ({SV *_sv = (sv); SvPV_nolen_const(_sv); })
-#  else
-#    define SvPVx_nolen_const(sv) (SvPV_nolen_const(sv))
-#  endif
-#endif
-
-#ifndef PERL_ARGS_ASSERT_CK_WARNER
-static void Perl_ck_warner(pTHX_ U32 err, const char* pat, ...);
-
-#  ifdef vwarner
-static
-void
-Perl_ck_warner(pTHX_ U32 err, const char* pat, ...)
-{
-  va_list args;
-
-  PERL_UNUSED_ARG(err);
-  if (ckWARN(err)) {
-    va_list args;
-    va_start(args, pat);
-    vwarner(err, pat, &args);
-    va_end(args);
-  }
-}
-#  else
-/* yes this replicates my_warner */
-static
-void
-Perl_ck_warner(pTHX_ U32 err, const char* pat, ...)
-{
-  SV *sv;
-  va_list args;
-
-  PERL_UNUSED_ARG(err);
-
-  va_start(args, pat);
-  sv = vnewSVpvf(pat, &args);
-  va_end(args);
-  sv_2mortal(sv);
-  warn("%s", SvPV_nolen(sv));
-}
-#  endif
-#endif
-
 #if PERL_VERSION_LT(5,15,4)
 #  define ISA_VERSION_OBJ(v) (sv_isobject(v) && sv_derived_from(v,"version"))
 #else
 #  define ISA_VERSION_OBJ(v) (sv_isobject(v) && sv_derived_from_pvn(v,"version",7,0))
 #endif
 
-#ifndef PERL_ARGS_ASSERT_CROAK_XS_USAGE
-#define PERL_ARGS_ASSERT_CROAK_XS_USAGE assert(cv); assert(params)
-
-/* prototype to pass -Wmissing-prototypes */
-STATIC void
-S_croak_xs_usage(pTHX_ const CV *const cv, const char *const params);
-
-STATIC void
-S_croak_xs_usage(pTHX_ const CV *const cv, const char *const params)
-{
-    const GV *const gv = CvGV(cv);
-
-    PERL_ARGS_ASSERT_CROAK_XS_USAGE;
-
-    if (gv) {
-        const char *const gvname = GvNAME(gv);
-        const HV *const stash = GvSTASH(gv);
-        const char *const hvname = stash ? HvNAME(stash) : NULL;
-
-        if (hvname)
-            Perl_croak_nocontext("Usage: %s::%s(%s)", hvname, gvname, params);
-        else
-            Perl_croak_nocontext("Usage: %s(%s)", gvname, params);
-    } else {
-        /* Pants. I don't think that it should be possible to get here. */
-        Perl_croak_nocontext("Usage: CODE(0x%" UVxf ")(%s)", PTR2UV(cv), params);
-    }
-}
-
-#ifdef PERL_IMPLICIT_CONTEXT
-#define croak_xs_usage(a,b)	S_croak_xs_usage(aTHX_ a,b)
-#else
-#define croak_xs_usage		S_croak_xs_usage
-#endif
-
-#endif
-
 #if PERL_VERSION_GE(5,9,0) && !defined(PERL_CORE)
 
 #  define VUTIL_REPLACE_CORE 1
@@ -221,44 +111,4 @@ const char * Perl_prescan_version(pTHX_ const char *s, bool strict, const char**
 	assert(pat)
 #endif
 
-
-#if PERL_VERSION_LT(5,27,9)
-#  define LC_NUMERIC_LOCK(cond)
-#  define LC_NUMERIC_UNLOCK
-#  if PERL_VERSION_LT(5,19,0)
-#    undef STORE_LC_NUMERIC_SET_STANDARD
-#    undef RESTORE_LC_NUMERIC
-#    undef DECLARATION_FOR_LC_NUMERIC_MANIPULATION
-#    ifdef USE_LOCALE
-#      define DECLARATION_FOR_LC_NUMERIC_MANIPULATION char *loc
-#      define STORE_NUMERIC_SET_STANDARD()\
-	 loc = savepv(setlocale(LC_NUMERIC, NULL));  \
-	 SAVEFREEPV(loc); \
-	 setlocale(LC_NUMERIC, "C");
-#      define RESTORE_LC_NUMERIC()\
-	 setlocale(LC_NUMERIC, loc);
-#    else
-#      define DECLARATION_FOR_LC_NUMERIC_MANIPULATION
-#      define STORE_LC_NUMERIC_SET_STANDARD()
-#      define RESTORE_LC_NUMERIC()
-#    endif
-#  endif
-#endif
-
-#ifndef LOCK_NUMERIC_STANDARD
-#  define LOCK_NUMERIC_STANDARD()
-#endif
-
-#ifndef UNLOCK_NUMERIC_STANDARD
-#  define UNLOCK_NUMERIC_STANDARD()
-#endif
-
-/* The names of these changed in 5.28 */
-#ifndef LOCK_LC_NUMERIC_STANDARD
-#  define LOCK_LC_NUMERIC_STANDARD() LOCK_NUMERIC_STANDARD()
-#endif
-#ifndef UNLOCK_LC_NUMERIC_STANDARD
-#  define UNLOCK_LC_NUMERIC_STANDARD() UNLOCK_NUMERIC_STANDARD()
-#endif
-
 /* ex: set ro: */