From b6bee1ffc487949e81413b50d60d96f1f211fdd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppi...@redhat.com> Date: Mon, 27 Jun 2016 10:57:45 +0200 Subject: 6.511 bump
--- .gitignore | 1 + Coro-6.511-Do-not-use-argarray.patch | 38 ++++++++++++++++++++++++++++++++++++ perl-Coro.spec | 25 +++++++++--------------- sources | 2 +- 4 files changed, 49 insertions(+), 17 deletions(-) create mode 100644 Coro-6.511-Do-not-use-argarray.patch diff --git a/.gitignore b/.gitignore index ac77f53..200b969 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /Coro-6.47.tar.gz /Coro-6.48.tar.gz /Coro-6.49.tar.gz +/Coro-6.511.tar.gz diff --git a/Coro-6.511-Do-not-use-argarray.patch b/Coro-6.511-Do-not-use-argarray.patch new file mode 100644 index 0000000..a14a205 --- /dev/null +++ b/Coro-6.511-Do-not-use-argarray.patch @@ -0,0 +1,38 @@ +From e5bbd3e590aed6e7bad9a9a5b55e2c2631d10a37 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppi...@redhat.com> +Date: Mon, 27 Jun 2016 10:52:57 +0200 +Subject: [PATCH] Do not use argarray +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The argarray was removed before perl 5.24, +code equivalence displayed in e2657e180a66b618ece78ca6b9c1f9e9b361a948 +Perl5 commit, +<http://www.nntp.perl.org/group/perl.perl5.porters/2016/05/msg236178.html>, +bug #1338707 + +Signed-off-by: Petr Písař <ppi...@redhat.com> +--- + Coro/State.xs | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/Coro/State.xs b/Coro/State.xs +index 687fc25..e60690d 100644 +--- a/Coro/State.xs ++++ b/Coro/State.xs +@@ -1412,7 +1412,11 @@ runops_trace (pTHX) + PUSHMARK (SP); + PUSHs (&PL_sv_yes); + PUSHs (fullname); ++# if PERL_VERSION_ATLEAST(5,24,0) ++ PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc (PL_curpad[0])) : &PL_sv_undef); ++#else + PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); ++#endif + PUTBACK; + cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); + if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); +-- +2.5.5 + diff --git a/perl-Coro.spec b/perl-Coro.spec index e37a209..edbf601 100644 --- a/perl-Coro.spec +++ b/perl-Coro.spec @@ -1,6 +1,6 @@ Name: perl-Coro -Version: 6.49 -Release: 4%{?dist} +Version: 6.511 +Release: 1%{?dist} Summary: The only real threads in perl # Coro/libcoro: GPLv2 or BSD # Rest of package: GPL+ or Artistic @@ -9,22 +9,12 @@ Group: Development/Libraries URL: http://search.cpan.org/dist/Coro/ Source0: http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/Coro-%{version}.tar.gz Patch0: %{name}-5.25-ucontext-default.patch -# Make Coro compatible with Perl 5.24. This is a comprehensive Debian patch -# resolving three issues: -# (1) The signal vtbl was consted before 5.22, proposed fix -# <http://permalink.gmane.org/gmane.comp.lang.perl.perl5.porters/158431>, -# bug #1231165. -# (2) the argarray was removed before 5.24, +# Make Coro compatible with Perl 5.24, the argarray was removed before 5.24, # code equivalence displayed in e2657e180a66b618ece78ca6b9c1f9e9b361a948 # Perl5 commit, # <http://www.nntp.perl.org/group/perl.perl5.porters/2016/05/msg236178.html>, # bug #1338707 -# (3) Some eval tests aborted in the destructor, corrected by changing the -# PL_savestack_max, bug #1338707 -# See <http://blogs.perl.org/users/aristotle/2016/05/coro-vs-5022.html>, patch -# copied from -# <https://anonscm.debian.org/cgit/pkg-perl/packages/libcoro-perl.git/plain/debian/patches/coro-5.22.patch?id=dcd10ba9611b38e0ef19ef597b42b635fa23d942>. -Patch1: Coro-6.49-perl_5_24.patch +Patch1: Coro-6.511-Do-not-use-argarray.patch BuildRequires: coreutils BuildRequires: findutils BuildRequires: libecb-static @@ -162,8 +152,8 @@ make %{?_smp_mflags} %install make pure_install DESTDIR=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; -find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \; +find $RPM_BUILD_ROOT -type f -name .packlist -delete +find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -delete %{_fixperms} $RPM_BUILD_ROOT/* %check @@ -178,6 +168,9 @@ make test %{_mandir}/man3/* %changelog +* Mon Jun 27 2016 Petr Pisar <ppi...@redhat.com> - 6.511-1 +- 6.511 bump + * Fri May 20 2016 Petr Pisar <ppi...@redhat.com> - 6.49-4 - Make Coro compatible with Perl 5.24 (bug #1338707) diff --git a/sources b/sources index ac3100c..eb10e38 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0e62bcaf27e00c5ceaa4c0dbb1606fb5 Coro-6.49.tar.gz +bcad7051f573fed680eaf72e64e2140e Coro-6.511.tar.gz -- cgit v0.12 http://pkgs.fedoraproject.org/cgit/perl-Coro.git/commit/?h=master&id=b6bee1ffc487949e81413b50d60d96f1f211fdd2 -- Fedora Extras Perl SIG http://www.fedoraproject.org/wiki/Extras/SIGs/Perl perl-devel mailing list perl-devel@lists.fedoraproject.org https://lists.fedoraproject.org/admin/lists/perl-devel@lists.fedoraproject.org
