grpcio: add cython patch, works with 1.57.0, not the latest. See https://github.com/grpc/grpc/issues/33918

This commit is contained in:
Anton Bolshakov 2023-10-22 16:59:45 +08:00
parent aafb849f82
commit 9998bd8758
No known key found for this signature in database
GPG key ID: 32BDCED870788F04
8 changed files with 134 additions and 4 deletions

View file

@ -0,0 +1 @@
DIST pymobiledevice3-2.17.2.tar.gz 559769 BLAKE2B 949c7c488f40ebe69ae31ec6eaf66143bdbb837149749fc8a86c76cc5a78587e552dd9bfc2fe3238ee4995e6d58a7f6c326bbe9cc1f9f82ecaf529026d616b3c SHA512 ab0b3281ce861a2afe0a70337d6e0726c5211b736da27942e3c180da524ec617b61f9eb212f282146b96f6de20ef07b2dd138ac1174b94404ac1946814e3191e

View file

@ -0,0 +1,66 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_USE_PEP517=poetry
PYTHON_COMPAT=( python3_{10..11} )
inherit distutils-r1 pypi
DESCRIPTION=""
HOMEPAGE=""
LICENSE=""
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="test"
RDEPEND="
>=dev-python/construct-2.9.29[${PYTHON_USEDEP}]
dev-python/asn1[${PYTHON_USEDEP}]
dev-python/termcolor[${PYTHON_USEDEP}]
dev-python/click[${PYTHON_USEDEP}]
dev-python/coloredlogs[${PYTHON_USEDEP}]
dev-python/IPython[${PYTHON_USEDEP}]
>=dev-python/bpylist2>=4.0.1[${PYTHON_USEDEP}]
dev-python/pygments[${PYTHON_USEDEP}]
dev-python/hexdump[${PYTHON_USEDEP}]
dev-python/arrow[${PYTHON_USEDEP}]
dev-python/daemonize[${PYTHON_USEDEP}]
dev-python/gpxpy[${PYTHON_USEDEP}]
>=dev-python/pykdebugparser>=1.2.4[${PYTHON_USEDEP}]
>=dev-python/pyusb>=1.2.1[${PYTHON_USEDEP}]
dev-python/tqdm[${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
dev-python/cmd2[${PYTHON_USEDEP}]
dev-python/packaging[${PYTHON_USEDEP}]
>=dev-python/pygnuutils>=0.0.7[${PYTHON_USEDEP}]
>=dev-python/cryptography>=41.0.1[${PYTHON_USEDEP}]
>=dev-python/pycrashreport>=1.0.6[${PYTHON_USEDEP}]
dev-python/fastapi[all][${PYTHON_USEDEP}]
>=dev-python/uvicorn>=0.15.0[${PYTHON_USEDEP}]
dev-python/starlette[${PYTHON_USEDEP}]
dev-python/wsproto[${PYTHON_USEDEP}]
>=dev-python/nest_asyncio>=1.5.5[${PYTHON_USEDEP}]
dev-python/Pillow[${PYTHON_USEDEP}]
dev-python/inquirer3>=0.1.0[${PYTHON_USEDEP}]
dev-python/pyimg4>=0.8[${PYTHON_USEDEP}]
>=dev-python/ipsw_parser>=1.1.2[${PYTHON_USEDEP}]
dev-python/remotezip[${PYTHON_USEDEP}]
dev-python/zeroconf[${PYTHON_USEDEP}]
dev-python/ifaddr[${PYTHON_USEDEP}]
dev-python/hyperframe[${PYTHON_USEDEP}]
dev-python/srptools[${PYTHON_USEDEP}]
>=dev-python/qh3>=0.11.5[${PYTHON_USEDEP}]
>=dev-python/developer_disk_image>=0.0.2[${PYTHON_USEDEP}]
dev-python/opack[${PYTHON_USEDEP}]
dev-python/psutil[${PYTHON_USEDEP}]
>=dev-python/pytun-pmd3>=1.0.0[${PYTHON_USEDEP}]
dev-python/aiofiles[${PYTHON_USEDEP}]
dev-python/gnureadline[${PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
distutils_enable_tests pytest

View file

@ -1 +1 @@
DIST grpcio-tools-1.59.0.tar.gz 4622547 BLAKE2B 1d6cd5f375a4139bc977f04b2b0f18689e4df58d29f6ca5f05ea8fb1e47ba455d7e6c0c65ee11467d878fe12f584a641d75153f0ae59aa8ec28289a0c102cddc SHA512 15686fb90c2c228875792a580a2637098ec07a7f715302af7efb28b28c19c0083616786c1b526984a225035652372c5898256cb17536225c313797a1d0c85675
DIST grpcio-tools-1.57.0.tar.gz 4488020 BLAKE2B 24002e9825a6d0a2ae157baf1af066e677c905e90111dc77d3d7d22fc94256911a35e70bd1238cef1a9bd23a08851b89d85f93131595cc56fff72443cfd05eb0 SHA512 83601467b6d09b702fd549b964e8486c9585d7d6377676a4b9e13f1e9d4b86c85601819e3620e59e84ad2da9b68679350dc3c9920b6e544ef6e3e286bd78746b

View file

@ -1 +1 @@
DIST grpcio-1.59.0.tar.gz 24842974 BLAKE2B d883d9800f5b2025774c37a6c076500e113121b7e1254368d9c4b95c1170593969af4568492744527f909f828121630dd870210d2e2de718ba907be09f9b826b SHA512 1b345c2b87593934aa15e8019d858c6f7000d3e66ffd20ae538028aa109d8553ccff819ad8796b19c51d647851139d13b9158c9f2639b0b9506347ceff646637
DIST grpcio-1.57.0.tar.gz 24737546 BLAKE2B 61cca75c6c39b90caebee51d587828c5ef831dabeaf914e68dc1d52667aafd41104bca3d7a9815fff76c05a097f1b9869d094de4a061307f005723714700ae16 SHA512 d4564d52f5155385391e4a8529ea8aa570c670aafb7211267891000406345d4a5576424e70e0694d270d936e00221a527fb58481e9b3af07817a6302c1043c9d

View file

@ -0,0 +1,62 @@
Index: grpcio-1.57.0/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi
===================================================================
--- grpcio-1.57.0.orig/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi
+++ grpcio-1.57.0/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi
@@ -13,16 +13,16 @@
# limitations under the License.
# TODO(https://github.com/grpc/grpc/issues/15662): Reform this.
-cdef void* _copy_pointer(void* pointer):
+cdef void* _copy_pointer(void* pointer) noexcept:
return pointer
# TODO(https://github.com/grpc/grpc/issues/15662): Reform this.
-cdef void _destroy_pointer(void* pointer):
+cdef void _destroy_pointer(void* pointer) noexcept:
pass
-cdef int _compare_pointer(void* first_pointer, void* second_pointer):
+cdef int _compare_pointer(void* first_pointer, void* second_pointer) noexcept:
if first_pointer < second_pointer:
return -1
elif first_pointer > second_pointer:
Index: grpcio-1.57.0/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi
===================================================================
--- grpcio-1.57.0.orig/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi
+++ grpcio-1.57.0/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi
@@ -314,7 +314,7 @@ def server_credentials_ssl_dynamic_cert_
return credentials
cdef grpc_ssl_certificate_config_reload_status _server_cert_config_fetcher_wrapper(
- void* user_data, grpc_ssl_server_certificate_config **config) with gil:
+ void* user_data, grpc_ssl_server_certificate_config **config) noexcept with gil:
# This is a credentials.ServerCertificateConfig
cdef ServerCertificateConfig cert_config = None
if not user_data:
Index: grpcio-1.57.0/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi
===================================================================
--- grpcio-1.57.0.orig/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi
+++ grpcio-1.57.0/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi
@@ -50,7 +50,7 @@ cdef class CallbackWrapper:
@staticmethod
cdef void functor_run(
grpc_completion_queue_functor* functor,
- int success):
+ int success) noexcept:
cdef CallbackContext *context = <CallbackContext *>functor
cdef object waiter = <object>context.waiter
if not waiter.cancelled():
Index: grpcio-1.57.0/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi
===================================================================
--- grpcio-1.57.0.orig/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi
+++ grpcio-1.57.0/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi
@@ -48,7 +48,7 @@ cdef class CallbackWrapper:
@staticmethod
cdef void functor_run(
grpc_completion_queue_functor* functor,
- int succeed)
+ int succeed) noexcept
cdef grpc_completion_queue_functor *c_functor(self)

View file

@ -28,7 +28,7 @@ RDEPEND="
DEPEND="${RDEPEND}"
#PATCHES=( "${FILESDIR}/1.51.0-respect-cc.patch" )
PATCHES=( "${FILESDIR}/1.59-cython.patch" )
python_prepare_all() {
distutils-r1_python_prepare_all

View file

@ -315,7 +315,8 @@ dev-python/apng
=dev-python/humanfriendly-9*
app-admin/opensnitch
=dev-python/grpcio-tools-1.59*
# https://github.com/grpc/grpc/issues/33918
=dev-python/grpcio-tools-1.57*
#empire
<dev-python/jq-1.6 ~amd64