git: 1cd78d660683 - main - net/remmina: Updating to 1.4.25

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Fernando Apesteguía <fernape_at_FreeBSD.org>
Date: Mon, 11 Apr 2022 16:57:37 UTC
The branch main has been updated by fernape:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1cd78d6606830acb02ca417932132f5a968561bc

commit 1cd78d6606830acb02ca417932132f5a968561bc
Author:     Sean Champ <lab+bsd@thinkum.space>
AuthorDate: 2022-04-01 18:09:07 +0000
Commit:     Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2022-04-11 16:53:12 +0000

    net/remmina: Updating to 1.4.25
    
    From ChangeLog: https://remmina.org/v1.4.25/
    
    Add BASH and ZSH options
    
     * kiosk: Drop GNOME MediaKeys plugin
     * Honour soft links target in SFTP
     * Optional close confirmation
     * Fix some build warnings
     * Fix manpages
     * Snap cleanup + kwallet support
     * Deprecations and amend g_date_time_format_iso8601
     * Fixes to snap build
     * Removing dependencies that are available as extensions
     * FreeRDP_OffscreenSupportLevel is of type UINT32
     * Minor fixes
     * Get the right value for FreeRDP_AutoReconnectMaxRetries
    
    PR:     262968
    Reported by:    lab+bsd@thinkum.space
---
 net/remmina/Makefile  |  47 +++++++++++-------------
 net/remmina/distinfo  |   6 +--
 net/remmina/pkg-plist | 100 +++++++++++++++++++-------------------------------
 3 files changed, 62 insertions(+), 91 deletions(-)

diff --git a/net/remmina/Makefile b/net/remmina/Makefile
index 613d203e7f9a..aa269a441110 100644
--- a/net/remmina/Makefile
+++ b/net/remmina/Makefile
@@ -1,7 +1,7 @@
 # Created by: Alexander Logvinov <ports@logvinov.com>
 
 PORTNAME=	remmina
-DISTVERSION=	1.4.17
+DISTVERSION=	1.4.25
 CATEGORIES=	net gnome
 
 MAINTAINER=	fernape@FreeBSD.org
@@ -10,7 +10,8 @@ COMMENT=	GTK+ Remote Desktop Client
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libjson-glib-1.0.so:devel/json-glib \
+LIB_DEPENDS=	libappindicator3.so:devel/libappindicator \
+		libjson-glib-1.0.so:devel/json-glib \
 		libpcre2-8.so:devel/pcre2 \
 		libsodium.so:security/libsodium \
 		libsoup-2.4.so:devel/libsoup \
@@ -26,11 +27,11 @@ USES=		cmake compiler:c11 desktop-file-utils gettext gnome localbase:ldflags pat
 USE_GITLAB=	yes
 GL_ACCOUNT=	Remmina
 GL_PROJECT=	Remmina
-GL_COMMIT=	0ef1621b3e16b3168213147a2bfca39da2c2668f
+GL_COMMIT=	f7bb20c1b8b0efdcada70f942b9db0b8d14207e7
 
 USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk30 pango
 
-USE_XORG=	ice sm x11 xext xkbfile
+USE_XORG=	ice sm x11 xext
 
 SHEBANG_FILES=	data/desktop/remmina-file-wrapper.in
 bash_CMD=	${SH}
@@ -41,34 +42,39 @@ CONFLICTS_INSTALL=	remmina-plugin*
 
 OPTIONS_DEFINE=		AVAHI CUPS GCRYPT NLS SSH TERM
 OPTIONS_DEFAULT=	AVAHI CUPS GCRYPT NLS SSH TERM \
-			EXEC NX RDP SECRET SPICE ST VNC WWW XDMCP
+			EXEC RDP SECRET SPICE VNC WWW BASH
 OPTIONS_GROUP=		PLUGINS
