3.30.1+8+g1abab3fe2-1 and disabled patch #168

3 files changed, 23 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9b28519ad77a..5f189b62a04f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mutter-781835-workaround
 	pkgdesc = A window manager for GNOME. This package reverts a commit which may causes performance problems for nvidia driver users. Some performance patches also included.
-	pkgver = 3.30.1
-	pkgrel = 4
+	pkgver = 3.30.1+8+g1abab3fe2
+	pkgrel = 1
 	url = https://gitlab.gnome.org/GNOME/mutter
 	arch = x86_64
 	groups = gnome
@@ -27,11 +27,13 @@ pkgbase = mutter-781835-workaround
 	depends = gnome-shell
 	provides = mutter
 	conflicts = mutter
-	source = git+https://gitlab.gnome.org/GNOME/mutter.git#commit=3faaa9ce147ba4c3bd9d90a20ac86ce9c9680c9b
+	source = git+https://gitlab.gnome.org/GNOME/mutter.git#commit=1abab3fe2ed2d07bafc9f3aabe188c4d1c05ee43
+	source = https://gitlab.gnome.org/vanvugt/mutter/commit/fc02b040f3b750b0513f812813351c09795950f6.patch
 	source = startup-notification.patch
 	source = revert.patch
 	sha256sums = SKIP
-	sha256sums = 5a35ca4794fc361219658d9fae24a3ca21a365f2cb1901702961ac869c759366
+	sha256sums = dffa2ca19281b9fa5a81bf80bd46a8eae78325c7e1f8b2a25c33945aa7cc0903
+	sha256sums = 00d5e77c94e83e1987cc443ed7c47303aa33367ce912b2f665bcd34f88890a17
 	sha256sums = 2d2e305e0a6cca087bb8164f81bdc0ae7a5ca8e9c13c81d7fd5252eb3563fc09
 
 pkgname = mutter-781835-workaround
diff --git a/PKGBUILD b/PKGBUILD
index 409bffbb0f59..8595d627322c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,8 +7,8 @@
 
 pkgname=mutter-781835-workaround
 _pkgname=mutter
-pkgver=3.30.1
-pkgrel=4
+pkgver=3.30.1+8+g1abab3fe2
+pkgrel=1
 pkgdesc="A window manager for GNOME. This package reverts a commit which may causes performance problems for nvidia driver users. Some performance patches also included."
 url="https://gitlab.gnome.org/GNOME/mutter"
 arch=(x86_64)
@@ -20,12 +20,14 @@ makedepends=(intltool gobject-introspection git egl-wayland)
 provides=(mutter)
 conflicts=(mutter)
 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
         revert.patch)
 sha256sums=('SKIP'
-            '5a35ca4794fc361219658d9fae24a3ca21a365f2cb1901702961ac869c759366'
+            'dffa2ca19281b9fa5a81bf80bd46a8eae78325c7e1f8b2a25c33945aa7cc0903'
+            '00d5e77c94e83e1987cc443ed7c47303aa33367ce912b2f665bcd34f88890a17'
             '2d2e305e0a6cca087bb8164f81bdc0ae7a5ca8e9c13c81d7fd5252eb3563fc09')
 
 # pkgver() {
@@ -45,7 +47,8 @@ prepare() {
 
   # clutter: Deliver events sooner when possible
   # https://gitlab.gnome.org/GNOME/mutter/merge_requests/168/commits
-  git cherry-pick 0feecfe8
+  # Disabled as may cause stutter when using mouse with high polling rate
+  # git cherry-pick 0feecfe8
 
   # clutter: Fix offscreen-effect painting of clones
   # https://gitlab.gnome.org/GNOME/mutter/merge_requests/117/commits
@@ -67,9 +70,12 @@ prepare() {
   # Revert offending commit
   patch -Np1 -i ../revert.patch
 
+  # 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
 }
diff --git a/startup-notification.patch b/startup-notification.patch
index 1a4dd0b9705f..2b70474515a9 100644
--- a/startup-notification.patch
+++ b/startup-notification.patch
@@ -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@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 @@ https://bugzilla.gnome.org/show_bug.cgi?id=768531
  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 @@ index d6e249f..9d1a19e 100644
  
  static void
 -- 
-2.9.3
+2.19.1
+