Bumping version to 41.2-2.1

 - Fix order between animations and blur, blur effect will remove
   before the animation transition AND will show after animation completed.
   (by nine7nine on github)

 - Make border brightness configurable: adding border-birghtness schema
   key to org.gnome.mutter schema
   (by waimus on github)

Add two menu item in mutter_settings, make it easier to change border
width and border brightness of window.

1 files changed, 15 insertions, 15 deletions

diff --git a/PKGBUILD b/PKGBUILD
index b130735c3756..2172b4a00aca 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=mutter-rounded
 pkgver=41.2
-pkgrel=2
+pkgrel=2.1
 pkgdesc="A window manager for GNOME, with rounded corners patch"
 url="https://gitlab.gnome.org/GNOME/mutter"
 arch=(x86_64)
@@ -28,14 +28,16 @@ _commit=664ac09eecfd365b5258f53d2c9e6c8410a37919  # tags/41.2^0
 _mutter_src="$pkgname::git+https://gitlab.gnome.org/GNOME/mutter.git#commit=$_commit"
 _shell_blur_h_src="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/41.1/src/shell-blur-effect.h"
 _shell_blur_c_src="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/41.1/src/shell-blur-effect.c"
-_settings_src="https://github.com/yilozt/mutter-rounded-setting/releases/download/41.1/mutter-settings.tar"
+_settings_src="mutter_settings::git+https://github.com/yilozt/mutter-rounded-setting"
 
+# Mirrors in Gitee
 if [ "${LANG}" = "zh_CN.UTF-8" ] ; then
   _mutter_src="$pkgname::git+https://gitee.com/mirrors_GNOME/mutter.git#commit=$_commit"
-  _settings_src="https://gitee.com/lluo/mutter-rounded-setting/attach_files/896393/download/mutter-settings.tar"
+  _settings_src="mutter_settings::git+https://gitee.com/lluo/mutter-rounded-setting/"
 fi
 
 source=("$_mutter_src"
+        "$_settings_src"
         "rounded_corners.patch"
         "shell_blur_effect.patch"
         "meta_clip_effect.c"
@@ -43,16 +45,16 @@ source=("$_mutter_src"
         "shader.h"
         "$_shell_blur_h_src"
         "$_shell_blur_c_src"
-        "$_settings_src")
+        )
 sha256sums=('SKIP'
-            '0c2fc381c7529d012d3d8a4368941db7b60ce6128005008b5ddfb4da16dc2b83'
+            'SKIP'
+            'f161768e446deb36ea787f03daf3162b517f091a1690b1938c99b777687f44f0'
             '895f35f5e8a458c71b4312061cf7d2b0108a3c6df4b0324ab342c5a3576ee09a'
-            '622ec46c9a1e8e675adbc3d852467e46c8d3101caa0260bf63b4c1a1b87a24a1'
+            'dc4279ec3c0995ba9a9ee3ecd581376140c78089a058863dea0bd9ec7894dc49'
             '2ec553a260497f0ac0180512201c9819b10159a15fcbc6d5007932d8e2a44844'
-            'a02e991156dc3b4418899b73a2e65187a43990851fb235ea128ed7650c839a3b'
+            '644ab34d1c6eebe8d632b3b26a993a2b9f8a5b58c821758c50eef1cdd0b7cc0c'
             '8fb024306843153b28db2f5347775ef7e8add1dd846345148a572ad5336e168b'
-            'd58056b5028e1cf02a029036792f52e3429bd5f71a9403b5be93d95a7ba8252a'
-            '94f95723cacbbb6d6ffc2f81df8d663cc0394b209097589c0a7a8dfb8f333184')
+            'd58056b5028e1cf02a029036792f52e3429bd5f71a9403b5be93d95a7ba8252a')
 
 pkgver() {
   cd $pkgname
@@ -60,8 +62,8 @@ pkgver() {
 }
 
 prepare() {
-  sed -i '1i\#!/usr/bin/gjs' $srcdir/dist/mutter_settings.js
-  mv dist/mutter_settings.js mutter_settings
+  sed -i '1i\#!/usr/bin/gjs' mutter_settings/dist/mutter_settings.js
+  mv mutter_settings/dist/mutter_settings.js mutter_settings/dist/mutter_settings
 
   cd $pkgname
   cp $srcdir/*.[ch] $srcdir/$pkgname/src
@@ -102,17 +104,15 @@ check() {
 
 package() {
   meson install -C build --destdir "$pkgdir"
-  install mutter_settings $pkgdir/usr/bin/
+  install mutter_settings/dist/mutter_settings $pkgdir/usr/bin/
 
   _uuid=pickawindow@lluo.gitlab.com
   _schemas=org.gnome.shell.extensions.pickawindow.gschema.xml
   
   install -d "$pkgdir/usr/share/gnome-shell/extensions/$_uuid"
-  cp -r $_uuid/* "$pkgdir/usr/share/gnome-shell/extensions/$_uuid/"
+  cp -r mutter_settings/$_uuid/* "$pkgdir/usr/share/gnome-shell/extensions/$_uuid/"
 
   install -d "$pkgdir/usr/share/glib-2.0/schemas/"
   ln -s "/usr/share/gnome-shell/extensions/$_uuid/schemas/$_schemas" \
     "$pkgdir/usr/share/glib-2.0/schemas/"
-
-  install mutter_settings $pkgdir/usr/bin/
 }