fix wrong in ckeck stage

5 files changed, 15 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1ac4157de911..64884f121bc5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -45,8 +45,8 @@ pkgbase = mutter-rounded
 	source = https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/40.5/src/shell-blur-effect.c
 	source = mutter_setting::https://gitlab.gnome.org/lluo/mutter-rounded-setting/uploads/b1ba5b74faf000b93a4ddcbd73ddcb98/main.js
 	sha256sums = SKIP
-	sha256sums = 2502b64ecff2ac051b3e1cda5d8c424ca0caa71aa5055a48ba2e8441358c6ab1
-	sha256sums = c9eb42bdb6f8f1dbed2d6e6d1c47f5826f308411e91838eb407ba2aeab98b535
+	sha256sums = 9fd2e457f2ef76b454bafee91b5d2d9fb2ac2e17b5aee780cd1dd2c7832a00c4
+	sha256sums = d749f90825025ef597ba20f9e51c11eeefd1ba359f9e01a369d0c0428f134bf5
 	sha256sums = c47f3a998e5b8dbb53951be450a5f561f91ad8803a653dab2bcee69b1400e6d4
 	sha256sums = 2ec553a260497f0ac0180512201c9819b10159a15fcbc6d5007932d8e2a44844
 	sha256sums = a02e991156dc3b4418899b73a2e65187a43990851fb235ea128ed7650c839a3b
diff --git a/.gitignore b/.gitignore
index 236a8d219e59..01dc74bbca97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 mutter_setting
 *pkg.tar.zst
 shell-blur-effect.[ch]
+mutter-rounded*log
diff --git a/PKGBUILD b/PKGBUILD
index d04b89520490..f619b54199df 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -45,8 +45,8 @@ source=("$_mutter_src"
         "$_shell_blur_c_src"
         "$_setting_src")
 sha256sums=('SKIP'
-            '2502b64ecff2ac051b3e1cda5d8c424ca0caa71aa5055a48ba2e8441358c6ab1'
-            'c9eb42bdb6f8f1dbed2d6e6d1c47f5826f308411e91838eb407ba2aeab98b535'
+            '9fd2e457f2ef76b454bafee91b5d2d9fb2ac2e17b5aee780cd1dd2c7832a00c4'
+            'd749f90825025ef597ba20f9e51c11eeefd1ba359f9e01a369d0c0428f134bf5'
             'c47f3a998e5b8dbb53951be450a5f561f91ad8803a653dab2bcee69b1400e6d4'
             '2ec553a260497f0ac0180512201c9819b10159a15fcbc6d5007932d8e2a44844'
             'a02e991156dc3b4418899b73a2e65187a43990851fb235ea128ed7650c839a3b'
diff --git a/rounded_corners_40.5.patch b/rounded_corners_40.5.patch
index e6912587e1f9..ce04dd3fe400 100644
--- a/rounded_corners_40.5.patch
+++ b/rounded_corners_40.5.patch
@@ -249,10 +249,10 @@ index 1770550d4..26efc84c1 100644
 +}
 \ No newline at end of file
 diff --git a/src/compositor/meta-window-actor-private.h b/src/compositor/meta-window-actor-private.h
-index 64741e416..a0dc4f69d 100644
+index 64741e416..98495f3d7 100644
 --- a/src/compositor/meta-window-actor-private.h
 +++ b/src/compositor/meta-window-actor-private.h
-@@ -99,4 +99,16 @@ void meta_window_actor_update_regions (MetaWindowActor *self);
+@@ -99,4 +99,15 @@ void meta_window_actor_update_regions (MetaWindowActor *self);
  
  gboolean meta_window_actor_can_freeze_commits (MetaWindowActor *self);
  
@@ -264,7 +264,6 @@ index 64741e416..a0dc4f69d 100644
 +void meta_window_actor_create_blur_actor (MetaWindowActor *self);
 +void meta_window_actor_set_blur_behind (MetaWindowActor *self);
 +void meta_window_actor_update_blur_position_size (MetaWindowActor *self);
