commit: 7b7b08a26f6128f5467e26715a4ae074caaadb01 Author: Branko Grubic <bitlord0xff <AT> gmail <DOT> com> AuthorDate: Thu Sep 28 16:52:10 2023 +0000 Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org> CommitDate: Mon Oct 2 14:47:57 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b7b08a2
net-misc/remmina: Fixes build with USE="-ssh" Bug: https://gitlab.com/Remmina/Remmina/-/issues/2981 Bug: https://bugs.gentoo.org/914851 Signed-off-by: Branko Grubic <bitlord0xff <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/33106 Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org> .../remmina/files/remmina-1.4.32-REM-2981.patch | 54 ++++++++++++++++++++++ net-misc/remmina/remmina-1.4.32.ebuild | 1 + 2 files changed, 55 insertions(+) diff --git a/net-misc/remmina/files/remmina-1.4.32-REM-2981.patch b/net-misc/remmina/files/remmina-1.4.32-REM-2981.patch new file mode 100644 index 000000000000..5725349b2cae --- /dev/null +++ b/net-misc/remmina/files/remmina-1.4.32-REM-2981.patch @@ -0,0 +1,54 @@ +From dbd6f94974c4d7df313963ffefecb1ff8ca9ecb6 Mon Sep 17 00:00:00 2001 +From: myheroyuki <myheroy...@outlook.com> +Date: Sun, 24 Sep 2023 23:15:58 +0900 +Subject: [PATCH] [REM-2981] Move ssh-unrelated code outside of HAVE_LIBSSH + ifdef + +--- + src/remmina_file_editor.c | 23 ++++++++++++----------- + 1 file changed, 12 insertions(+), 11 deletions(-) + +diff --git a/src/remmina_file_editor.c b/src/remmina_file_editor.c +index feee4a031..1c1fa9858 100644 +--- a/src/remmina_file_editor.c ++++ b/src/remmina_file_editor.c +@@ -361,17 +361,6 @@ static GtkWidget *remmina_file_editor_create_notebook_tab(RemminaFileEditor *gfe + return grid; + } + +-#ifdef HAVE_LIBSSH +- +-static void remmina_file_editor_ssh_tunnel_server_custom_radio_on_toggled(GtkToggleButton *togglebutton, RemminaFileEditor *gfe) +-{ +- TRACE_CALL(__func__); +- gtk_widget_set_sensitive(GTK_WIDGET(gfe->priv->ssh_tunnel_server_entry), +- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gfe->priv->ssh_tunnel_enabled_check)) && +- (gfe->priv->ssh_tunnel_server_custom_radio == NULL || +- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gfe->priv->ssh_tunnel_server_custom_radio)))); +-} +- + + static void remmina_file_editor_assistance_enabled_check_on_toggled(GtkToggleButton *togglebutton, + RemminaFileEditor *gfe) +@@ -392,6 +381,18 @@ static void remmina_file_editor_assistance_enabled_check_on_toggled(GtkToggleBut + } + } + ++#ifdef HAVE_LIBSSH ++ ++static void remmina_file_editor_ssh_tunnel_server_custom_radio_on_toggled(GtkToggleButton *togglebutton, RemminaFileEditor *gfe) ++{ ++ TRACE_CALL(__func__); ++ gtk_widget_set_sensitive(GTK_WIDGET(gfe->priv->ssh_tunnel_server_entry), ++ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gfe->priv->ssh_tunnel_enabled_check)) && ++ (gfe->priv->ssh_tunnel_server_custom_radio == NULL || ++ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gfe->priv->ssh_tunnel_server_custom_radio)))); ++} ++ ++ + static void remmina_file_editor_ssh_tunnel_enabled_check_on_toggled(GtkToggleButton *togglebutton, + RemminaFileEditor *gfe, RemminaProtocolSSHSetting ssh_setting) + { +-- +2.42.0 + diff --git a/net-misc/remmina/remmina-1.4.32.ebuild b/net-misc/remmina/remmina-1.4.32.ebuild index 86fae2ec9b89..772019a15889 100644 --- a/net-misc/remmina/remmina-1.4.32.ebuild +++ b/net-misc/remmina/remmina-1.4.32.ebuild @@ -71,6 +71,7 @@ pkg_setup() { } src_prepare() { + PATCHES+=( ${FILESDIR}/${P}-REM-2981.patch ) #914851 xdg_environment_reset cmake_src_prepare }
