From nobody Wed Feb 28 07:33:21 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tl5gP4t06z5Cqrk; Wed, 28 Feb 2024 07:33:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tl5gP3zTzz457W; Wed, 28 Feb 2024 07:33:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709105601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yKBXps+Pr0WfMtl3cI6ClZq06g73SUZegAajIKEhpJ0=; b=kwyHz7FavjJ94jrCJFynyfNZqL4XxiZWi8CujrBM4kZlvAOAsmGqG76djxVJY9x0QTdjlR 05uBhADPb88zt5DKV/W1R7JAYPxX1wLUWRe97sBQgNPfB4V8jngEYobalq/0sbL7HKYdJY RV3HCfh8rzKRaJ9h+lqTFHQdNXvUdjltUs4791lUluawynzdPeiByDxrvKidNUQZAuu79q KgLjqs2WvKizgxedornW8NN2sjmaUe13mqVOAHgJcF8fsHIrun8EG1Cz2zg+hNtVEX79Gg T5HUcMho0kf9+xW+UzKVUPGSyK1+aZE9Ol95O4Ieg+3pNF0agPaJ4towoaIQKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709105601; a=rsa-sha256; cv=none; b=ZxzZh2kvL9eHpttzmeEy2HFgft9/zIBWWzi62CPG1/ttInHzYus3YjndZd9q6SWWypMkpd 5WXi5nIFzJCr3Ob2yxEuoOTpd/yvxVAj3Ps4qYK4+kTyc4s0wS/iubPlwS/NEIjChQt/dG /BvK3JeEYOh0c4sK0+APRYiiXxd+TcOn3eNNMBFk/SER4PsR7T3SDIEcYV5t7TaZnPW2XK dCcnkSn2o715BPGmfYDbjZTmmv4TgvsrBVIWcK5NBgiuPMBdtRPQw6KrjihUrZvvsBDezC sFRl8eabm1YMoFrWdFhhJ0OO8qF9J5AHJWlzZy6qHEw9pC7fnbKpmh4iZf4WXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709105601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yKBXps+Pr0WfMtl3cI6ClZq06g73SUZegAajIKEhpJ0=; b=WzoiKQeTnFX/BPQLrBG3YpK+42QCrYrOhJEan1R38Mbekwzi2JRRvZ0szrWmpcehBKog1V HsoDRqocngpnVFUF3vMxJ+tEcjdQWd/XslUEqk8NaunO0biWbTHZ6noow6k/dakQGg3ZR8 qbt1CVes/oZ2UHZHWXmcdd1gPTX6W+9gd+bt7qxZRACkA81aopeYEjo9t+TfQIKofr48kt hObgM7eo6FlJ+WxR6hqikHoRbb3Y/HKUQ7HQgVmELO5yohbRZ2KK5Hga8c7pRnkmpFLwZM zbQm2Ap06Pyn6vuTrnBCLM/1O9GnJHLWLFY/gulQoKoZBQMWpn9SJOcXU49Pow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tl5gP2b2rzpG1; Wed, 28 Feb 2024 07:33:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41S7XL2R089261; Wed, 28 Feb 2024 07:33:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41S7XLWd089258; Wed, 28 Feb 2024 07:33:21 GMT (envelope-from git) Date: Wed, 28 Feb 2024 07:33:21 GMT Message-Id: <202402280733.41S7XLWd089258@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Fernando =?utf-8?Q?Apestegu=C3=ADa?= Subject: git: ea013863fcd8 - main - net/remmina: update to 1.4.35 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ea013863fcd8921b8dccc9fbac57b08d26bac102 Auto-Submitted: auto-generated The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=ea013863fcd8921b8dccc9fbac57b08d26bac102 commit ea013863fcd8921b8dccc9fbac57b08d26bac102 Author: Fernando Apesteguía AuthorDate: 2024-02-24 17:03:48 +0000 Commit: Fernando Apesteguía 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