-+void meta_window_actor_remove_blur (MetaWindowActor *self);
 +void meta_window_actor_update_blur_sigmal (MetaWindowActor *self);
 +void meta_window_actor_update_blur_brightness (MetaWindowActor *self);
 +void meta_window_actor_update_blur_window_opacity (MetaWindowActor *self);
@@ -385,7 +384,7 @@ index e4769e087..60d376858 100644
  
        /* The frame bounds are already subtracted from actor_x11->shadow_clip
 diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c
-index d4fc9a43a..e0d1d7a78 100644
+index d4fc9a43a..61ba8416b 100644
 --- a/src/compositor/meta-window-actor.c
 +++ b/src/compositor/meta-window-actor.c
 @@ -41,6 +41,9 @@
@@ -702,7 +701,7 @@ index d4fc9a43a..e0d1d7a78 100644
    return TRUE;
  }
  
-+void
++static void
 +meta_window_actor_remove_blur (MetaWindowActor *self)
 +{
 +  MetaWindowActorPrivate *priv =
@@ -719,21 +718,19 @@ index d4fc9a43a..e0d1d7a78 100644
  static void
  meta_window_actor_after_effects (MetaWindowActor *self)
  {
-@@ -675,7 +950,13 @@ meta_window_actor_after_effects (MetaWindowActor *self)
+@@ -675,6 +950,12 @@ meta_window_actor_after_effects (MetaWindowActor *self)
  
    if (priv->needs_destroy)
      {
--      clutter_actor_destroy (CLUTTER_ACTOR (self));
 +      if (priv->round_clip_effect)
 +        {
 +          clutter_actor_remove_effect (CLUTTER_ACTOR(self),
 +                                       CLUTTER_EFFECT(priv->round_clip_effect));
 +          meta_window_actor_remove_blur(self);
-+          clutter_actor_destroy (CLUTTER_ACTOR (self));
 +        }
+       clutter_actor_destroy (CLUTTER_ACTOR (self));
      }
    else
-     {
 @@ -803,6 +1084,19 @@ meta_window_actor_queue_destroy (MetaWindowActor *self)
      clutter_actor_destroy (CLUTTER_ACTOR (self));
  }
diff --git a/shell_blur_effect_40.5.patch b/shell_blur_effect_40.5.patch
index 76397e7ad208..e592fc1cb800 100644
--- a/shell_blur_effect_40.5.patch
+++ b/shell_blur_effect_40.5.patch
@@ -1,6 +1,6 @@
 diff -Narup a/src/shell-blur-effect.c b/src/shell-blur-effect.c
---- a/src/shell-blur-effect.c	2021-10-09 14:44:54.501553584 +0800
-+++ b/src/shell-blur-effect.c	2021-10-09 14:44:54.528217397 +0800
+--- a/src/shell-blur-effect.c	2021-10-27 19:03:17.979246987 +0800
++++ b/src/shell-blur-effect.c	2021-10-27 19:03:17.982580970 +0800
 @@ -22,6 +22,9 @@
  
  #include "shell-enum-types.h"
@@ -426,8 +426,8 @@ diff -Narup a/src/shell-blur-effect.c b/src/shell-blur-effect.c
 +    clutter_effect_queue_repaint (CLUTTER_EFFECT (self));
 +}
 diff -Narup a/src/shell-blur-effect.h b/src/shell-blur-effect.h
---- a/src/shell-blur-effect.h	2021-10-09 14:44:54.511552514 +0800
-+++ b/src/shell-blur-effect.h	2021-10-09 14:44:54.544882280 +0800
+--- a/src/shell-blur-effect.h	2021-10-27 19:03:17.979246987 +0800
++++ b/src/shell-blur-effect.h	2021-10-27 19:03:17.982580970 +0800
 @@ -20,6 +20,10 @@
  
  #pragma once