-OPTIONS_GROUP_PLUGINS=	EXEC KWALLET NX RDP SECRET SPICE ST VNC WWW XDMCP
+OPTIONS_GROUP_PLUGINS=	EXEC KWALLET RDP SECRET SPICE VNC WWW
+OPTIONS_SINGLE=		SHELL
+OPTIONS_SINGLE_SHELL=	BASH ZSH
 OPTIONS_SUB=		yes
 
 .if ${FLAVOR:U} == lite
-OPTIONS_EXCLUDE=	AVAHI CUPS KWALLET NX SECRET SPICE SSH TERM WWW XDMCP
+OPTIONS_EXCLUDE=	AVAHI CUPS KWALLET SECRET SPICE SSH TERM WWW
 COMMENT+=		(lite flavor)
 .endif
 
 AVAHI_DESC=		Build with Avahi support
+BASH_DESC=		Use BASH for shell wrapper scripts
 EXEC_DESC=		Plugin to execute a command
 GCRYPT_DESC=		Build with libgcrypt support for password encryption
-NX_DESC=		NX protocol plugin
 RDP_DESC=		Remote Desktop Protocol plugin
 SECRET_DESC=		GNOME Keyring plugin
+SHELL_DESC=		Shell Scripts
 SPICE_DESC=		Spice protocol plugin
 SSH_DESC=		Build with SSH tunneling support
-ST_DESC=		(Simple) Terminal Plugin
 TERM_DESC=		Build with terminal support
 VNC_DESC=		VNC protocol plugin
 WWW_DESC=		Plugin to open an authenticated web browser
-XDMCP_DESC=		XDMCP protocol plugin
+ZSH_DESC=		Use ZSH for shell wrapper scripts
 
 AVAHI_LIB_DEPENDS=	libavahi-client.so:net/avahi-app \
 			libavahi-ui-gtk3.so:net/avahi-gtk3
 AVAHI_CMAKE_BOOL=	WITH_AVAHI
 
+BASH_RUN_DEPENDS=	bash:shells/bash
+BASH_VARS=		SH_BIN=${PREFIX}/bin/bash
+
 CUPS_LIB_DEPENDS=	libcups.so:print/cups
 CUPS_CMAKE_BOOL=	WITH_CUPS
 
@@ -81,9 +87,7 @@ KWALLET_CMAKE_BOOL=	WITH_KF5WALLET
 
 NLS_CMAKE_BOOL=		WITH_TRANSLATIONS
 
-NX_IMPLIES=		SSH
-
-RDP_LIB_DEPENDS=	libfreerdp2.so:net/freerdp
+RDP_LIB_DEPENDS=	libfreerdp2.so:net/freerdp libxkbfile.so:x11/libxkbfile
 
 SECRET_LIB_DEPENDS=	libsecret-1.so:security/libsecret
 SECRET_RUN_DEPENDS=	gnome-keyring:security/gnome-keyring
@@ -96,8 +100,6 @@ SSH_LIB_DEPENDS=	libssh.so:security/libssh
 SSH_CMAKE_BOOL=		WITH_LIBSSH
 SSH_LDFLAGS=		-fstack-protector
 
-ST_IMPLIES=		EXEC
-
 TERM_USE=		gnome=vte3
 TERM_CMAKE_BOOL=	WITH_VTE
 
@@ -110,7 +112,10 @@ WWW_LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz \
 			libsoup-2.4.so:devel/libsoup \
 			libwebkit2gtk-4.0.so:www/webkit2-gtk3
 
-XDMCP_RUN_DEPENDS=	Xephyr:x11-servers/xephyr
+ZSH_RUN_DEPENDS=	zsh:shells/zsh
+ZSH_VARS=		SH_BIN=${PREFIX}/bin/zsh
+
+bash_CMD=		${SH_BIN}
 
 post-patch:
 	${REINPLACE_CMD} -e 's,FreeBSD,FreeBSD|DragonFly,' \
