[arch-commits] Commit in perl-return-multilevel/trunk (2 files)

Felix Yan felixonmars at gemini.archlinux.org
Mon Dec 13 10:57:33 UTC 2021


    Date: Monday, December 13, 2021 @ 10:57:33
  Author: felixonmars
Revision: 1071449

upgpkg: perl-return-multilevel 0.06-1

Modified:
  perl-return-multilevel/trunk/PKGBUILD
Deleted:
  perl-return-multilevel/trunk/Return-MultiLevel-0.05-Test-Fatal-0.016.patch

-----------------------------------------------+
 PKGBUILD                                      |   16 ++-------
 Return-MultiLevel-0.05-Test-Fatal-0.016.patch |   40 ------------------------
 2 files changed, 4 insertions(+), 52 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-13 10:54:43 UTC (rev 1071448)
+++ PKGBUILD	2021-12-13 10:57:33 UTC (rev 1071449)
@@ -1,8 +1,8 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 
 pkgname=perl-return-multilevel
-pkgver=0.05
-pkgrel=4
+pkgver=0.06
+pkgrel=1
 pkgdesc="Return across multiple call levels"
 arch=('any')
 license=('PerlArtistic')
@@ -10,17 +10,9 @@
 depends=('perl-data-munge')
 checkdepends=('perl-test-fatal')
 options=('!emptydirs')
-source=("https://cpan.metacpan.org/authors/id/M/MA/MAUKE/Return-MultiLevel-$pkgver.tar.gz"
-        Return-MultiLevel-0.05-Test-Fatal-0.016.patch)
-sha512sums=('ca8d5c2067c8e47e49988363a5f5816e51f13eb07a83daccb55208654f23b9dd6a67128d38cf0e61891cb0867d42a3dc0653795907ad743a72691d5da9f8be0d'
-            'f6dba2803ff05a0b14186b86d390c41ba8eb61e98e59604f4dbb935cbab1f815bf2cd3cdad9544961ee4d1f97cabf4a54644f186302f7025b7366b65ff3c8ec5')
+source=("https://cpan.metacpan.org/authors/id/P/PL/PLICEASE/Return-MultiLevel-$pkgver.tar.gz")
+sha512sums=('470d3b040920e7637b12d5d362fb1fd0808a04c2003fffb8d2ff036786a7a0a0c166c0e5ffd8da5da4329c45c55a4be9e22470cc9e7be339f7b9eb61e6f7a09f')
 
-prepare() {
-  cd Return-MultiLevel-$pkgver
-  # https://github.com/mauke/Return-MultiLevel/pull/1
-  patch -Np1 -i ../Return-MultiLevel-0.05-Test-Fatal-0.016.patch
-}
-
 build() {
   cd Return-MultiLevel-$pkgver
   perl Makefile.PL INSTALLDIRS=vendor

Deleted: Return-MultiLevel-0.05-Test-Fatal-0.016.patch
===================================================================
--- Return-MultiLevel-0.05-Test-Fatal-0.016.patch	2021-12-13 10:54:43 UTC (rev 1071448)
+++ Return-MultiLevel-0.05-Test-Fatal-0.016.patch	2021-12-13 10:57:33 UTC (rev 1071449)
@@ -1,40 +0,0 @@
-From 83d6ea21b310b5e920b03ebf88e295be8fdc5628 Mon Sep 17 00:00:00 2001
-From: Paul Howarth <paul at city-fan.org>
-Date: Mon, 17 Aug 2020 16:04:20 +0100
-Subject: [PATCH] Fix compatibility with Test-Fatal 0.016
-
-Test-Fatal 0.016 sets $Carp::MaxArgNums to -1, which makes function
-arguments invisible in the stack trace and this in turn causes t/debug.t
-to fail. To fix this, explicitly set $Carp::MaxArgNums to 2 in the test
-function to restore visibility of function arguments. This change allows
-the test to work with Test-Fatal 0.016 and also older versions.
----
- t/debug.t | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/t/debug.t b/t/debug.t
-index f992358..02699b2 100644
---- a/t/debug.t
-+++ b/t/debug.t
-@@ -20,6 +20,7 @@ sub bar {
- }
- 
- sub baz {
-+    local $Carp::MaxArgNums = 2;
-     my $f = shift;
-     $f->(@_)
- }
-@@ -30,10 +31,10 @@ my $exc = exception { baz $ret, 'ducks'; };
- like $exc, qr{
-     .* \bwith_return\b .* \Q${\__FILE__}\E .* \b 14 \b .* \n
-     .* \bfoo\b         .* \Q${\__FILE__}\E .* \b 19 \b .* \n
--    .* \bbar\b         .* \Q${\__FILE__}\E .* \b 27 \b .* \n
-+    .* \bbar\b         .* \Q${\__FILE__}\E .* \b 28 \b .* \n
- }x;
- 
- like $exc, qr{
--    .* \bReturn::MultiLevel\b .* \bducks\b .* \Q${\__FILE__}\E .* \b 24 \b .* \n
--    .* \bbaz\b                .* \bducks\b .* \Q${\__FILE__}\E .* \b 28 \b .* \n
-+    .* \bReturn::MultiLevel\b .* \bducks\b .* \Q${\__FILE__}\E .* \b 25 \b .* \n
-+    .* \bbaz\b                .* \bducks\b .* \Q${\__FILE__}\E .* \b 29 \b .* \n
- }x;



More information about the arch-commits mailing list