summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO6
-rw-r--r--.gitignore1
-rw-r--r--PKGBUILD27
-rw-r--r--mutter.install2
4 files changed, 25 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e6704db6ea2e..fe38d8477b2c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = mutter-rounded
pkgdesc = A window manager for GNOME, with rounded corners patch
pkgver = 41.1
- pkgrel = 1
+ pkgrel = 2
url = https://gitlab.gnome.org/GNOME/mutter
install = mutter.install
arch = x86_64
@@ -44,7 +44,7 @@ pkgbase = mutter-rounded
source = shader.h
source = https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/41.1/src/shell-blur-effect.h
source = https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/41.1/src/shell-blur-effect.c
- source = mutter_setting::https://gitlab.gnome.org/lluo/mutter-rounded-setting/uploads/8f8e3f8d39f31e602c2d09884a6c5dd1/main.js
+ source = https://gitlab.gnome.org/lluo/mutter-rounded-setting/uploads/2b934d0b3194f0b2adb9a5392e512c76/mutter-settings.tar
sha256sums = SKIP
sha256sums = 0c2fc381c7529d012d3d8a4368941db7b60ce6128005008b5ddfb4da16dc2b83
sha256sums = 895f35f5e8a458c71b4312061cf7d2b0108a3c6df4b0324ab342c5a3576ee09a
@@ -53,6 +53,6 @@ pkgbase = mutter-rounded
sha256sums = a02e991156dc3b4418899b73a2e65187a43990851fb235ea128ed7650c839a3b
sha256sums = 8fb024306843153b28db2f5347775ef7e8add1dd846345148a572ad5336e168b
sha256sums = d58056b5028e1cf02a029036792f52e3429bd5f71a9403b5be93d95a7ba8252a
- sha256sums = c0eff82301060044d231f0b674025e5a00d1152e515e08d16fd18363da5187e5
+ sha256sums = 750d602fbfc08ed810d49c3ff90800ea3c243a16f74feaff995b209d00721867
pkgname = mutter-rounded
diff --git a/.gitignore b/.gitignore
index 01dc74bbca97..05c4decd798f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
/src
/pkg
/mutter-rounded
+mutter-settings.tar
mutter_setting
*pkg.tar.zst
shell-blur-effect.[ch]
diff --git a/PKGBUILD b/PKGBUILD
index 9a8c0888dc6e..9ed8d2a1e439 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
pkgname=mutter-rounded
pkgver=41.1
-pkgrel=1
+pkgrel=2
pkgdesc="A window manager for GNOME, with rounded corners patch"
url="https://gitlab.gnome.org/GNOME/mutter"
arch=(x86_64)
@@ -28,11 +28,11 @@ _commit=8de96d3d7c40e6b5289fd707fdd5e6d604f33e8f # tags/41.1^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/${pkgver}/src/shell-blur-effect.h"
_shell_blur_c_src="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/${pkgver}/src/shell-blur-effect.c"
-_setting_src="mutter_setting::https://gitlab.gnome.org/lluo/mutter-rounded-setting/uploads/8f8e3f8d39f31e602c2d09884a6c5dd1/main.js"
+_settings_src="https://gitlab.gnome.org/lluo/mutter-rounded-setting/uploads/2b934d0b3194f0b2adb9a5392e512c76/mutter-settings.tar"
if [ "${LANG}" = "zh_CN.UTF-8" ] ; then
_mutter_src="$pkgname::git+https://gitee.com/mirrors_GNOME/mutter.git#commit=$_commit"
- _setting_src="mutter_setting::https://gitee.com/lluo/mutter-rounded-setting/attach_files/865566/download/main.js"
+ _settings_src="https://gitee.com/lluo/mutter-rounded-setting/attach_files/886389/download/mutter-settings.tar"
fi
source=("$_mutter_src"
@@ -43,7 +43,7 @@ source=("$_mutter_src"
"shader.h"
"$_shell_blur_h_src"
"$_shell_blur_c_src"
- "$_setting_src")
+ "$_settings_src")
sha256sums=('SKIP'
'0c2fc381c7529d012d3d8a4368941db7b60ce6128005008b5ddfb4da16dc2b83'
'895f35f5e8a458c71b4312061cf7d2b0108a3c6df4b0324ab342c5a3576ee09a'
@@ -52,7 +52,7 @@ sha256sums=('SKIP'
'a02e991156dc3b4418899b73a2e65187a43990851fb235ea128ed7650c839a3b'
'8fb024306843153b28db2f5347775ef7e8add1dd846345148a572ad5336e168b'
'd58056b5028e1cf02a029036792f52e3429bd5f71a9403b5be93d95a7ba8252a'
- 'c0eff82301060044d231f0b674025e5a00d1152e515e08d16fd18363da5187e5')
+ '750d602fbfc08ed810d49c3ff90800ea3c243a16f74feaff995b209d00721867')
pkgver() {
cd $pkgname
@@ -60,7 +60,8 @@ pkgver() {
}
prepare() {
- sed -i '1i\#!/usr/bin/gjs' mutter_setting
+ sed -i '1i\#!/usr/bin/gjs' $srcdir/dist/mutter_settings.js
+ mv dist/mutter_settings.js mutter_settings
cd $pkgname
cp $srcdir/*.[ch] $srcdir/$pkgname/src
@@ -102,5 +103,17 @@ check() {
package() {
meson install -C build --destdir "$pkgdir"
- install mutter_setting $pkgdir/usr/bin/
+ install 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/"
+
+ 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/
}
diff --git a/mutter.install b/mutter.install
index 20cd64050774..4e2f5c19a4dc 100644
--- a/mutter.install
+++ b/mutter.install
@@ -1,6 +1,6 @@
tip() {
echo -e "\n"
- echo -e "\033[31m === use 'mutter_setting' command to set window rounded radius. === \033[0m"
+ echo -e "\033[31m === use 'mutter_settings' command to set window rounded radius. === \033[0m"
echo -e "\n"
}