From 9c58e68c0c852e494e36b6adc18e49e6c65502e0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 3 Nov 2023 09:42:47 +0000 Subject: net-misc/warpinator : fix build with cython3 --- .../files/warpinator-bundled-grpcio-cython3.patch | 59 ++++++++++++++++++++++ net-misc/warpinator/warpinator-1.7.0-r1.ebuild | 55 ++++++++++++++++++++ net-misc/warpinator/warpinator-1.7.0.ebuild | 51 ------------------- 3 files changed, 114 insertions(+), 51 deletions(-) create mode 100644 net-misc/warpinator/files/warpinator-bundled-grpcio-cython3.patch create mode 100644 net-misc/warpinator/warpinator-1.7.0-r1.ebuild delete mode 100644 net-misc/warpinator/warpinator-1.7.0.ebuild (limited to 'net-misc') 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 = functor + cdef object waiter = 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-r1.ebuild b/net-misc/warpinator/warpinator-1.7.0-r1.ebuild new file mode 100644 index 00000000..1269f26a --- /dev/null +++ b/net-misc/warpinator/warpinator-1.7.0-r1.ebuild @@ -0,0 +1,55 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Share files across the LAN" +HOMEPAGE="https://github.com/linuxmint/warpinator" +SRC_URI="https://github.com/linuxmint/${PN}/archive/refs/tags/master.lmde6.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" + +inherit meson gnome2-utils xdg + +DEPEND=" + dev-libs/gobject-introspection + dev-python/cryptography + dev-python/ifaddr + dev-python/netaddr + dev-python/netifaces + dev-python/pynacl + dev-python/setproctitle + >=dev-python/python3-xapp-1.6.0 +" +RDEPEND="${DEPEND}" +BDEPEND=" + >=dev-util/meson-0.45.0 +" + +S="${WORKDIR}/${PN}-master.lmde6" + +PATCHES=( + "${FILESDIR}/${PN}-bundled-grpcio-cython3.patch" +) + +src_configure() { + local emesonargs=( + -Dinclude-firewall-mod=true + -Dbundle-zeroconf=true + -Dbundle-landlock=true + -Dbundle-grpc=true + ) + meson_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postinst + gnome2_schemas_update +} diff --git a/net-misc/warpinator/warpinator-1.7.0.ebuild b/net-misc/warpinator/warpinator-1.7.0.ebuild deleted file mode 100644 index fde104f1..00000000 --- a/net-misc/warpinator/warpinator-1.7.0.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Share files across the LAN" -HOMEPAGE="https://github.com/linuxmint/warpinator" -SRC_URI="https://github.com/linuxmint/${PN}/archive/refs/tags/master.lmde6.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" - -inherit meson gnome2-utils xdg - -DEPEND=" - dev-libs/gobject-introspection - dev-python/cryptography - dev-python/ifaddr - dev-python/netaddr - dev-python/netifaces - dev-python/pynacl - dev-python/setproctitle - >=dev-python/python3-xapp-1.6.0 -" -RDEPEND="${DEPEND}" -BDEPEND=" - >=dev-util/meson-0.45.0 -" - -S="${WORKDIR}/${PN}-master.lmde6" - -src_configure() { - local emesonargs=( - -Dinclude-firewall-mod=true - -Dbundle-zeroconf=true - -Dbundle-landlock=true - -Dbundle-grpc=true - ) - meson_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postinst - gnome2_schemas_update -} -- cgit v1.2.3