From 7d65b0e4301f0565cf7d04a63746d68b57ae6598 Mon Sep 17 00:00:00 2001 From: Victor Toso Date: Sat, 7 Mar 2020 08:47:35 +0100 Subject: [PATCH] Update to 0.14.1 release --- ...e-VD_AGENT_CAP_CLIPBOARD_NO_RELEASE_.patch | 34 ---------- ...e-VD_AGENT_CAP_CLIPBOARD_GRAB_SERIAL.patch | 68 ------------------- sources | 2 +- spice-protocol.spec | 17 ++--- 4 files changed, 6 insertions(+), 115 deletions(-) delete mode 100644 0002-vdagent-introduce-VD_AGENT_CAP_CLIPBOARD_NO_RELEASE_.patch delete mode 100644 0003-vdagent-introduce-VD_AGENT_CAP_CLIPBOARD_GRAB_SERIAL.patch diff --git a/0002-vdagent-introduce-VD_AGENT_CAP_CLIPBOARD_NO_RELEASE_.patch b/0002-vdagent-introduce-VD_AGENT_CAP_CLIPBOARD_NO_RELEASE_.patch deleted file mode 100644 index 3d3bd0f..0000000 --- a/0002-vdagent-introduce-VD_AGENT_CAP_CLIPBOARD_NO_RELEASE_.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 41973d6df464db0d128ba2d272c305143d73f57a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= -Date: Fri, 22 Mar 2019 14:56:47 +0100 -Subject: [PATCH 2/3] vdagent: introduce - VD_AGENT_CAP_CLIPBOARD_NO_RELEASE_ON_REGRAB -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This capability means the peer will not send a release event between -two subsequent grabs. This helps with interaction issues with -clipboard managers which can be worked around by time-based filters at -this point. With this capability, there is no need for such filter. - -Signed-off-by: Marc-André Lureau ---- - spice/vd_agent.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/spice/vd_agent.h b/spice/vd_agent.h -index e4e00a8..ad61339 100644 ---- a/spice/vd_agent.h -+++ b/spice/vd_agent.h -@@ -309,6 +309,7 @@ enum { - VD_AGENT_CAP_FILE_XFER_DISABLED, - VD_AGENT_CAP_FILE_XFER_DETAILED_ERRORS, - VD_AGENT_CAP_GRAPHICS_DEVICE_INFO, -+ VD_AGENT_CAP_CLIPBOARD_NO_RELEASE_ON_REGRAB, - VD_AGENT_END_CAP, - }; - --- -2.23.0 - diff --git a/0003-vdagent-introduce-VD_AGENT_CAP_CLIPBOARD_GRAB_SERIAL.patch b/0003-vdagent-introduce-VD_AGENT_CAP_CLIPBOARD_GRAB_SERIAL.patch deleted file mode 100644 index e74ea92..0000000 --- a/0003-vdagent-introduce-VD_AGENT_CAP_CLIPBOARD_GRAB_SERIAL.patch +++ /dev/null @@ -1,68 +0,0 @@ -From e8a2b9ec5a0ed46a06c9e28a0099b2a2516f710e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= -Date: Fri, 22 Mar 2019 14:56:48 +0100 -Subject: [PATCH 3/3] vdagent: introduce VD_AGENT_CAP_CLIPBOARD_GRAB_SERIAL -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When this capability is negoticated by both the client & the agent, -the clipboard grab messages have an associated serial counter. - -The serial is reset to 0 upon client connection. - -The counter is increment by 1 on each grab message, by both sides. - -The sender of the message with the highest serial should be the -clipboard grab owner, and the current session serial should be -updated. - -If a lower serial than the current session serial is received, the -grab should be discarded. - -Whenever two grabs share the same serial, the one coming from the -client should have a higher priority and the client should gain the -clipboard ownership. - -No special treatement is done for the unlikely case of overflowing the -counter. It may temporarily inverse the priority, until both side have -overflown and/or synchronized. - -Note: this mechanism isn't aiming at making "the most recent" (as in -time) side gaining the ownership. One side sending subsequent grab -messages earlier will likely take the ownership over a side sending a -single message simultaneously the other way. It only clears the -situation where both side believe that the other is the current -clipboard owner, by having a global ordering and priority in case of -serial conflict. - -Signed-off-by: Marc-André Lureau ---- - spice/vd_agent.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/spice/vd_agent.h b/spice/vd_agent.h -index ad61339..07673d7 100644 ---- a/spice/vd_agent.h -+++ b/spice/vd_agent.h -@@ -237,6 +237,9 @@ typedef struct SPICE_ATTR_PACKED VDAgentClipboardGrab { - #if 0 /* VD_AGENT_CAP_CLIPBOARD_SELECTION */ - uint8_t selection; - uint8_t __reserved[sizeof(uint32_t) - 1 * sizeof(uint8_t)]; -+#endif -+#if 0 /* VD_AGENT_CAP_CLIPBOARD_GRAB_SERIAL */ -+ uint32_t serial; - #endif - uint32_t types[0]; - } VDAgentClipboardGrab; -@@ -310,6 +313,7 @@ enum { - VD_AGENT_CAP_FILE_XFER_DETAILED_ERRORS, - VD_AGENT_CAP_GRAPHICS_DEVICE_INFO, - VD_AGENT_CAP_CLIPBOARD_NO_RELEASE_ON_REGRAB, -+ VD_AGENT_CAP_CLIPBOARD_GRAB_SERIAL, - VD_AGENT_END_CAP, - }; - --- -2.23.0 - diff --git a/sources b/sources index 444b455..ef0c201 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (spice-protocol-0.14.0.tar.bz2) = 797df5f529731e9fd395b5946af2490ecf02c26982cc4a0aef24c1766887a35222f68525a996f8bc7459c2c4a25fde0c9a10c489ee6cab6eed7a68a9b5d90f76 +SHA512 (spice-protocol-0.14.1.tar.bz2) = 88b0e652564a1f826ee6d3c165ab05c40d13f366567db3840805f03d433d13d7f722225219c26759770d2cde33221fe6d97528521d0eb14bc069cd7ce9af8482 diff --git a/spice-protocol.spec b/spice-protocol.spec index 96592ac..162c037 100644 --- a/spice-protocol.spec +++ b/spice-protocol.spec @@ -1,22 +1,12 @@ Name: spice-protocol -Version: 0.14.0 -Release: 4%{?dist} +Version: 0.14.1 +Release: 1%{?dist} Summary: Spice protocol header files # Main headers are BSD, controller / foreign menu are LGPL License: BSD and LGPLv2+ URL: http://www.spice-space.org/ Source0: http://www.spice-space.org/download/releases/%{name}-%{version}.tar.bz2 BuildArch: noarch -# clipboard-race patches: together with patches for vdagent -# and spice-gtk these fix problems interacting with mutter's new -# clipboard manager -# https://bugzilla.redhat.com/show_bug.cgi?id=1755038 -# all rebased by Jakub Janků: -# https://github.com/jjanku/spice-protocol/tree/clipboard-race -# https://patchwork.freedesktop.org/patch/293583/ -Patch0: 0002-vdagent-introduce-VD_AGENT_CAP_CLIPBOARD_NO_RELEASE_.patch -# https://patchwork.freedesktop.org/patch/293584/ -Patch1: 0003-vdagent-introduce-VD_AGENT_CAP_CLIPBOARD_GRAB_SERIAL.patch %description Header files describing the spice protocol @@ -41,6 +31,9 @@ make DESTDIR=%{buildroot} install %changelog +* Sat Mar 7 2020 Victor Toso - 0.14.1-1 +- Update to 0.14.1 release + * Fri Jan 31 2020 Fedora Release Engineering - 0.14.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild