net-misc/warpinator : fix build with cython3

2 files changed, 63 insertions, 0 deletions

diff --git a/net-misc/warpinator/files/warpinator-bundled-grpcio-cython3.patch b/net-misc/warpinator/files/warpinator-bundled-grpcio-cython3.patch
new file mode 100644
index 00000000..a8b3bf25
--- /dev/null
+++ b/net-misc/warpinator/files/warpinator-bundled-grpcio-cython3.patch
@@ -0,0 +1,59 @@
+diff -Nur a/src/grpcio-1.59.0/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi b/src/grpcio-1.59.0/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi
+--- a/src/grpcio-1.59.0/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi	2023-10-16 18:26:49.000000000 +0100
++++ b/src/grpcio-1.59.0/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi	2023-11-03 09:27:43.328196009 +0000
+@@ -48,7 +48,7 @@
+     @staticmethod
+     cdef void functor_run(
+             grpc_completion_queue_functor* functor,
+-            int succeed)
++            int succeed) noexcept
+ 
+     cdef grpc_completion_queue_functor *c_functor(self)
+ 
+diff -Nur a/src/grpcio-1.59.0/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi b/src/grpcio-1.59.0/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi
+--- a/src/grpcio-1.59.0/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi	2023-10-16 18:26:49.000000000 +0100
++++ b/src/grpcio-1.59.0/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi	2023-11-03 09:27:43.328196009 +0000
+@@ -50,7 +50,7 @@
+     @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():
+diff -Nur a/src/grpcio-1.59.0/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi b/src/grpcio-1.59.0/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi
+--- a/src/grpcio-1.59.0/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi	2023-10-16 18:26:49.000000000 +0100
++++ b/src/grpcio-1.59.0/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi	2023-11-03 09:27:43.328196009 +0000
+@@ -314,7 +314,7 @@
+   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:
+diff -Nur a/src/grpcio-1.59.0/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi b/src/grpcio-1.59.0/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi
+--- a/src/grpcio-1.59.0/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi	2023-10-16 18:26:49.000000000 +0100
++++ b/src/grpcio-1.59.0/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi	2023-11-03 09:27:43.328196009 +0000
+@@ -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:
diff --git a/net-misc/warpinator/warpinator-1.7.0.ebuild b/net-misc/warpinator/warpinator-1.7.0-r1.ebuild
index fde104f1..1269f26a 100644
--- a/net-misc/warpinator/warpinator-1.7.0.ebuild
+++ b/net-misc/warpinator/warpinator-1.7.0-r1.ebuild
@@ -30,6 +30,10 @@ BDEPEND="
 
 S="${WORKDIR}/${PN}-master.lmde6"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-bundled-grpcio-cython3.patch"
+)
+
 src_configure() {
 	local emesonargs=(
 		-Dinclude-firewall-mod=true