[arch-commits] Commit in mutter/repos/extra-x86_64 (4 files)
Jan Steffens
heftig at archlinux.org
Mon Oct 29 08:33:25 UTC 2018
Date: Monday, October 29, 2018 @ 08:33:25
Author: heftig
Revision: 337501
archrelease: copy trunk to extra-x86_64
Added:
mutter/repos/extra-x86_64/PKGBUILD
(from rev 337500, mutter/trunk/PKGBUILD)
mutter/repos/extra-x86_64/startup-notification.patch
(from rev 337500, mutter/trunk/startup-notification.patch)
Deleted:
mutter/repos/extra-x86_64/PKGBUILD
mutter/repos/extra-x86_64/startup-notification.patch
----------------------------+
PKGBUILD | 117 ++++++++++++++++++++++---------------------
startup-notification.patch | 91 ++++++++++++++++-----------------
2 files changed, 107 insertions(+), 101 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-10-29 08:33:10 UTC (rev 337500)
+++ PKGBUILD 2018-10-29 08:33:25 UTC (rev 337501)
@@ -1,56 +0,0 @@
-# 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.30.1
-pkgrel=1
-pkgdesc="A window manager for GNOME"
-url="https://gitlab.gnome.org/GNOME/mutter"
-arch=(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 pipewire)
-makedepends=(intltool gobject-introspection git egl-wayland)
-groups=(gnome)
-_commit=3faaa9ce147ba4c3bd9d90a20ac86ce9c9680c9b # tags/3.30.1^0
-source=("git+https://gitlab.gnome.org/GNOME/mutter.git#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
- # As of 2018-05-08: Still needed, according to fmuellner
- patch -Np1 -i ../startup-notification.patch
-
- NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
- cd $pkgname
-
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --libexecdir=/usr/lib --disable-static \
- --disable-schemas-compile --enable-compile-warnings=minimum \
- --enable-gtk-doc --enable-egl-device --enable-remote-desktop
-
- # 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 337500, mutter/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-10-29 08:33:25 UTC (rev 337501)
@@ -0,0 +1,61 @@
+# 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.30.1+8+g1abab3fe2
+pkgrel=1
+pkgdesc="A window manager for GNOME"
+url="https://gitlab.gnome.org/GNOME/mutter"
+arch=(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 pipewire)
+makedepends=(intltool gobject-introspection git egl-wayland)
+groups=(gnome)
+_commit=1abab3fe2ed2d07bafc9f3aabe188c4d1c05ee43 # gnome-3-30
+source=("git+https://gitlab.gnome.org/GNOME/mutter.git#commit=$_commit"
+ https://gitlab.gnome.org/vanvugt/mutter/commit/fc02b040f3b750b0513f812813351c09795950f6.patch
+ startup-notification.patch)
+sha256sums=('SKIP'
+ 'dffa2ca19281b9fa5a81bf80bd46a8eae78325c7e1f8b2a25c33945aa7cc0903'
+ '00d5e77c94e83e1987cc443ed7c47303aa33367ce912b2f665bcd34f88890a17')
+
+pkgver() {
+ cd $pkgname
+ git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+ cd $pkgname
+
+ # https://gitlab.gnome.org/GNOME/mutter/merge_requests/216
+ git apply -3 ../fc02b040f3b750b0513f812813351c09795950f6.patch
+
+ # https://bugs.archlinux.org/task/51940
+ # As of 2018-05-08: Still needed, according to fmuellner
+ git apply -3 ../startup-notification.patch
+
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ cd $pkgname
+
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+ --libexecdir=/usr/lib --disable-static \
+ --disable-schemas-compile --enable-compile-warnings=minimum \
+ --enable-gtk-doc --enable-egl-device --enable-remote-desktop
+
+ # 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
+}
Deleted: startup-notification.patch
===================================================================
--- startup-notification.patch 2018-10-29 08:33:10 UTC (rev 337500)
+++ startup-notification.patch 2018-10-29 08:33:25 UTC (rev 337501)
@@ -1,45 +0,0 @@
-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
Copied: mutter/repos/extra-x86_64/startup-notification.patch (from rev 337500, mutter/trunk/startup-notification.patch)
===================================================================
--- startup-notification.patch (rev 0)
+++ startup-notification.patch 2018-10-29 08:33:25 UTC (rev 337501)
@@ -0,0 +1,46 @@
+From 143917acf809202cb25590c48bc027639c1f914b 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 474595b18..58375674a 100644
+--- a/src/wayland/meta-wayland-gtk-shell.c
++++ b/src/wayland/meta-wayland-gtk-shell.c
+@@ -321,11 +321,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.19.1
+
More information about the arch-commits
mailing list