[arch-commits] Commit in mutter/repos (6 files)
Jan Steffens
heftig at archlinux.org
Wed Dec 28 05:27:10 UTC 2016
Date: Wednesday, December 28, 2016 @ 05:27:10
Author: heftig
Revision: 284918
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
mutter/repos/extra-i686/PKGBUILD
(from rev 284917, mutter/trunk/PKGBUILD)
mutter/repos/extra-i686/startup-notification.patch
(from rev 284917, mutter/trunk/startup-notification.patch)
mutter/repos/extra-x86_64/PKGBUILD
(from rev 284917, mutter/trunk/PKGBUILD)
mutter/repos/extra-x86_64/startup-notification.patch
(from rev 284917, mutter/trunk/startup-notification.patch)
Deleted:
mutter/repos/extra-i686/PKGBUILD
mutter/repos/extra-x86_64/PKGBUILD
-----------------------------------------+
/PKGBUILD | 114 ++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 51 -------------
extra-i686/startup-notification.patch | 45 +++++++++++
extra-x86_64/PKGBUILD | 51 -------------
extra-x86_64/startup-notification.patch | 45 +++++++++++
5 files changed, 204 insertions(+), 102 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2016-12-28 05:26:13 UTC (rev 284917)
+++ extra-i686/PKGBUILD 2016-12-28 05:27:10 UTC (rev 284918)
@@ -1,51 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
-# Contributor: Michael Kanis <mkanis_at_gmx_dot_de>
-
-pkgname=mutter
-pkgver=3.22.2+5+gd9fc81e
-pkgrel=1
-pkgdesc="A window manager for GNOME"
-url="https://git.gnome.org/browse/mutter"
-arch=(i686 x86_64)
-license=(GPL)
-depends=(dconf gobject-introspection-runtime gsettings-desktop-schemas
- libcanberra startup-notification zenity libsm gnome-desktop upower
- libxkbcommon-x11 gnome-settings-daemon libgudev libinput)
-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')
-
-pkgver() {
- cd $pkgname
- git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
- cd $pkgname
- NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
- cd $pkgname
-
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --libexecdir=/usr/lib/$pkgname --disable-static \
- --disable-schemas-compile --enable-compile-warnings=minimum \
- --enable-gtk-doc
-
- #https://bugzilla.gnome.org/show_bug.cgi?id=655517
- sed -e 's/ -shared / -Wl,-O1,--as-needed\0/g' \
- -i {.,cogl,clutter}/libtool
-
- make
-}
-
-package() {
- cd $pkgname
- make DESTDIR="$pkgdir" install
-}
Copied: mutter/repos/extra-i686/PKGBUILD (from rev 284917, mutter/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-12-28 05:27:10 UTC (rev 284918)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Maintainer: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Michael Kanis <mkanis_at_gmx_dot_de>
+
+pkgname=mutter
+pkgver=3.22.2+6+g06f5b6b3e
+pkgrel=1
+pkgdesc="A window manager for GNOME"
+url="https://git.gnome.org/browse/mutter"
+arch=(i686 x86_64)
+license=(GPL)
+depends=(dconf gobject-introspection-runtime gsettings-desktop-schemas
+ libcanberra startup-notification zenity libsm gnome-desktop upower
+ libxkbcommon-x11 gnome-settings-daemon libgudev libinput)
+makedepends=(intltool gobject-introspection git gnome-common)
+groups=(gnome)
+options=(!emptydirs)
+_commit=06f5b6b3e37eb96b91b475b1e57a3f1056ab815a # gnome-3-22
+source=("git+https://git.gnome.org/browse/mutter#commit=$_commit"
+ startup-notification.patch)
+sha256sums=('SKIP'
+ '5a35ca4794fc361219658d9fae24a3ca21a365f2cb1901702961ac869c759366')
+
+pkgver() {
+ cd $pkgname
+ git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+ cd $pkgname
+
+ # https://bugs.archlinux.org/task/51940
+ patch -Np1 -i ../startup-notification.patch
+
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ cd $pkgname
+
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+ --libexecdir=/usr/lib/$pkgname --disable-static \
+ --disable-schemas-compile --enable-compile-warnings=minimum \
+ --enable-gtk-doc
+
+ #https://bugzilla.gnome.org/show_bug.cgi?id=655517
+ sed -e 's/ -shared / -Wl,-O1,--as-needed\0/g' \
+ -i {.,cogl,clutter}/libtool
+
+ make
+}
+
+package() {
+ cd $pkgname
+ make DESTDIR="$pkgdir" install
+}
Copied: mutter/repos/extra-i686/startup-notification.patch (from rev 284917, mutter/trunk/startup-notification.patch)
===================================================================
--- extra-i686/startup-notification.patch (rev 0)
+++ extra-i686/startup-notification.patch 2016-12-28 05:27:10 UTC (rev 284918)
@@ -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
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2016-12-28 05:26:13 UTC (rev 284917)
+++ extra-x86_64/PKGBUILD 2016-12-28 05:27:10 UTC (rev 284918)
@@ -1,51 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
-# Contributor: Michael Kanis <mkanis_at_gmx_dot_de>
-
-pkgname=mutter
-pkgver=3.22.2+5+gd9fc81e
-pkgrel=1
-pkgdesc="A window manager for GNOME"
-url="https://git.gnome.org/browse/mutter"
-arch=(i686 x86_64)
-license=(GPL)
-depends=(dconf gobject-introspection-runtime gsettings-desktop-schemas
- libcanberra startup-notification zenity libsm gnome-desktop upower
- libxkbcommon-x11 gnome-settings-daemon libgudev libinput)
-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')
-
-pkgver() {
- cd $pkgname
- git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
- cd $pkgname
- NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
- cd $pkgname
-
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --libexecdir=/usr/lib/$pkgname --disable-static \
- --disable-schemas-compile --enable-compile-warnings=minimum \
- --enable-gtk-doc
-
- #https://bugzilla.gnome.org/show_bug.cgi?id=655517
- sed -e 's/ -shared / -Wl,-O1,--as-needed\0/g' \
- -i {.,cogl,clutter}/libtool
-
- make
-}
-
-package() {
- cd $pkgname
- make DESTDIR="$pkgdir" install
-}
Copied: mutter/repos/extra-x86_64/PKGBUILD (from rev 284917, mutter/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2016-12-28 05:27:10 UTC (rev 284918)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Maintainer: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Michael Kanis <mkanis_at_gmx_dot_de>
+
+pkgname=mutter
+pkgver=3.22.2+6+g06f5b6b3e
+pkgrel=1
+pkgdesc="A window manager for GNOME"
+url="https://git.gnome.org/browse/mutter"
+arch=(i686 x86_64)
+license=(GPL)
+depends=(dconf gobject-introspection-runtime gsettings-desktop-schemas
+ libcanberra startup-notification zenity libsm gnome-desktop upower
+ libxkbcommon-x11 gnome-settings-daemon libgudev libinput)
+makedepends=(intltool gobject-introspection git gnome-common)
+groups=(gnome)
+options=(!emptydirs)
+_commit=06f5b6b3e37eb96b91b475b1e57a3f1056ab815a # gnome-3-22
+source=("git+https://git.gnome.org/browse/mutter#commit=$_commit"
+ startup-notification.patch)
+sha256sums=('SKIP'
+ '5a35ca4794fc361219658d9fae24a3ca21a365f2cb1901702961ac869c759366')
+
+pkgver() {
+ cd $pkgname
+ git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+ cd $pkgname
+
+ # https://bugs.archlinux.org/task/51940
+ patch -Np1 -i ../startup-notification.patch
+
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ cd $pkgname
+
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+ --libexecdir=/usr/lib/$pkgname --disable-static \
+ --disable-schemas-compile --enable-compile-warnings=minimum \
+ --enable-gtk-doc
+
+ #https://bugzilla.gnome.org/show_bug.cgi?id=655517
+ sed -e 's/ -shared / -Wl,-O1,--as-needed\0/g' \
+ -i {.,cogl,clutter}/libtool
+
+ make
+}
+
+package() {
+ cd $pkgname
+ make DESTDIR="$pkgdir" install
+}
Copied: mutter/repos/extra-x86_64/startup-notification.patch (from rev 284917, mutter/trunk/startup-notification.patch)
===================================================================
--- extra-x86_64/startup-notification.patch (rev 0)
+++ extra-x86_64/startup-notification.patch 2016-12-28 05:27:10 UTC (rev 284918)
@@ -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
More information about the arch-commits
mailing list