From 1cb01405e16b678b43b60e54429c9f2ebdbb5847 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sat, 9 Jun 2018 18:58:26 +0200 Subject: [PATCH] python-gevent: update to 1.3.3 --- ...c7de7bca39b753e177837fa1bdff0fb7ecf1.patch | 62 ------------------- srcpkgs/python-gevent/patches/setup_py.patch | 16 ++--- srcpkgs/python-gevent/template | 6 +- 3 files changed, 12 insertions(+), 72 deletions(-) delete mode 100644 srcpkgs/python-gevent/patches/4c25c7de7bca39b753e177837fa1bdff0fb7ecf1.patch diff --git a/srcpkgs/python-gevent/patches/4c25c7de7bca39b753e177837fa1bdff0fb7ecf1.patch b/srcpkgs/python-gevent/patches/4c25c7de7bca39b753e177837fa1bdff0fb7ecf1.patch deleted file mode 100644 index 91f9aca46a..0000000000 --- a/srcpkgs/python-gevent/patches/4c25c7de7bca39b753e177837fa1bdff0fb7ecf1.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 4c25c7de7bca39b753e177837fa1bdff0fb7ecf1 Mon Sep 17 00:00:00 2001 -From: Jason Madden -Date: Thu, 20 Jul 2017 08:03:06 -0500 -Subject: [PATCH] Disable auto-pickling to work around - https://github.com/cython/cython/issues/1786. We don't want to allow that in - a point-release of gevent anyway. - ---- - src/gevent/_semaphore.pxd | 1 + - src/gevent/_semaphore.py | 1 + - src/gevent/ares.pyx | 5 +++++ - src/gevent/libev/corecext.ppyx | 5 +++-- - 4 files changed, 10 insertions(+), 2 deletions(-) - -diff --git src/gevent/_semaphore.pxd src/gevent/_semaphore.pxd -index 6382d560..1d66da76 100644 ---- src/gevent/_semaphore.pxd -+++ src/gevent/_semaphore.pxd -@@ -1,3 +1,4 @@ -+# cython: auto_pickle=False - cdef class Semaphore: - cdef public int counter - cdef readonly object _links -diff --git src/gevent/_semaphore.py src/gevent/_semaphore.py -index c6e11622..28b7d085 100644 ---- src/gevent/_semaphore.py -+++ src/gevent/_semaphore.py -@@ -1,3 +1,4 @@ -+# cython: auto_pickle=False - import sys - from gevent.hub import get_hub, getcurrent - from gevent.timeout import Timeout -diff --git src/gevent/ares.pyx src/gevent/ares.pyx -index 92832cc2..ce675d80 100644 ---- src/gevent/ares.pyx -+++ src/gevent/ares.pyx -@@ -1,4 +1,9 @@ - # Copyright (c) 2011-2012 Denis Bilenko. See LICENSE for details. -+# Automatic pickling of cdef classes was added in 0.26. Unfortunately it -+# seems to be buggy (at least for the `result` class) and produces code that -+# can't compile ("local variable 'result' referenced before assignment"). -+# See https://github.com/cython/cython/issues/1786 -+# cython: auto_pickle=False - cimport cares - import sys - from python cimport * -diff --git src/gevent/libev/corecext.ppyx src/gevent/libev/corecext.ppyx -index a474d7e2..f7a6caae 100644 ---- src/gevent/libev/corecext.ppyx -+++ src/gevent/libev/corecext.ppyx -@@ -1,8 +1,9 @@ - # Copyright (c) 2009-2012 Denis Bilenko. See LICENSE for details. - # This directive, supported in Cython 0.24+, causes sources files to be - # much smaller and thus cythonpp.py to be slightly faster. But it does make --# debugging more difficult. --# cython: emit_code_comments=False -+# debugging more difficult. Auto-pickling was added in 0.26, and that's a new feature -+# that we don't need or want to allow in a gevent point release. -+# cython: emit_code_comments=False, auto_pickle=False - cimport cython - cimport libev - # Note this is not the standard cython 'cpython' (which has a backwards compat alias of 'python') diff --git a/srcpkgs/python-gevent/patches/setup_py.patch b/srcpkgs/python-gevent/patches/setup_py.patch index 491458ad02..4aaecb30a6 100644 --- a/srcpkgs/python-gevent/patches/setup_py.patch +++ b/srcpkgs/python-gevent/patches/setup_py.patch @@ -1,16 +1,18 @@ ---- setup.py.orig 2017-01-12 14:15:25.000000000 +0100 -+++ setup.py 2017-02-16 23:32:42.297897158 +0100 -@@ -117,13 +117,6 @@ +--- setup.py.orig 2018-06-08 12:56:05.000000000 +0200 ++++ setup.py 2018-06-09 18:13:19.783191927 +0200 +@@ -306,15 +306,6 @@ + def run_setup(ext_modules, run_make): - if run_make: +- if run_make: - if (not LIBEV_EMBED and not WIN and cffi_modules) or PYPY: - # We're not embedding libev but we do want - # to build the CFFI module. We need to configure libev - # because the CORE Extension won't. - # TODO: Generalize this. -- system(libev_configure_command) +- if LIBEV_CFFI_MODULE in cffi_modules and not WIN: +- system(libev_configure_command) - - MakeSdist.make() - setup( + name='gevent', + version=__version__, diff --git a/srcpkgs/python-gevent/template b/srcpkgs/python-gevent/template index fc764a0599..bfbe901534 100644 --- a/srcpkgs/python-gevent/template +++ b/srcpkgs/python-gevent/template @@ -1,7 +1,7 @@ # Template file for 'python-gevent' pkgname=python-gevent -version=1.2.2 -revision=2 +version=1.3.3 +revision=1 wrksrc="gevent-${version}" build_style=python-module hostmakedepends="python-setuptools python3-setuptools python-Cython python3-Cython" @@ -13,7 +13,7 @@ maintainer="Alessio Sergi " homepage="http://www.gevent.org/" license="MIT" distfiles="https://github.com/gevent/gevent/archive/${version}.tar.gz" -checksum=c59072a2bac1829c6e0f19814b4b9fe726f9162a1762831a0c316ae27fa69eb2 +checksum=c9270781266c241c09ad06ab7b4375a6325c2993ea67074902a3f47b26d7bbf8 export LIBEV_EMBED=0 export CARES_EMBED=0