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 --- metadata/md5-cache/net-misc/warpinator-1.7.0 | 15 ------ metadata/md5-cache/net-misc/warpinator-1.7.0-r1 | 15 ++++++ metadata/pkg_desc_index | 2 +- .../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 ------------------- 6 files changed, 130 insertions(+), 67 deletions(-) delete mode 100644 metadata/md5-cache/net-misc/warpinator-1.7.0 create mode 100644 metadata/md5-cache/net-misc/warpinator-1.7.0-r1 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 diff --git a/metadata/md5-cache/net-misc/warpinator-1.7.0 b/metadata/md5-cache/net-misc/warpinator-1.7.0 deleted file mode 100644 index e9c95c79..00000000 --- a/metadata/md5-cache/net-misc/warpinator-1.7.0 +++ /dev/null @@ -1,15 +0,0 @@ -BDEPEND=>=dev-util/meson-0.45.0 >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array -DEFINED_PHASES=compile configure install postinst postrm preinst test -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 -DESCRIPTION=Share files across the LAN -EAPI=8 -HOMEPAGE=https://github.com/linuxmint/warpinator -IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info -INHERIT=meson gnome2-utils xdg -KEYWORDS=~amd64 -LICENSE=GPL-3 -RDEPEND=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 -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 diff --git a/metadata/md5-cache/net-misc/warpinator-1.7.0-r1 b/metadata/md5-cache/net-misc/warpinator-1.7.0-r1 new file mode 100644 index 00000000..affd8428 --- /dev/null +++ b/metadata/md5-cache/net-misc/warpinator-1.7.0-r1 @@ -0,0 +1,15 @@ +BDEPEND=>=dev-util/meson-0.45.0 >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array +DEFINED_PHASES=compile configure install postinst postrm preinst test +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 +DESCRIPTION=Share files across the LAN +EAPI=8 +HOMEPAGE=https://github.com/linuxmint/warpinator +IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info +INHERIT=meson gnome2-utils xdg +KEYWORDS=~amd64 +LICENSE=GPL-3 +RDEPEND=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 +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_=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 = 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