[arch-commits] Commit in mutter/trunk (2 files)

[Jan Steffens]

    Date: Monday, June 14, 2021 @ 20:25:38
  Author: heftig
Revision: 418246

40.2.1-1

Modified:
  mutter/trunk/PKGBUILD
Deleted:
  mutter/trunk/0001-renderer-native-Clear-pending-update-list-before-rep.patch

-----------------------------------------------------------------+
 0001-renderer-native-Clear-pending-update-list-before-rep.patch |   33 ----------
 PKGBUILD                                                        |   15 +---
 2 files changed, 5 insertions(+), 43 deletions(-)

Deleted: 0001-renderer-native-Clear-pending-update-list-before-rep.patch
===================================================================
--- 0001-renderer-native-Clear-pending-update-list-before-rep.patch	2021-06-14 20:25:22 UTC (rev 418245)
+++ 0001-renderer-native-Clear-pending-update-list-before-rep.patch	2021-06-14 20:25:38 UTC (rev 418246)
@@ -1,33 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl at gmail.com>
-Date: Sat, 12 Jun 2021 21:09:55 +0200
-Subject: [PATCH] renderer/native: Clear pending update list before
- repopulating
-
-Before we did a simple copy, meaning the old list was overriden. Copy
-was too eager, as it meant views without modes to set was waited for,
-resulting in a dead lock. Instead only the relevant views were added to
-the list for view which had pending updates needed. What was missed was
-that the list was never cleared, meaning we just appended the new list
-on top of the old, causing issues.
-
-Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/1846
-Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/1843
-Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/1844
----
- src/backends/native/meta-renderer-native.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/backends/native/meta-renderer-native.c b/src/backends/native/meta-renderer-native.c
-index a84f3025f..7e4af8fe0 100644
---- a/src/backends/native/meta-renderer-native.c
-+++ b/src/backends/native/meta-renderer-native.c
-@@ -831,7 +831,7 @@ meta_renderer_native_queue_modes_reset (MetaRendererNative *renderer_native)
-   MetaRenderer *renderer = META_RENDERER (renderer_native);
-   GList *l;
- 
--  g_list_free (renderer_native->pending_mode_set_views);
-+  g_clear_list (&renderer_native->pending_mode_set_views, NULL);
-   for (l = meta_renderer_get_views (renderer); l; l = l->next)
-     {
-       ClutterStageView *stage_view = l->data;

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-14 20:25:22 UTC (rev 418245)
+++ PKGBUILD	2021-06-14 20:25:38 UTC (rev 418246)
@@ -3,8 +3,8 @@
 # Contributor: Michael Kanis <mkanis_at_gmx_dot_de>
 
 pkgname=mutter
-pkgver=40.2
-pkgrel=2
+pkgver=40.2.1
+pkgrel=1
 pkgdesc="A window manager for GNOME"
 url="https://gitlab.gnome.org/GNOME/mutter"
 arch=(x86_64)
@@ -18,11 +18,9 @@
 provides=(libmutter-8.so)
 groups=(gnome)
 install=mutter.install
-_commit=d4269932528e28672a94cd965f8a5ee43481f127  # tags/40.2^0
-source=("git+https://gitlab.gnome.org/GNOME/mutter.git#commit=$_commit"
-        0001-renderer-native-Clear-pending-update-list-before-rep.patch)
-sha256sums=('SKIP'
-            '8a861c2732e030fe2f19161539b0deb126ef0955a45d90fdf1fabd6390ca6f59')
+_commit=69f35b84b22e15cab617ab4f2bbcfc60589a5382  # tags/40.2.1^0
+source=("git+https://gitlab.gnome.org/GNOME/mutter.git#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd $pkgname
@@ -31,9 +29,6 @@
 
 prepare() {
   cd $pkgname
-
-  # https://bugs.archlinux.org/task/71236
-  git apply -3 ../0001-renderer-native-Clear-pending-update-list-before-rep.patch
 }
 
 build() {