r51882 - in /desktop/unstable/mutter/debian: changelog patches/bgo768531_workaround-startup-notifications.patch patches/series

[ah at users.alioth.debian.org]

Author: ah
Date: Sun Jan  8 02:27:53 2017
New Revision: 51882

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=51882
Log:
* Add debian/patches/bgo768531_workaround-startup-notifications.patch
  - temporary workaround used in both Fedora and Arch for getting
    working application startup notifications under Wayland.
  - See bgo#768531 for when a real solution is ready to replace this.

Added:
    desktop/unstable/mutter/debian/patches/bgo768531_workaround-startup-notifications.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=51882&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/changelog	[utf-8] (original)
+++ desktop/unstable/mutter/debian/changelog	[utf-8] Sun Jan  8 02:27:53 2017
@@ -1,10 +1,17 @@
-mutter (3.22.2-3) UNRELEASED; urgency=medium
-
+mutter (3.22.2-3) unstable; urgency=medium
+
+  [ Jeremy Bicha ]
   * Add git_flush_all_swap_notifies_on_idle.patch:
     - Add patch from 3.22 branch that fixes freezes with multiple monitors
       on Wayland
 
- -- Jeremy Bicha <jbicha at ubuntu.com>  Tue, 20 Dec 2016 08:59:06 -0500
+  [ Andreas Henriksson ]
+  * Add debian/patches/bgo768531_workaround-startup-notifications.patch
+    - temporary workaround used in both Fedora and Arch for getting
+      working application startup notifications under Wayland.
+    - See bgo#768531 for when a real solution is ready to replace this.
+
+ -- Andreas Henriksson <andreas at fatal.se>  Sun, 08 Jan 2017 03:12:13 +0100
 
 mutter (3.22.2-2) unstable; urgency=critical
 

Added: desktop/unstable/mutter/debian/patches/bgo768531_workaround-startup-notifications.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/patches/bgo768531_workaround-startup-notifications.patch?rev=51882&op=file
==============================================================================
--- desktop/unstable/mutter/debian/patches/bgo768531_workaround-startup-notifications.patch	(added)
+++ desktop/unstable/mutter/debian/patches/bgo768531_workaround-startup-notifications.patch	[utf-8] Sun Jan  8 02:27:53 2017
@@ -0,0 +1,45 @@
+From 4ed430b4ef3013c96fa56cdc57b925b42d20ead9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner at gnome.org>
+Date: Thu, 20 Oct 2016 18:00:04 +0200
+Subject: [PATCH] gtk-shell: Work around non-working startup notifications
+
+GNOME Shell relies on the MetaScreen::startup-sequence-changed signal,
+which is tied to (lib)startup-notification and therefore X11. As a result,
+when we remove the startup sequence of a wayland client, GNOME Shell will
+not be notified about this until startup-notification's timeout is hit.
+As a temporary stop-gap, go through XWayland even for wayland clients,
+so that the signal is emitted when expected.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=768531
+---
+ src/wayland/meta-wayland-gtk-shell.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/src/wayland/meta-wayland-gtk-shell.c b/src/wayland/meta-wayland-gtk-shell.c
+index d6e249f..9d1a19e 100644
+--- a/src/wayland/meta-wayland-gtk-shell.c
++++ b/src/wayland/meta-wayland-gtk-shell.c
+@@ -219,11 +219,21 @@ gtk_shell_set_startup_id (struct wl_client   *client,
+                           struct wl_resource *resource,
+                           const char         *startup_id)
+ {
++#if 0
+   MetaDisplay *display;
+ 
+   display = meta_get_display ();
+   meta_startup_notification_remove_sequence (display->startup_notification,
+                                              startup_id);
++#else
++  /* HACK: MetaScreen::startup-sequence-changed is currently tied to
++           (lib)startup-notification, which means it only works on X11;
++           so for now, always go through XWayland, even for wayland clients */
++  gdk_x11_display_broadcast_startup_message (gdk_display_get_default (),
++                                             "remove",
++                                             "ID", startup_id,
++                                             NULL);
++#endif
+ }
+ 
+ static void
+-- 
+2.9.3

Modified: desktop/unstable/mutter/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/patches/series?rev=51882&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/mutter/debian/patches/series	[utf-8] Sun Jan  8 02:27:53 2017
@@ -1,2 +1,3 @@
 git_dont_set_unavailable_scroll_methods.patch
 git_flush_all_swap_notifies_on_idle.patch
+bgo768531_workaround-startup-notifications.patch