r52516 - in /desktop/unstable/mutter/debian: changelog patches/bgo782472_fix_copypaste_x11_wayland.patch patches/series

[bigon at users.alioth.debian.org]

Author: bigon
Date: Fri Jun 30 16:57:14 2017
New Revision: 52516

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52516
Log:
debian/patches/bgo782472_fix_copypaste_x11_wayland.patch: Fix copy/paste
between some X11 applications (firefox/chromium) and wayland (Closes:
#865788)

Added:
    desktop/unstable/mutter/debian/patches/bgo782472_fix_copypaste_x11_wayland.patch
Modified:
    desktop/unstable/mutter/debian/changelog
    desktop/unstable/mutter/debian/patches/series

Modified: desktop/unstable/mutter/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/changelog?rev=52516&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/changelog	[utf-8] (original)
+++ desktop/unstable/mutter/debian/changelog	[utf-8] Fri Jun 30 16:57:14 2017
@@ -1,8 +1,14 @@
 mutter (3.22.4-2) UNRELEASED; urgency=medium
 
+  [ Jeremy Bicha ]
   * Add missing depends on gnome-settings-daemon (LP: #1561706)
 
- -- Jeremy Bicha <jbicha at ubuntu.com>  Sat, 06 May 2017 08:52:03 -0400
+  [ Laurent Bigonville ]
+  * debian/patches/bgo782472_fix_copypaste_x11_wayland.patch: Fix copy/paste
+    between some X11 applications (firefox/chromium) and wayland (Closes:
+    #865788)
+
+ -- Laurent Bigonville <bigon at debian.org>  Fri, 30 Jun 2017 18:52:07 +0200
 
 mutter (3.22.4-1) unstable; urgency=medium
 

Added: desktop/unstable/mutter/debian/patches/bgo782472_fix_copypaste_x11_wayland.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/patches/bgo782472_fix_copypaste_x11_wayland.patch?rev=52516&op=file
==============================================================================
--- desktop/unstable/mutter/debian/patches/bgo782472_fix_copypaste_x11_wayland.patch	(added)
+++ desktop/unstable/mutter/debian/patches/bgo782472_fix_copypaste_x11_wayland.patch	[utf-8] Fri Jun 30 16:57:14 2017
@@ -0,0 +1,32 @@
+From 19f08fbdbba113883c6011e4b8ccf3ea3a6eb57e Mon Sep 17 00:00:00 2001
+From: Carlos Garnacho <carlosg at gnome.org>
+Date: Wed, 10 May 2017 20:28:42 +0200
+Subject: xwayland: Use the right atom type for further selection requests to
+ X11
+
+If we translate between text/plain;charset-utf-8 from the wayland side to
+UTF8_STRING on the X11 side, we want to continue all further X11 selection
+requests using the same translated UTF8_STRING atom than we use in the
+first XConvertSelection call.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=782472
+---
+ src/wayland/meta-xwayland-selection.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/wayland/meta-xwayland-selection.c b/src/wayland/meta-xwayland-selection.c
+index a78e846..24b8cd2 100644
+--- a/src/wayland/meta-xwayland-selection.c
++++ b/src/wayland/meta-xwayland-selection.c
+@@ -829,7 +829,7 @@ meta_x11_source_send (MetaWaylandDataSource *source,
+   /* Takes ownership of fd */
+   selection->x11_selection =
+     x11_selection_data_new (compositor->xwayland_manager.selection_data,
+-                            fd, mime_type);
++                            fd, gdk_x11_get_xatom_name (type_atom));
+ 
+   XConvertSelection (xdisplay,
+                      selection->selection_atom, type_atom,
+-- 
+cgit v0.12
+

Modified: desktop/unstable/mutter/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/patches/series?rev=52516&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/mutter/debian/patches/series	[utf-8] Fri Jun 30 16:57:14 2017
@@ -1 +1,2 @@
 bgo768531_workaround-startup-notifications.patch
+bgo782472_fix_copypaste_x11_wayland.patch