[arch-commits] Commit in mutter/trunk (PKGBUILD startup-notification.patch)

[Jan Steffens]

    Date: Wednesday, December 28, 2016 @ 05:26:13
  Author: heftig
Revision: 284917

3.22.2+6+g06f5b6b3e-1

Added:
  mutter/trunk/startup-notification.patch
Modified:
  mutter/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |   14 +++++++++----
 startup-notification.patch |   45 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-12-28 04:23:25 UTC (rev 284916)
+++ PKGBUILD	2016-12-28 05:26:13 UTC (rev 284917)
@@ -4,7 +4,7 @@
 # Contributor: Michael Kanis <mkanis_at_gmx_dot_de>
 
 pkgname=mutter
-pkgver=3.22.2+5+gd9fc81e
+pkgver=3.22.2+6+g06f5b6b3e
 pkgrel=1
 pkgdesc="A window manager for GNOME"
 url="https://git.gnome.org/browse/mutter"
@@ -16,9 +16,11 @@
 makedepends=(intltool gobject-introspection git gnome-common)
 groups=(gnome)
 options=(!emptydirs)
-_commit=d9fc81e702a949980323b0f11b6764fcd1599872  # gnome-3-22
-source=("git+https://git.gnome.org/browse/mutter#commit=$_commit")
-sha256sums=('SKIP')
+_commit=06f5b6b3e37eb96b91b475b1e57a3f1056ab815a  # gnome-3-22
+source=("git+https://git.gnome.org/browse/mutter#commit=$_commit"
+        startup-notification.patch)
+sha256sums=('SKIP'
+            '5a35ca4794fc361219658d9fae24a3ca21a365f2cb1901702961ac869c759366')
 
 pkgver() {
   cd $pkgname
@@ -27,6 +29,10 @@
 
 prepare() {
   cd $pkgname
+
+  # https://bugs.archlinux.org/task/51940
+  patch -Np1 -i ../startup-notification.patch
+
   NOCONFIGURE=1 ./autogen.sh
 }
 

Added: startup-notification.patch
===================================================================
--- startup-notification.patch	                        (rev 0)
+++ startup-notification.patch	2016-12-28 05:26:13 UTC (rev 284917)
@@ -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