@@ -126,10 +131,6 @@ post-patch-KWALLET-off:
 	${REINPLACE_CMD} -e '/add_definitions(-DWITH_KF5WALLET)/d' ${WRKSRC}/plugins/CMakeLists.txt
 	${REINPLACE_CMD} -e '/add_subdirectory(kwallet)/d' ${WRKSRC}/plugins/CMakeLists.txt
 
-post-patch-NX-off:
-	${REINPLACE_CMD} -e '/find_required_package(XKBFILE)/d' ${WRKSRC}/plugins/CMakeLists.txt
-	${REINPLACE_CMD} -e '/add_subdirectory(nx)/d' ${WRKSRC}/plugins/CMakeLists.txt
-
 post-patch-RDP-off:
 	${REINPLACE_CMD} -e '/find_suggested_package(FREERDP)/d' ${WRKSRC}/plugins/CMakeLists.txt
 	${REINPLACE_CMD} -e '/add_subdirectory(rdp)/d' ${WRKSRC}/plugins/CMakeLists.txt
@@ -144,9 +145,6 @@ post-patch-SPICE-off:
 post-patch-SSH-off:
 	${REINPLACE_CMD} -e '/find_suggested_package(LIBSSH)/d' ${WRKSRC}/plugins/CMakeLists.txt
 
-post-patch-ST-off:
-	${REINPLACE_CMD} -e '/add_subdirectory(st)/d' ${WRKSRC}/plugins/CMakeLists.txt
-
 post-patch-VNC-off:
 	${REINPLACE_CMD} -e' /find_suggested_package(LIBVNCSERVER)/d' ${WRKSRC}/plugins/CMakeLists.txt
 	${REINPLACE_CMD} -e '/add_subdirectory(vnc)/d' ${WRKSRC}/plugins/CMakeLists.txt
@@ -154,7 +152,4 @@ post-patch-VNC-off:
 post-patch-WWW-off:
 	${REINPLACE_CMD} -e '/add_subdirectory(www)/d' ${WRKSRC}/plugins/CMakeLists.txt
 
-post-patch-XDMCP-off:
-	${REINPLACE_CMD} -e '/add_subdirectory(xdmcp)/d' ${WRKSRC}/plugins/CMakeLists.txt
-
 .include <bsd.port.mk>
diff --git a/net/remmina/distinfo b/net/remmina/distinfo
index 2d921a42f655..247de5b7461c 100644
--- a/net/remmina/distinfo
+++ b/net/remmina/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1622216518
-SHA256 (Remmina-Remmina-0ef1621b3e16b3168213147a2bfca39da2c2668f_GL0.tar.gz) = 45ae312568b76bf5698e5b0814363b7e23bca2f7d547943ab1e0a3a7ecdacb91
-SIZE (Remmina-Remmina-0ef1621b3e16b3168213147a2bfca39da2c2668f_GL0.tar.gz) = 2620853
+TIMESTAMP = 1648653963
+SHA256 (Remmina-Remmina-f7bb20c1b8b0efdcada70f942b9db0b8d14207e7_GL0.tar.gz) = 7bcfd9e6607754ec0b226a728d91060cb13f8c575b6a6f65ff653a67684d37b1
+SIZE (Remmina-Remmina-f7bb20c1b8b0efdcada70f942b9db0b8d14207e7_GL0.tar.gz) = 3419211
diff --git a/net/remmina/pkg-plist b/net/remmina/pkg-plist
index b572ba8acddc..399430d5ade3 100644
--- a/net/remmina/pkg-plist
+++ b/net/remmina/pkg-plist
@@ -5,92 +5,67 @@ include/remmina/remmina_trace_calls.h
 include/remmina/types.h
 %%EXEC%%lib/remmina/plugins/remmina-plugin-exec.so
 %%KWALLET%%lib/remmina/plugins/remmina-plugin-kwallet.so
