Fixup patch error.

epel9
Phil Wyett 3 years ago
parent d84caf8165
commit 9e43e7c2f2

@ -1,17 +1,5 @@
From eb3d59fbc42ee5e0ee29ee194980b06e49eaed7e Mon Sep 17 00:00:00 2001
From: "Antenore Gatta (tmow)" <antenore@simbiosi.org>
Date: Wed, 1 Jun 2022 12:31:23 +0200
Subject: [PATCH] Fix #2739 - Send clipboard as keystrokes
---
src/rcw.c | 8 ++++++++
src/remmina_protocol_widget.c | 9 +++++++--
src/remmina_public.c | 3 ++-
src/remmina_ssh.c | 2 +-
4 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/rcw.c b/src/rcw.c
index d4093d3b4..27eb3bad1 100644
index d4093d3b4d91142290015adde0c8dece083d8fcd..27eb3bad1b7a4f4fa49639bd5040d12bea0c138c 100644
--- a/src/rcw.c
+++ b/src/rcw.c
@@ -2060,6 +2060,14 @@ static void rcw_toolbar_tools(GtkToolItem *toggle, RemminaConnectionWindow *cnnw
@ -30,7 +18,7 @@ index d4093d3b4..27eb3bad1 100644
g_signal_connect_swapped(G_OBJECT(menuitem), "activate",
G_CALLBACK(remmina_protocol_widget_send_clipboard),
diff --git a/src/remmina_protocol_widget.c b/src/remmina_protocol_widget.c
index 1c590b0fc..e4adfd2a6 100644
index 1c590b0fceaef6b024eb37d4d8ba2c9391b9976c..e4adfd2a6bc28b2d23ed5a17ae9c964fc141f139 100644
--- a/src/remmina_protocol_widget.c
+++ b/src/remmina_protocol_widget.c
@@ -597,7 +597,7 @@ void remmina_protocol_widget_send_clip_strokes(GtkClipboard *clipboard, const gc
@ -83,7 +71,7 @@ index 1c590b0fc..e4adfd2a6 100644
}
}
diff --git a/src/remmina_public.c b/src/remmina_public.c
index 02ff5c7d9..5c5c4640d 100644
index 02ff5c7d997e132598583fe415149856fee90111..5c5c4640df669705be008db0e3103329d5e6092c 100644
--- a/src/remmina_public.c
+++ b/src/remmina_public.c
@@ -541,7 +541,8 @@ guint16 remmina_public_get_keycode_for_keyval(GdkKeymap *keymap, guint keyval)
@ -96,19 +84,3 @@ index 02ff5c7d9..5c5c4640d 100644
#ifdef GDK_WINDOWING_X11
return gdk_x11_keymap_key_is_modifier(keymap, keycode);
#else
diff --git a/src/remmina_ssh.c b/src/remmina_ssh.c
index 92e7a3e80..fee610fcd 100644
--- a/src/remmina_ssh.c
+++ b/src/remmina_ssh.c
@@ -497,7 +497,7 @@ remimna_ssh_cp_to_ch_cb(int fd, int revents, void *userdata)
sz = read(fd, buf, sizeof(buf));
if (sz > 0) {
ret = ssh_channel_write(channel, buf, sz);
- REMMINA_DEBUG("ssh_channel_write ret: %d sz: %d", ret, sz);
+ //TODO: too verbose REMMINA_DEBUG("ssh_channel_write ret: %d sz: %d", ret, sz);
} else if (sz < 0) {
// TODO: too verbose REMMINA_WARNING("fd bytes read: %d", sz);
return -1;
--
GitLab

@ -19,7 +19,7 @@ Source0: https://gitlab.com/Remmina/Remmina/-/archive/v%{version}/Remmina-%{vers
Source1: pluginBuild-CMakeLists.txt
# Patches.
Patch0: 0001_paste_as_keystrokes_fix_git_eb3d59fb.patch
Patch0: 0001_paste_as_keystrokes_fix_git_partial_eb3d59fb.patch
BuildRequires: cmake
BuildRequires: cups-devel
@ -344,7 +344,7 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*.appdat
%changelog
* Mon Jun 06 2022 Phil Wyett <philip.wyett@kathenas.org> - 1.4.26-3
- Add patch: 0001_paste_as_keystrokes_fix_git_eb3d59fb.patch
- Add patch: 0001_paste_as_keystrokes_fix_git_partial_eb3d59fb.patch
- Add libssh BuildRequires minimum required version of 0.8.0.
- Remove EL7 build support due to new libssh minimum required version.
- Remove telepathy plugin activation switch as no longer required.

Loading…
Cancel
Save