On 2024/02/22 18:33, Klemens Nanni wrote:
> Works fine for me with RDP to a Windows 11 box.
> Needs cherry-picking a post-release for LibreSSL.
> I've also sent my wrapper shebang fix upstream.
>
> More tests?
> Feedback? OK?
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/remmina/Makefile,v
> diff -u -p -r1.62 Makefile
> --- Makefile 3 Feb 2024 12:39:41 -0000 1.62
> +++ Makefile 22 Feb 2024 18:18:19 -0000
> @@ -1,8 +1,8 @@
> COMMENT= GTK+ remote desktop client
>
> -V= 1.4.33
> -DISTNAME= Remmina-v.${V}
> -PKGNAME= ${DISTNAME:L:S/v.//}
> +V= 1.4.34
> +DISTNAME= Remmina-v${V}
> +PKGNAME= ${DISTNAME:L:S/v//}
>
> CATEGORIES= x11 net
>
> @@ -13,12 +13,17 @@ PERMIT_PACKAGE= Yes
>
> WANTLIB += ${MODPY_WANTLIB}
> WANTLIB += avahi-client avahi-common avahi-ui-gtk3 c cairo crypto
> -WANTLIB += cups freerdp-client2 freerdp2 gcrypt gdk-3 gdk_pixbuf-2.0
> +WANTLIB += cups curl freerdp-client2 gcrypt gdk-3 gdk_pixbuf-2.0
> WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gtk-3 intl
> -WANTLIB += json-glib-1.0 pango-1.0 pthread secret-1 sodium
> spice-client-glib-2.0
> -WANTLIB += spice-client-gtk-3.0 ssh ssl vncclient vncserver vte-2.91 winpr2
> -
> -SITES=
> https://gitlab.com/Remmina/Remmina/-/archive/v.${V}/
> +WANTLIB += json-glib-1.0 pango-1.0 pthread python3.10 secret-1
Please drop the hardcoded python3.10, you already have MODPY_WANTLIB.
> +WANTLIB += sndio sodium spice-client-glib-2.0 spice-client-gtk-3.0
> +WANTLIB += ssh ssl vncclient vncserver vte-2.91 winpr2
> +
> +SITES=
> https://gitlab.com/Remmina/Remmina/-/archive/v${V}/
> +SITES.fix= https://gitlab.com/Remmina/Remmina/commit/
> +# "Fix build for openssl-1.1"
> +PATCHFILES.fix= 93d703ec8524dec774f36d2285a6ec87c6fabb8d.patch
truncated hashes in the index lines, this isn't a stable file
> +PATCH_DIST_STRIP= -p1
>
> MODULES= devel/cmake \
> lang/python
> @@ -34,6 +39,7 @@ LIB_DEPENDS= ${MODPY_LIB_DEPENDS} \
> devel/json-glib \
> devel/vte3 \
> net/avahi,,-gtk3 \
> + net/curl \
> net/libvncserver \
> security/libsodium \
> security/libssh \
> @@ -64,5 +70,10 @@ CONFIGURE_ARGS += -DWITH_KF5WALLET=OFF \
> -DWITH_WWW=OFF
>
> DEBUG_PACKAGES= ${BUILD_PACKAGES}
> +
> +post-install:
> + # pending "Use universal /bin/sh shebang in remmina-rile-wrapper(1)"
> + # https://gitlab.com/Remmina/Remmina/-/merge_requests/2572
> + sed -i '1s,/usr/bin/env bash,/bin/sh,'
> ${PREFIX}/bin/remmina-file-wrapper
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/x11/remmina/distinfo,v
> diff -u -p -r1.13 distinfo
> --- distinfo 3 Feb 2024 12:39:41 -0000 1.13
> +++ distinfo 22 Feb 2024 17:53:58 -0000
> @@ -1,2 +1,4 @@
> -SHA256 (Remmina-v.1.4.33.tar.gz) =
> CYj47FyX8puDx+NNuicFjuOCydC6+qbVggCKdKIYcFM=
> -SIZE (Remmina-v.1.4.33.tar.gz) = 3690770
> +SHA256 (93d703ec8524dec774f36d2285a6ec87c6fabb8d.patch) =
> BpPEjlDlAUiOZQiWQADtezXtBB/+ME5g2SkCJPF4MRo=
> +SHA256 (Remmina-v1.4.34.tar.gz) =
> NDYiOaagnbfg/4D6ocRt5nl7pWlkAbxUvLZ85DjWCjs=
> +SIZE (93d703ec8524dec774f36d2285a6ec87c6fabb8d.patch) = 5748
> +SIZE (Remmina-v1.4.34.tar.gz) = 3744088
> Index: patches/patch-src_remmina_ssh_c
> ===================================================================
> RCS file: /cvs/ports/x11/remmina/patches/patch-src_remmina_ssh_c,v
> diff -u -p -r1.2 patch-src_remmina_ssh_c
> --- patches/patch-src_remmina_ssh_c 11 Jun 2023 20:59:09 -0000 1.2
> +++ patches/patch-src_remmina_ssh_c 22 Feb 2024 16:49:44 -0000
> @@ -1,7 +1,7 @@
> Index: src/remmina_ssh.c
> --- src/remmina_ssh.c.orig
> +++ src/remmina_ssh.c
> -@@ -40,7 +40,7 @@
> +@@ -41,7 +41,7 @@
> #ifdef HAVE_LIBSSH
>
> /* To get definitions of NI_MAXHOST and NI_MAXSERV from <netdb.h> */
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/x11/remmina/pkg/PLIST,v
> diff -u -p -r1.18 PLIST
> --- pkg/PLIST 11 Jun 2023 20:59:09 -0000 1.18
> +++ pkg/PLIST 22 Feb 2024 18:07:32 -0000
> @@ -79,6 +79,7 @@ share/icons/hicolor/scalable/emblems/org
> share/icons/hicolor/scalable/emblems/org.remmina.Remmina-vnc-symbolic.svg
> share/locale/ar/LC_MESSAGES/remmina.mo
> share/locale/ast/LC_MESSAGES/remmina.mo
> +share/locale/be/LC_MESSAGES/remmina.mo
> share/locale/ber/
> share/locale/ber/LC_MESSAGES/
> share/locale/ber/LC_MESSAGES/remmina.mo
>
