Backport fix for guest/host copy&paste issues in Boxes

This fixes https://bugs.freedesktop.org/show_bug.cgi?id=101353

2 files changed, 84 insertions, 1 deletions

diff --git a/gtk3-wayland-emit-GDK_SELECTION_CLEAR-on-owner-changes.patch b/gtk3-wayland-emit-GDK_SELECTION_CLEAR-on-owner-changes.patch
new file mode 100644
index 0000000..60eebcd
--- /dev/null
+++ b/gtk3-wayland-emit-GDK_SELECTION_CLEAR-on-owner-changes.patch
@@ -0,0 +1,76 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Christophe Fergeau <cfergeau@redhat.com>
+Date: Tue, 28 Nov 2017 17:44:06 +0100
+Subject: [PATCH] wayland: emit GDK_SELECTION_CLEAR on owner changes
+
+The wayland backend currently never emits GDK_SELECTION_CLEAR events.
+GtkClipboard uses this signal in order to clear the clipboard owner when
+the selection is set to something outside the application.
+This commit ensures the wayland backend emits GDK_SELECTION_CLEAR before
+setting the clipboard owner to NULL, as this means we lost the
+selection.
+
+Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
+
+https://bugzilla.gnome.org/show_bug.cgi?id=790031
+---
+ gdk/wayland/gdkselection-wayland.c | 25 +++++++++++++++++++++++++
+ 1 file changed, 25 insertions(+)
+
+diff --git a/gdk/wayland/gdkselection-wayland.c b/gdk/wayland/gdkselection-wayland.c
+index 0012febd9e..008778292a 100644
+--- a/gdk/wayland/gdkselection-wayland.c
++++ b/gdk/wayland/gdkselection-wayland.c
+@@ -113,6 +113,7 @@ struct _GdkWaylandSelection
+ 
+ static void selection_buffer_read (SelectionBuffer *buffer);
+ static void async_write_data_write (AsyncWriteData *write_data);
++static void emit_selection_clear (GdkDisplay *display, GdkAtom selection);
+ 
+ static void
+ selection_buffer_notify (SelectionBuffer *buffer)
+@@ -921,6 +922,7 @@ data_source_cancelled (void                  *data,
+   if (context)
+     gdk_drag_context_cancel (context, GDK_DRAG_CANCEL_ERROR);
+ 
++  emit_selection_clear (display, atom);
+   gdk_selection_owner_set (NULL, atom, GDK_CURRENT_TIME, TRUE);
+   gdk_wayland_selection_unset_data_source (display, atom);
+ }
+@@ -1031,6 +1033,7 @@ primary_source_cancelled (void                                *data,
+   display = gdk_display_get_default ();
+ 
+   atom = atoms[ATOM_PRIMARY];
++  emit_selection_clear (display, atom);
+   gdk_selection_owner_set (NULL, atom, GDK_CURRENT_TIME, TRUE);
+   gdk_wayland_selection_unset_data_source (display, atom);
+ }
+@@ -1272,6 +1275,28 @@ emit_empty_selection_notify (GdkWindow *requestor,
+   gdk_event_free (event);
+ }
+ 
++static void
++emit_selection_clear (GdkDisplay *display,
++                      GdkAtom     selection)
++{
++  GdkEvent *event;
++  GdkWindow *window;
++
++  event = gdk_event_new (GDK_SELECTION_CLEAR);
++  event->selection.selection = selection;
++  event->selection.time = GDK_CURRENT_TIME;
++
++  window = _gdk_wayland_display_get_selection_owner (display, selection);
++  if (window != NULL)
++    {
++      event->selection.window = g_object_ref (window);
++      event->selection.requestor = g_object_ref (window);
++    }
++
++  gdk_event_put (event);
++  gdk_event_free (event);
++}
++
+ void
+ _gdk_wayland_display_convert_selection (GdkDisplay *display,
+                                         GdkWindow  *requestor,
diff --git a/gtk3.spec b/gtk3.spec
index 20de7ae..4d1883b 100644
--- a/gtk3.spec
+++ b/gtk3.spec
@@ -22,13 +22,16 @@
 
 Name: gtk3
 Version: 3.22.26
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: GTK+ graphical user interface library
 
 License: LGPLv2+
 URL: http://www.gtk.org
 Source0: http://download.gnome.org/sources/gtk+/3.22/gtk+-%{version}.tar.xz
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=790031
+Patch0: gtk3-wayland-emit-GDK_SELECTION_CLEAR-on-owner-changes.patch
+
 BuildRequires: pkgconfig(atk) >= %{atk_version}
 BuildRequires: pkgconfig(atk-bridge-2.0)
 BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
@@ -167,6 +170,7 @@ the functionality of the installed %{name} package.
 
 %prep
 %setup -q -n gtk+-%{version}
+%patch0 -p1
 
 %build
 export CFLAGS='-fno-strict-aliasing %optflags'
@@ -340,6 +344,9 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache &>/dev/null || :
 %{_datadir}/installed-tests
 
 %changelog
+* Wed Nov 29 2017 Christophe Fergeau <cfergeau@redhat.com> - 3.22.26-2
+- Backport fix for guest/host copy&paste issues in Boxes (Freedesktop #101353)
+
 * Tue Nov 07 2017 Kalev Lember <klember@redhat.com> - 3.22.26-1
 - Update to 3.22.26