Re: git: ea013863fcd8 - main - net/remmina: update to 1.4.35

Reply: Vladimir Druzenko : "Re: git: ea013863fcd8 - main - net/remmina: update to 1.4.35"
In reply to: Fernando Apesteguía : "git: ea013863fcd8 - main - net/remmina: update to 1.4.35"
Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Vladimir Druzenko <vvd_at_freebsd.org>
Date: Wed, 28 Feb 2024 09:16:25 UTC
28.02.2024 10:33, Fernando Apesteguía пишет:
> The branch main has been updated by fernape:
>
> URL: https://cgit.FreeBSD.org/ports/commit/?id=ea013863fcd8921b8dccc9fbac57b08d26bac102
>
> commit ea013863fcd8921b8dccc9fbac57b08d26bac102
> Author:     Fernando Apesteguía <fernape@FreeBSD.org>
> AuthorDate: 2024-02-24 17:03:48 +0000
> Commit:     Fernando Apesteguía <fernape@FreeBSD.org>
> CommitDate: 2024-02-28 07:32:38 +0000
>
>      net/remmina: update to 1.4.35
>      
>      Add libcurl dependency
>      Add new GVNC plugin.
>      Remove obsolete code.
>      
>      ChangeLog: https://gitlab.com/Remmina/Remmina/-/releases/v1.4.35
>      
>       * Fix build for openssl-1.1
>       * Allow running an SSH command when connecting via ssh tunnel
>       * Check if WINPR_ASSERT is defined
>       * [REM-3047] fix issue compiling with gcc-14
>       * Fix crash caused by enabling disablepasswordstoring
>       * Revert setting loadbalanceinfo to the old method used before FreeRDP3
>       * updated call to set FreeRDP_LoadBalanceInfo
> ---
>   net/remmina/Makefile                   | 31 ++++++++++---------------------
>   net/remmina/distinfo                   |  6 +++---
>   net/remmina/files/patch-CMakeLists.txt | 18 ++++++++++++++++++
>   net/remmina/pkg-plist                  |  5 ++++-
>   4 files changed, 35 insertions(+), 25 deletions(-)
>
> diff --git a/net/remmina/Makefile b/net/remmina/Makefile
> index a0b73dafb4ac..2ae5b54d9d83 100644
> --- a/net/remmina/Makefile
> +++ b/net/remmina/Makefile
> @@ -1,10 +1,7 @@
>   PORTNAME=	remmina
> -DISTVERSION=	1.4.34
> +DISTVERSION=	1.4.35
>   CATEGORIES=	net gnome
>   
> -PATCH_SITES=	https://gitlab.com/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/
> -PATCHFILES+=	dbd6f94974c4d7df313963ffefecb1ff8ca9ecb6.patch:-p1 # https://gitlab.com/Remmina/Remmina/-/merge_requests/2540
> -
>   MAINTAINER=	fernape@FreeBSD.org
>   COMMENT=	GTK Remote Desktop Client
>   WWW=		https://www.remmina.org/
> @@ -13,6 +10,7 @@ LICENSE=	GPLv2+
>   LICENSE_FILE=	${WRKSRC}/LICENSE
>   
>   LIB_DEPENDS=	libappindicator3.so:devel/libappindicator \
> +		libcurl.so:ftp/curl \
>   		libjson-glib-1.0.so:devel/json-glib \
>   		libpcre2-8.so:devel/pcre2 \
>   		libsodium.so:security/libsodium \
> @@ -29,7 +27,7 @@ USES=		cmake compiler:c11 desktop-file-utils gettext gnome localbase:ldflags pat
>   USE_GITLAB=	yes
>   GL_ACCOUNT=	Remmina
>   GL_PROJECT=	Remmina
> -GL_TAGNAME=	2c4e1479433e51418ecb6089f35182bfebc5b57e
> +GL_TAGNAME=	2a455eadd6462457d08c2d066c5c245e0dee3bf9
>   
>   USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk30 pango
>   
> @@ -43,11 +41,11 @@ CMAKE_ARGS=	-DWITH_APPINDICATOR:BOOL=false \
>   
>   CONFLICTS_INSTALL=	remmina-plugin*
>   
> -OPTIONS_DEFINE=		AVAHI CUPS GCRYPT NLS PYTHON SSH TERM
> +OPTIONS_DEFINE=		AVAHI CUPS GCRYPT GVNC NLS PYTHON SSH TERM
>   OPTIONS_DEFAULT=	AVAHI CUPS GCRYPT NLS SSH TERM \
>   			EXEC RDP SECRET SPICE VNC WWW BASH
>   OPTIONS_GROUP=		PLUGINS
> -OPTIONS_GROUP_PLUGINS=	EXEC KWALLET RDP SECRET SPICE VNC WWW
> +OPTIONS_GROUP_PLUGINS=	EXEC GVNC KWALLET RDP SECRET SPICE VNC WWW
>   OPTIONS_SINGLE=		SHELL
>   OPTIONS_SINGLE_SHELL=	BASH ZSH
>   OPTIONS_SUB=		yes
> @@ -61,6 +59,7 @@ 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
> +GVNC_DESC=		Build with Gnome VNC support
>   PYTHON_DESC=		Build with support for Python plugins
>   RDP_DESC=		Remote Desktop Protocol plugin
>   SECRET_DESC=		GNOME Keyring plugin
> @@ -85,6 +84,9 @@ CUPS_CMAKE_BOOL=	WITH_CUPS
>   GCRYPT_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
>   GCRYPT_CMAKE_BOOL=	WITH_GCRYPT
>   
> +GVNC_LIB_DEPENDS=	libgtk-vnc-2.0.so:net/gtk-vnc
> +GVNC_CMAKE_BOOL=	WITH_LIBVNCSERVER
> +
>   KWALLET_USES=		kde:5 qt:5
>   KWALLET_USE=		kde=wallet qt=buildtools:build,core,gui,qmake:build
>   KWALLET_CMAKE_BOOL=	WITH_KF5WALLET
> @@ -111,10 +113,9 @@ TERM_USE=		gnome=vte3
>   TERM_CMAKE_BOOL=	WITH_VTE
>   
>   VNC_LIB_DEPENDS=	libgnutls.so:security/gnutls \
> -			libgtk-vnc-2.0.so:net/gtk-vnc \
>   			libvncserver.so:net/libvncserver
>   VNC_USES=		jpeg
> -VNC_CMAKE_BOOL=		WITH_LIBVNCSERVER
> +VNC_CMAKE_BOOL=		WITH_GVNC
>   
>   WWW_LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz \
>   			libsoup-2.4.so:devel/libsoup \
> @@ -127,21 +128,9 @@ ZSH_VARS=		SH_BIN=${PREFIX}/bin/zsh
>   
>   bash_CMD=		${SH_BIN}
>   
> -post-patch:
> -	${REINPLACE_CMD} -e 's,FreeBSD,FreeBSD|DragonFly,' \
> -		${WRKSRC}/CMakeLists.txt
> -	${RM} ${WRKSRC}/cmake/FindFREERDP3.cmake
> -
> -post-patch-EXEC-off:
> -	${REINPLACE_CMD} -e '/add_subdirectory(exec)/d' ${WRKSRC}/plugins/CMakeLists.txt
> -
>   post-patch-GCRYPT-off:
>   	${REINPLACE_CMD} -e '/find_suggested_package(GCRYPT)/d' ${WRKSRC}/CMakeLists.txt
>   
> -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-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
> diff --git a/net/remmina/distinfo b/net/remmina/distinfo
> index e315986742d0..503c2ae45fde 100644
> --- a/net/remmina/distinfo
> +++ b/net/remmina/distinfo
> @@ -1,5 +1,5 @@
> -TIMESTAMP = 1697992944
> -SHA256 (Remmina-Remmina-2c4e1479433e51418ecb6089f35182bfebc5b57e_GL0.tar.gz) = 9c089a090a910d0ed727b440a04f1304617773594be4538438c47e879ed90d54
> -SIZE (Remmina-Remmina-2c4e1479433e51418ecb6089f35182bfebc5b57e_GL0.tar.gz) = 3693487
> +TIMESTAMP = 1708879478
> +SHA256 (Remmina-Remmina-2a455eadd6462457d08c2d066c5c245e0dee3bf9_GL0.tar.gz) = e96d99c51e117eb199299c985befd88dcf28c4ea9f623418597f8beaab303b38
> +SIZE (Remmina-Remmina-2a455eadd6462457d08c2d066c5c245e0dee3bf9_GL0.tar.gz) = 3772950
>   SHA256 (dbd6f94974c4d7df313963ffefecb1ff8ca9ecb6.patch) = 5c3c7d501f69f1412614dd8229d517d5f33ad175886edfefabfd5e725f91fb2a
>   SIZE (dbd6f94974c4d7df313963ffefecb1ff8ca9ecb6.patch) = 2104
> diff --git a/net/remmina/files/patch-CMakeLists.txt b/net/remmina/files/patch-CMakeLists.txt
> new file mode 100644
> index 000000000000..128a09857d2e
> --- /dev/null
> +++ b/net/remmina/files/patch-CMakeLists.txt
> @@ -0,0 +1,18 @@
> +--- CMakeLists.txt.orig	2024-02-26 08:35:18 UTC
> ++++ CMakeLists.txt
> +@@ -285,10 +285,13 @@ include_directories(src/include)
> + include_directories(.)
> + include_directories(src/include)
> +
> +-# FreeBSD
> ++# FreeBSD|DragonFly
> +
> +-if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
> ++if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD|DragonFly")
> +   set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-rdynamic")
> ++  list(APPEND CMAKE_PREFIX_PATH /usr/local/share/cmake/Modules/FreeRDP2)
> ++  list(APPEND CMAKE_PREFIX_PATH /usr/local/share/cmake/Modules/FreeRDP-Client2)
> ++  list(APPEND CMAKE_PREFIX_PATH /usr/local/share/cmake/Modules/WinPR2)
> +   include_directories(/usr/local/include /usr/include)
> +   link_directories(/usr/local/lib /usr/lib)
> +   set(CMAKE_REQUIRED_INCLUDES /usr/local/include)
> diff --git a/net/remmina/pkg-plist b/net/remmina/pkg-plist
> index cce3aa4ce53c..1a140f8e6c65 100644
> --- a/net/remmina/pkg-plist
> +++ b/net/remmina/pkg-plist
> @@ -4,6 +4,7 @@ include/remmina/plugin.h
>   include/remmina/remmina_trace_calls.h
>   include/remmina/types.h
>   %%EXEC%%lib/remmina/plugins/remmina-plugin-exec.so
> +%%GVNC%%lib/remmina/plugins/remmina-plugin-gvnc.so
>   %%KWALLET%%lib/remmina/plugins/remmina-plugin-kwallet.so
>   %%RDP%%lib/remmina/plugins/remmina-plugin-rdp.so
>   %%SECRET%%lib/remmina/plugins/remmina-plugin-secret.so
> @@ -63,8 +64,9 @@ share/icons/hicolor/scalable/emblems/org.remmina.Remmina-sftp-symbolic.svg
>   share/icons/hicolor/scalable/emblems/org.remmina.Remmina-ssh-symbolic.svg
>   share/mime/packages/org.remmina.Remmina-mime.xml
>   %%EXEC%%share/icons/hicolor/scalable/emblems/org.remmina.Remmina-tool-symbolic.svg
> -%%RDP%%share/icons/hicolor/scalable/emblems/org.remmina.Remmina-rdp-symbolic.svg
> +%%GVNC%%share/icons/hicolor/scalable/emblems/org.remmina.Remmina-gvnc-symbolic.svg
>   %%RDP%%share/icons/hicolor/scalable/emblems/org.remmina.Remmina-rdp-ssh-symbolic.svg
> +%%RDP%%share/icons/hicolor/scalable/emblems/org.remmina.Remmina-rdp-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
> @@ -72,6 +74,7 @@ share/mime/packages/org.remmina.Remmina-mime.xml
>   %%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/be/LC_MESSAGES/remmina.mo
>   %%NLS%%share/locale/ber/LC_MESSAGES/remmina.mo
>   %%NLS%%share/locale/bg/LC_MESSAGES/remmina.mo
>   %%NLS%%share/locale/bn/LC_MESSAGES/remmina.mo

Hello!

pkg-static: Unable to access file 
/tmp/work/usr/ports/net/remmina/work-default/stage/usr/local/lib/remmina/plugins/remmina-plugin-gvnc.so:No 
such file or directory
pkg-static: Unable to access file 
/tmp/work/usr/ports/net/remmina/work-default/stage/usr/local/share/icons/hicolor/scalable/emblems/org.remmina.Remmina-gvnc-symbolic.svg:No 
such file or directory

OPTIONS_FILE_UNSET+=AVAHI
OPTIONS_FILE_SET+=CUPS
OPTIONS_FILE_SET+=GCRYPT
OPTIONS_FILE_SET+=GVNC
OPTIONS_FILE_SET+=NLS
OPTIONS_FILE_UNSET+=PYTHON
OPTIONS_FILE_SET+=SSH
OPTIONS_FILE_SET+=TERM
OPTIONS_FILE_SET+=BASH
OPTIONS_FILE_UNSET+=ZSH
OPTIONS_FILE_SET+=EXEC
OPTIONS_FILE_SET+=GVNC
OPTIONS_FILE_UNSET+=KWALLET
OPTIONS_FILE_SET+=RDP
OPTIONS_FILE_UNSET+=SECRET
OPTIONS_FILE_SET+=SPICE
OPTIONS_FILE_SET+=VNC
OPTIONS_FILE_SET+=WWW

Port have 2 options with same name GVNC.

-- 
Best regards,
Vladimir Druzenko