-%%NX%%lib/remmina/plugins/remmina-plugin-nx.so
 %%RDP%%lib/remmina/plugins/remmina-plugin-rdp.so
 %%SECRET%%lib/remmina/plugins/remmina-plugin-secret.so
 %%SPICE%%lib/remmina/plugins/remmina-plugin-spice.so
-%%ST%%lib/remmina/plugins/remmina-plugin-st.so
 %%VNC%%lib/remmina/plugins/remmina-plugin-vnc.so
 %%WWW%%lib/remmina/plugins/remmina-plugin-www.so
-%%XDMCP%%lib/remmina/plugins/remmina-plugin-xdmcp.so
 libdata/pkgconfig/remmina.pc
 man/man1/remmina-file-wrapper.1.gz
 man/man1/remmina.1.gz
 share/applications/org.remmina.Remmina.desktop
-share/applications/remmina-file.desktop
+share/applications/org.remmina.Remmina-file.desktop
 share/icons/hicolor/128x128/apps/org.remmina.Remmina.png
-share/icons/hicolor/128x128/apps/remmina-panel-inverted.png
-share/icons/hicolor/128x128/apps/remmina-panel.png
 share/icons/hicolor/16x16/apps/org.remmina.Remmina.png
-share/icons/hicolor/16x16/apps/remmina-panel-inverted.png
-share/icons/hicolor/16x16/apps/remmina-panel.png
+share/icons/hicolor/16x16/status/org.remmina.Remmina-status.svg
 share/icons/hicolor/22x22/apps/org.remmina.Remmina.png
-share/icons/hicolor/22x22/apps/remmina-panel-inverted.png
-share/icons/hicolor/22x22/apps/remmina-panel.png
+share/icons/hicolor/22x22/status/org.remmina.Remmina-status.svg
 share/icons/hicolor/24x24/apps/org.remmina.Remmina.png
-share/icons/hicolor/24x24/apps/remmina-panel-inverted.png
-share/icons/hicolor/24x24/apps/remmina-panel.png
+share/icons/hicolor/24x24/status/org.remmina.Remmina-status.svg
 share/icons/hicolor/256x256/apps/org.remmina.Remmina.png
-share/icons/hicolor/256x256/apps/remmina-panel-inverted.png
-share/icons/hicolor/256x256/apps/remmina-panel.png
 share/icons/hicolor/32x32/apps/org.remmina.Remmina.png
-share/icons/hicolor/32x32/apps/remmina-panel-inverted.png
-share/icons/hicolor/32x32/apps/remmina-panel.png
+share/icons/hicolor/32x32/status/org.remmina.Remmina-status.svg
 share/icons/hicolor/48x48/apps/org.remmina.Remmina.png
-share/icons/hicolor/48x48/apps/remmina-panel-inverted.png
-share/icons/hicolor/48x48/apps/remmina-panel.png
+share/icons/hicolor/48x48/status/org.remmina.Remmina-status.svg
 share/icons/hicolor/512x512/apps/org.remmina.Remmina.png
 share/icons/hicolor/64x64/apps/org.remmina.Remmina.png
-share/icons/hicolor/64x64/apps/remmina-panel-inverted.png
-share/icons/hicolor/64x64/apps/remmina-panel.png
+share/icons/hicolor/64x64/status/org.remmina.Remmina-status.svg
 share/icons/hicolor/72x72/apps/org.remmina.Remmina.png
-share/icons/hicolor/72x72/apps/remmina-panel-inverted.png
-share/icons/hicolor/72x72/apps/remmina-panel.png
 share/icons/hicolor/96x96/apps/org.remmina.Remmina.png
-share/icons/hicolor/96x96/apps/remmina-panel-inverted.png
-share/icons/hicolor/96x96/apps/remmina-panel.png
 share/icons/hicolor/apps/org.remmina.Remmina-symbolic.svg
 share/icons/hicolor/apps/remmina-symbolic.svg
