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

[Jan Steffens]

    Date: Monday, October 29, 2018 @ 08:33:10
  Author: heftig
Revision: 337500

3.30.1+8+g1abab3fe2-1

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

----------------------------+
 PKGBUILD                   |   13 +++++++++----
 startup-notification.patch |    9 +++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-29 08:26:44 UTC (rev 337499)
+++ PKGBUILD	2018-10-29 08:33:10 UTC (rev 337500)
@@ -3,7 +3,7 @@
 # Contributor: Michael Kanis <mkanis_at_gmx_dot_de>
 
 pkgname=mutter
-pkgver=3.30.1
+pkgver=3.30.1+8+g1abab3fe2
 pkgrel=1
 pkgdesc="A window manager for GNOME"
 url="https://gitlab.gnome.org/GNOME/mutter"
@@ -14,11 +14,13 @@
          gnome-settings-daemon libgudev libinput pipewire)
 makedepends=(intltool gobject-introspection git egl-wayland)
 groups=(gnome)
-_commit=3faaa9ce147ba4c3bd9d90a20ac86ce9c9680c9b  # tags/3.30.1^0
+_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'
-            '5a35ca4794fc361219658d9fae24a3ca21a365f2cb1901702961ac869c759366')
+            'dffa2ca19281b9fa5a81bf80bd46a8eae78325c7e1f8b2a25c33945aa7cc0903'
+            '00d5e77c94e83e1987cc443ed7c47303aa33367ce912b2f665bcd34f88890a17')
 
 pkgver() {
   cd $pkgname
@@ -28,9 +30,12 @@
 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
-  patch -Np1 -i ../startup-notification.patch
+  git apply -3 ../startup-notification.patch
 
   NOCONFIGURE=1 ./autogen.sh
 }

Modified: startup-notification.patch
===================================================================
--- startup-notification.patch	2018-10-29 08:26:44 UTC (rev 337499)
+++ startup-notification.patch	2018-10-29 08:33:10 UTC (rev 337500)
@@ -1,4 +1,4 @@
-From 4ed430b4ef3013c96fa56cdc57b925b42d20ead9 Mon Sep 17 00:00:00 2001
+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
@@ -16,10 +16,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
+index 474595b18..58375674a 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,
+@@ -321,11 +321,21 @@ gtk_shell_set_startup_id (struct wl_client   *client,
                            struct wl_resource *resource,
                            const char         *startup_id)
  {
@@ -42,4 +42,5 @@
  
  static void
 -- 
-2.9.3
+2.19.1
+