From ebfabce9104d3436fb55fcbe8da5ab1b83517376 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar(a)redhat.com>
Date: Tue, 30 Jun 2015 13:09:00 +0200
Subject: 6.45 bump
---
.gitignore | 2 +
...6.44-Fix-coro_enterleave_hook-invocations.patch | 45 ++++++++++++++++++++++
perl-Coro.spec | 21 ++++++----
sources | 2 +-
4 files changed, 62 insertions(+), 8 deletions(-)
create mode 100644 Coro-6.44-Fix-coro_enterleave_hook-invocations.patch
diff --git a/.gitignore b/.gitignore
index eec1a0b..130297b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,5 @@
/Coro-6.41.tar.gz
/Coro-6.42.tar.gz
/Coro-6.43.tar.gz
+/Coro-6.44.tar.gz
+/Coro-6.45.tar.gz
diff --git a/Coro-6.44-Fix-coro_enterleave_hook-invocations.patch
b/Coro-6.44-Fix-coro_enterleave_hook-invocations.patch
new file mode 100644
index 0000000..d4f330a
--- /dev/null
+++ b/Coro-6.44-Fix-coro_enterleave_hook-invocations.patch
@@ -0,0 +1,45 @@
+From 803d1ef574ed183d0979e1f2cc81552396d8c6e3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar(a)redhat.com>
+Date: Tue, 30 Jun 2015 12:50:36 +0200
+Subject: [PATCH] Fix coro_enterleave_hook invocations
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The hook has type of:
+
+typedef void (*coro_enterleave_hook) (pTHX_ void *arg);
+
+so it needs perl context as the first argument. It prevents from
+compilation on thread-enabled perl.
+
+Signed-off-by: Petr Písař <ppisar(a)redhat.com>
+---
+ Coro/State.xs | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Coro/State.xs b/Coro/State.xs
+index c2abc8c..76b546f 100644
+--- a/Coro/State.xs
++++ b/Coro/State.xs
+@@ -2872,7 +2872,7 @@ enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp,
coro_enterleave_hook ho
+ if (AvARRAY (av)[i] == (SV *)hook)
+ {
+ if (execute)
+- hook ((void *)AvARRAY (av)[i + 1]);
++ hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
+
+ memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
+ av_pop (av);
+@@ -2894,7 +2894,7 @@ api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter,
void *enter_
+
+ if (SvSTATE_current == coro)
+ if (enter)
+- enter (aTHX enter_arg);
++ enter (aTHX_ enter_arg);
+
+ enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
+ enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
+--
+2.4.3
+
diff --git a/perl-Coro.spec b/perl-Coro.spec
index 01de74e..2a44b36 100644
--- a/perl-Coro.spec
+++ b/perl-Coro.spec
@@ -1,6 +1,6 @@
Name: perl-Coro
-Version: 6.43
-Release: 3%{?dist}
+Version: 6.45
+Release: 1%{?dist}
Summary: The only real threads in perl
# Coro/libcoro: GPLv2 or BSD
# Rest of package: GPL+ or Artistic
@@ -9,6 +9,8 @@ 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
+# Fix building on thread-enabled perl
+Patch1: Coro-6.44-Fix-coro_enterleave_hook-invocations.patch
BuildRequires: coreutils
BuildRequires: findutils
BuildRequires: libecb-static
@@ -105,15 +107,17 @@ programming much safer and easier than using other thread models.
%prep
%setup -q -n Coro-%{version}
-# Unbundle libecb
-rm Coro/ecb.h
-sed -i '/^Coro\/ecb\.h$/d' MANIFEST
-sed -i 's/ecb\.h//' Coro/Makefile.PL
-# use ucontext backend on non-x86 (setjmp didn't work on s390(x))
%ifnarch %{ix86} x86_64 %{arm}
+# use ucontext backend on non-x86 (setjmp didn't work on s390(x))
%patch0 -p1 -b .ucontext-default
%endif
+%patch1 -p1
+
+# Unbundle libecb
+rm Coro/ecb.h
+sed -i '/^Coro\/ecb\.h$/d' MANIFEST
+sed -i 's/ecb\.h//' Coro/Makefile.PL
for F in Coro/jit-*.pl; do
sed -i -e '/^#!/d' "$F"
@@ -157,6 +161,9 @@ make test
%{_mandir}/man3/*
%changelog
+* Tue Jun 30 2015 Petr Pisar <ppisar(a)redhat.com> - 6.45-1
+- 6.45 bump
+
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
6.43-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
diff --git a/sources b/sources
index 6a63f76..db36263 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-79f7f29e2867d48b3d911bede58fc23c Coro-6.43.tar.gz
+fb699f366af1a4128db7e14db51c8dee Coro-6.45.tar.gz
--
cgit v0.12
http://pkgs.fedoraproject.org/cgit/perl-Coro.git/commit/?h=epel7&id=e...