-share/icons/hicolor/scalable/actions/remmina-camera-photo-symbolic.svg
-share/icons/hicolor/scalable/actions/remmina-connect-symbolic.svg
-share/icons/hicolor/scalable/actions/remmina-disconnect-symbolic.svg
-share/icons/hicolor/scalable/actions/remmina-document-save-symbolic.svg
-share/icons/hicolor/scalable/actions/remmina-document-send-symbolic.svg
-share/icons/hicolor/scalable/actions/remmina-duplicate-symbolic.svg
-share/icons/hicolor/scalable/actions/remmina-dynres-symbolic.svg
-share/icons/hicolor/scalable/actions/remmina-fit-window-symbolic.svg
-share/icons/hicolor/scalable/actions/remmina-fullscreen-symbolic.svg
-share/icons/hicolor/scalable/actions/remmina-go-bottom-symbolic.svg
-share/icons/hicolor/scalable/actions/remmina-keyboard-symbolic.svg
-share/icons/hicolor/scalable/actions/remmina-multi-monitor-symbolic.svg
-share/icons/hicolor/scalable/actions/remmina-pan-down-symbolic.svg
-share/icons/hicolor/scalable/actions/remmina-pan-up-symbolic.svg
-share/icons/hicolor/scalable/actions/remmina-pin-down-symbolic.svg
-share/icons/hicolor/scalable/actions/remmina-pin-up-symbolic.svg
-share/icons/hicolor/scalable/actions/remmina-preferences-system-symbolic.svg
-share/icons/hicolor/scalable/actions/remmina-scale-symbolic.svg
-share/icons/hicolor/scalable/actions/remmina-switch-page-symbolic.svg
-share/icons/hicolor/scalable/actions/remmina-system-run-symbolic.svg
-share/icons/hicolor/scalable/actions/view-list.svg
+share/icons/hicolor/scalable/actions/org.remmina.Remmina-camera-photo-symbolic.svg
+share/icons/hicolor/scalable/actions/org.remmina.Remmina-connect-symbolic.svg
+share/icons/hicolor/scalable/actions/org.remmina.Remmina-disconnect-symbolic.svg
+share/icons/hicolor/scalable/actions/org.remmina.Remmina-document-save-symbolic.svg
+share/icons/hicolor/scalable/actions/org.remmina.Remmina-document-send-symbolic.svg
+share/icons/hicolor/scalable/actions/org.remmina.Remmina-duplicate-symbolic.svg
+share/icons/hicolor/scalable/actions/org.remmina.Remmina-dynres-symbolic.svg
+share/icons/hicolor/scalable/actions/org.remmina.Remmina-fit-window-symbolic.svg
+share/icons/hicolor/scalable/actions/org.remmina.Remmina-fullscreen-symbolic.svg
+share/icons/hicolor/scalable/actions/org.remmina.Remmina-go-bottom-symbolic.svg
+share/icons/hicolor/scalable/actions/org.remmina.Remmina-keyboard-symbolic.svg
+share/icons/hicolor/scalable/actions/org.remmina.Remmina-multi-monitor-symbolic.svg
+share/icons/hicolor/scalable/actions/org.remmina.Remmina-pan-down-symbolic.svg
+share/icons/hicolor/scalable/actions/org.remmina.Remmina-pan-up-symbolic.svg
+share/icons/hicolor/scalable/actions/org.remmina.Remmina-pin-down-symbolic.svg
+share/icons/hicolor/scalable/actions/org.remmina.Remmina-pin-up-symbolic.svg
+share/icons/hicolor/scalable/actions/org.remmina.Remmina-preferences-system-symbolic.svg
+share/icons/hicolor/scalable/actions/org.remmina.Remmina-scale-symbolic.svg
+share/icons/hicolor/scalable/actions/org.remmina.Remmina-switch-page-symbolic.svg
+share/icons/hicolor/scalable/actions/org.remmina.Remmina-system-run-symbolic.svg
 share/icons/hicolor/scalable/apps/org.remmina.Remmina-symbolic.svg
 share/icons/hicolor/scalable/apps/org.remmina.Remmina.svg
