net-misc/warpinator : fix build with cython3

4 files changed, 65 insertions, 2 deletions

diff --git a/metadata/md5-cache/net-misc/warpinator-1.7.0 b/metadata/md5-cache/net-misc/warpinator-1.7.0-r1
index e9c95c79..affd8428 100644
--- a/metadata/md5-cache/net-misc/warpinator-1.7.0
+++ b/metadata/md5-cache/net-misc/warpinator-1.7.0-r1
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/gobject-introspection dev-python/cryptography dev-python/ifaddr
 SLOT=0
 SRC_URI=https://github.com/linuxmint/warpinator/archive/refs/tags/master.lmde6.tar.gz -> warpinator-1.7.0.tar.gz
 _eclasses_=gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	meson	af1ca7ad21fdd31fcc4fa91d8abca977	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-utils-r1	f6221c2f55e5e832be9919fe1711f33b	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=9015f90d5a41e75dafc45dbeb0858463
+_md5_=198065a528223ff7063c54a9e09147d8
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index bffd3a89..fd06db1c 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -38,7 +38,7 @@ media-sound/strawberry 1.0.21-r10: Modern music player and library organizer bas
 media-tv/sopcast 3.2.6-r4: SopCast free P2P Internet TV binary
 media-video/guvcview 2.0.6-r10: Simple Qt5 or GTK+3 interface for capturing and viewing video from v4l2 devices
 net-dialup/rp-pppoe 4.0-r5: A user-mode PPPoE client and server suite for Linux
-net-misc/warpinator 1.7.0: Share files across the LAN
+net-misc/warpinator 1.7.0-r1: Share files across the LAN
 net-print/lexmark-upd-ppd 1.0.0.20210304-r1: Lexmark universal printer driver PPDs
 net-wireless/broadcom-sta 6.30.223.271-r5: Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver
 sys-apps/baselayout 2.13-r6: Filesystem baselayout and init scripts
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