From 761fc0894c2a91d50a1df1bf5017753579b1933b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppi...@redhat.com>
Date: Tue, 23 May 2017 15:17:20 +0200
Subject: Restore compatibility with Perl 5.26.0
---
...mppad_name_-variable-sizes-to-Perl-5.26.0.patch | 60 ++++++++++++++++++++++
perl-Coro.spec | 8 ++-
2 files changed, 67 insertions(+), 1 deletion(-)
create mode 100644
Coro-6.511-Adjust-comppad_name_-variable-sizes-to-Perl-5.26.0.patch
diff --git
a/Coro-6.511-Adjust-comppad_name_-variable-sizes-to-Perl-5.26.0.patch
b/Coro-6.511-Adjust-comppad_name_-variable-sizes-to-Perl-5.26.0.patch
new file mode 100644
index 0000000..2fb34c0
--- /dev/null
+++ b/Coro-6.511-Adjust-comppad_name_-variable-sizes-to-Perl-5.26.0.patch
@@ -0,0 +1,60 @@
+From b48bc3a8141e5f27ce48b6f3ebbe2ba6ee7bda94 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppi...@redhat.com>
+Date: Tue, 23 May 2017 15:12:06 +0200
+Subject: [PATCH] Adjust comppad_name_ variable sizes to Perl 5.26.0
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Perl 5.26.0 changed some variable types in this commit:
+
+commit d12be05dd0210a08e077f0cc9586a5a963122547
+Author: David Mitchell <da...@iabyn.com>
+Date: Mon Sep 26 15:56:08 2016 +0100
+
+ make PL_ pad vars be of type PADOFFSET
+
+ Now that that PADOFFSET is signed, make
+
+ PL_comppad_name_fill
+ PL_comppad_name_floor
+ PL_padix
+ PL_constpadix
+ PL_padix_floor
+ PL_min_intro_pending
+ PL_max_intro_pending
+
+ be of type PADOFFSET rather than I32, to match the rest of the pad
+ interface.
+
+ At the same time, change various I32 local vars in pad.c functions to be
+ PADOFFSET.
+
+This patch adjusts Coro to the changes.
+
+Signed-off-by: Petr Písař <ppi...@redhat.com>
+---
+ Coro/state.h | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/Coro/state.h b/Coro/state.h
+index 9a3e84f..8d6d067 100644
+--- a/Coro/state.h
++++ b/Coro/state.h
+@@ -83,8 +83,13 @@ VAR(compcv, CV *) /* currently compiling
subroutine */
+
+ VAR(comppad, AV *) /* storage for lexically scoped
temporaries */
+ VAR(comppad_name, AV *) /* variable names for "my" variables */
++#if PERL_VERSION_ATLEAST (5,25,6)
++VAR(comppad_name_fill, PADOFFSET) /* last "introduced" variable offset
*/
++VAR(comppad_name_floor, PADOFFSET) /* start of vars in innermost block
*/
++#else
+ VAR(comppad_name_fill, I32) /* last "introduced" variable offset */
+ VAR(comppad_name_floor, I32) /* start of vars in innermost block */
++#endif
+
+ VAR(runops, runops_proc_t) /* for tracing support */
+
+--
+2.9.4
+
diff --git a/perl-Coro.spec b/perl-Coro.spec
index fb7d572..12ea882 100644
--- a/perl-Coro.spec
+++ b/perl-Coro.spec
@@ -1,6 +1,6 @@
Name: perl-Coro
Version: 6.511
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: The only real threads in perl
# Coro/libcoro: GPLv2 or BSD
# Rest of package: GPL+ or Artistic
@@ -15,6 +15,8 @@ Patch0: %{name}-5.25-ucontext-default.patch
# <http://www.nntp.perl.org/group/perl.perl5.porters/2016/05/msg236178.html>,
# bug #1338707
Patch1: Coro-6.511-Do-not-use-argarray.patch
+# Restore compatibility with Perl 5.26.0, CPAN RT#121836
+Patch2:
Coro-6.511-Adjust-comppad_name_-variable-sizes-to-Perl-5.26.0.patch
BuildRequires: coreutils
BuildRequires: findutils
BuildRequires: libecb-static
@@ -120,6 +122,7 @@ programming much safer and easier than using other thread
models.
%endif
%patch1 -p1
+%patch2 -p1
# Unbundle libecb
rm Coro/ecb.h
@@ -168,6 +171,9 @@ make test
%{_mandir}/man3/*
%changelog
+* Tue May 23 2017 Petr Pisar <ppi...@redhat.com> - 6.511-3
+- Restore compatibility with Perl 5.26.0 (CPAN RT#121836)
+
* Sat Feb 11 2017 Fedora Release Engineering <rel...@fedoraproject.org> -
6.511-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
--
cgit v1.1
https://src.fedoraproject.org/cgit/perl-Coro.git/commit/?h=master&id=761fc0894c2a91d50a1df1bf5017753579b1933b
_______________________________________________
perl-devel mailing list -- perl-devel@lists.fedoraproject.org
To unsubscribe send an email to perl-devel-le...@lists.fedoraproject.org