-share/icons/hicolor/scalable/apps/remmina-panel-inverted.svg
-share/icons/hicolor/scalable/apps/remmina-panel.svg
-share/icons/hicolor/scalable/emblems/remmina-sftp-symbolic.svg
-share/icons/hicolor/scalable/emblems/remmina-ssh-symbolic.svg
-%%EXEC%%share/icons/hicolor/scalable/emblems/remmina-tool-symbolic.svg
-%%NX%%share/icons/hicolor/scalable/emblems/remmina-nx-symbolic.svg
-%%RDP%%share/icons/hicolor/scalable/emblems/remmina-rdp-symbolic.svg
-%%RDP%%share/icons/hicolor/scalable/emblems/remmina-rdp-ssh-symbolic.svg
-%%SPICE%%share/icons/hicolor/scalable/emblems/remmina-spice-ssh-symbolic.svg
-%%SPICE%%share/icons/hicolor/scalable/emblems/remmina-spice-symbolic.svg
-%%VNC%%share/icons/hicolor/scalable/emblems/remmina-vnc-ssh-symbolic.svg
-%%VNC%%share/icons/hicolor/scalable/emblems/remmina-vnc-symbolic.svg
-%%WWW%%share/icons/hicolor/scalable/emblems/remmina-www-symbolic.svg
-%%XDMCP%%share/icons/hicolor/scalable/emblems/remmina-xdmcp-ssh-symbolic.svg
-%%XDMCP%%share/icons/hicolor/scalable/emblems/remmina-xdmcp-symbolic.svg
-share/icons/hicolor/scalable/panel/remmina-panel-inverted.svg
-share/icons/hicolor/scalable/panel/remmina-panel.svg
+share/icons/hicolor/scalable/emblems/org.remmina.Remmina-sftp-symbolic.svg
+share/icons/hicolor/scalable/emblems/org.remmina.Remmina-ssh-symbolic.svg
+share/icons/hicolor/scalable/emblems/org.remmina.Remmina-tool-symbolic.svg
+%%RDP%%share/icons/hicolor/scalable/emblems/org.remmina.Remmina-rdp-symbolic.svg
+%%RDP%%share/icons/hicolor/scalable/emblems/org.remmina.Remmina-rdp-ssh-symbolic.svg
+%%SPICE%%share/icons/hicolor/scalable/emblems/org.remmina.Remmina-spice-ssh-symbolic.svg
+%%SPICE%%share/icons/hicolor/scalable/emblems/org.remmina.Remmina-spice-symbolic.svg
+%%VNC%%share/icons/hicolor/scalable/emblems/org.remmina.Remmina-vnc-ssh-symbolic.svg
+%%VNC%%share/icons/hicolor/scalable/emblems/org.remmina.Remmina-vnc-symbolic.svg
+%%WWW%%share/icons/hicolor/scalable/emblems/org.remmina.Remmina-www-symbolic.svg
 %%NLS%%share/locale/ar/LC_MESSAGES/remmina.mo
 %%NLS%%share/locale/ast/LC_MESSAGES/remmina.mo
 %%NLS%%share/locale/ber/LC_MESSAGES/remmina.mo
@@ -158,6 +133,7 @@ share/icons/hicolor/scalable/panel/remmina-panel.svg
 %%NLS%%share/locale/tr/LC_MESSAGES/remmina.mo
 %%NLS%%share/locale/ug/LC_MESSAGES/remmina.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/remmina.mo
+%%NLS%%share/locale/uz/LC_MESSAGES/remmina.mo
 %%NLS%%share/locale/uz@cyrillic/LC_MESSAGES/remmina.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/remmina.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/remmina.mo