Adapt to changes in Perl 5.31.5

This commit is contained in:
Petr Písař 2020-01-31 10:50:22 +01:00
parent aae0b7d82f
commit 2f4a28ee28
3 changed files with 72 additions and 1 deletions

View File

@ -0,0 +1,30 @@
From cf5b772fa54e0cda0e447c33ce351f1e6c074d42 Mon Sep 17 00:00:00 2001
From: Chris 'BinGOs' Williams <chris@bingosnet.co.uk>
Date: Tue, 29 Oct 2019 10:09:52 +0000
Subject: [PATCH] Corrected previous commit as per tonyc's suggestion
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Petr Písař <ppisar@redhat.com>
---
lib/POE/Kernel.pm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/POE/Kernel.pm b/lib/POE/Kernel.pm
index 2d7e4008..27781f94 100644
--- a/lib/POE/Kernel.pm
+++ b/lib/POE/Kernel.pm
@@ -365,7 +365,8 @@ BEGIN {
no strict 'refs';
local $^W = 0;
local $SIG{__WARN__} = sub { }; # redefine
- *$const = sub () { return $value };
+ my $tmp = $value;
+ *$const = sub () { $tmp };
}
# TRACE_FILENAME is special.
--
2.21.1

View File

@ -0,0 +1,32 @@
From ad8639840383ea1b166ff0090afabc954dffba27 Mon Sep 17 00:00:00 2001
From: Chris 'BinGOs' Williams <chris@bingosnet.co.uk>
Date: Fri, 25 Oct 2019 15:21:25 +0100
Subject: [PATCH] RT#130664 test failures with v5.31.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
As per perldelta entry for v5.31.5
https://metacpan.org/pod/release/SHAY/perl-5.31.5/pod/perldelta.pod#Incompatible-Changes
Signed-off-by: Petr Písař <ppisar@redhat.com>
---
lib/POE/Kernel.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/POE/Kernel.pm b/lib/POE/Kernel.pm
index f042ad0f..2d7e4008 100644
--- a/lib/POE/Kernel.pm
+++ b/lib/POE/Kernel.pm
@@ -365,7 +365,7 @@ BEGIN {
no strict 'refs';
local $^W = 0;
local $SIG{__WARN__} = sub { }; # redefine
- *$const = sub () { $value };
+ *$const = sub () { return $value };
}
# TRACE_FILENAME is special.
--
2.21.1

View File

@ -1,11 +1,15 @@
Name: perl-POE
Version: 1.367
Release: 21%{?dist}
Release: 22%{?dist}
Summary: POE - portable multitasking and networking framework for Perl
License: GPL+ or Artistic
URL: https://metacpan.org/release/POE
Source0: https://cpan.metacpan.org/authors/id/R/RC/RCAPUTO/POE-%{version}.tar.gz
# 1/2 Adapt to changes in Perl 5.31.5, RT#130664, in upstream after 1.367
Patch0: POE-1.367-RT-130664-test-failures-with-v5.31.5.patch
# 2/2 Adapt to changes in Perl 5.31.5, RT#130664, in upstream after 1.367
Patch1: POE-1.367-Corrected-previous-commit-as-per-tonyc-s-suggestion.patch
BuildArch: noarch
# Build
BuildRequires: perl-interpreter
@ -104,6 +108,8 @@ possible to use POE at varying levels of abstraction.
%prep
%setup -q -n POE-%{version}
%patch0 -p1
%patch1 -p1
chmod -c -x examples/*
find t/ -type f -exec chmod -c -x {} +
@ -130,6 +136,9 @@ make test
%{_mandir}/man3/*.3*
%changelog
* Fri Jan 31 2020 Petr Pisar <ppisar@redhat.com> - 1.367-22
- Adapt to changes in Perl 5.31.5
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.367-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild