diff options
| -rw-r--r-- | .SRCINFO | 17 | ||||
| -rw-r--r-- | PKGBUILD | 22 | ||||
| -rw-r--r-- | rounded_corners.patch (renamed from rounded_corners_40.5.patch) | 0 | ||||
| -rw-r--r-- | shell_blur_effect.patch (renamed from shell_blur_effect_40.5.patch) | 0 |
4 files changed, 19 insertions, 20 deletions
@@ -1,7 +1,7 @@ pkgbase = mutter-rounded pkgdesc = A window manager for GNOME, with rounded corners patch - pkgver = 40.5 - pkgrel = 1.2 + pkgver = 41.1 + pkgrel = 1 url = https://gitlab.gnome.org/GNOME/mutter install = mutter.install arch = x86_64 @@ -9,6 +9,7 @@ pkgbase = mutter-rounded license = GPL checkdepends = xorg-server-xvfb checkdepends = pipewire-media-session + checkdepends = python-dbusmock makedepends = gobject-introspection makedepends = git makedepends = egl-wayland @@ -32,17 +33,17 @@ pkgbase = mutter-rounded depends = xorg-xwayland depends = graphene depends = libxkbfile + provides = libmutter-9.so provides = mutter - provides = libmutter-8.so conflicts = mutter - source = mutter-rounded::git+https://gitlab.gnome.org/GNOME/mutter.git#commit=2b2b3ab8502a5bcc2436e169279d2421f6f1a605 - source = rounded_corners_40.5.patch - source = shell_blur_effect_40.5.patch + source = mutter-rounded::git+https://gitlab.gnome.org/GNOME/mutter.git#commit=8de96d3d7c40e6b5289fd707fdd5e6d604f33e8f + source = rounded_corners.patch + source = shell_blur_effect.patch source = meta_clip_effect.c source = meta_clip_effect.h source = shader.h - source = https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/40.5/src/shell-blur-effect.h - source = https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/40.5/src/shell-blur-effect.c + 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 sha256sums = SKIP sha256sums = 0c2fc381c7529d012d3d8a4368941db7b60ce6128005008b5ddfb4da16dc2b83 @@ -6,8 +6,8 @@ # Contributor: Michael Kanis <mkanis_at_gmx_dot_de> pkgname=mutter-rounded -pkgver=40.5 -pkgrel=1.2 +pkgver=41.1 +pkgrel=1 pkgdesc="A window manager for GNOME, with rounded corners patch" url="https://gitlab.gnome.org/GNOME/mutter" arch=(x86_64) @@ -18,13 +18,13 @@ depends=(dconf gobject-introspection-runtime gsettings-desktop-schemas xorg-xwayland graphene libxkbfile) makedepends=(gobject-introspection git egl-wayland meson xorg-server wayland-protocols) -checkdepends=(xorg-server-xvfb pipewire-media-session) -provides=(mutter libmutter-8.so) +checkdepends=(xorg-server-xvfb pipewire-media-session python-dbusmock) +provides=(libmutter-9.so mutter) conflicts=(mutter) groups=(gnome) install=mutter.install -_commit=2b2b3ab8502a5bcc2436e169279d2421f6f1a605 # tags/40.5^0 +_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" @@ -36,8 +36,8 @@ if [ "${LANG}" = "zh_CN.UTF-8" ] ; then fi source=("$_mutter_src" - "rounded_corners_${pkgver}.patch" - "shell_blur_effect_${pkgver}.patch" + "rounded_corners.patch" + "shell_blur_effect.patch" "meta_clip_effect.c" "meta_clip_effect.h" "shader.h" @@ -64,12 +64,11 @@ prepare() { cd $pkgname cp $srcdir/*.[ch] $srcdir/$pkgname/src - patch -p1 < $srcdir/rounded_corners_${pkgver}.patch - patch -p1 < $srcdir/shell_blur_effect_${pkgver}.patch + patch -p1 < $srcdir/rounded_corners.patch + patch -p1 < $srcdir/shell_blur_effect.patch } build() { - echo "skip" > /dev/null CFLAGS="${CFLAGS/-O2/-O3} -fno-semantic-interposition" LDFLAGS+=" -Wl,-Bsymbolic-functions" arch-meson $pkgname build \ @@ -97,8 +96,7 @@ _check() ( ) check() { - dbus-run-session xvfb-run \ - -s '-screen 0 1920x1080x24 -nolisten local +iglx -noreset' \ + dbus-run-session xvfb-run -s '-nolisten local' \ bash -c "$(declare -f _check); _check" } diff --git a/rounded_corners_40.5.patch b/rounded_corners.patch index 25f13a2fa546..25f13a2fa546 100644 --- a/rounded_corners_40.5.patch +++ b/rounded_corners.patch diff --git a/shell_blur_effect_40.5.patch b/shell_blur_effect.patch index 685c26a00bd7..685c26a00bd7 100644 --- a/shell_blur_effect_40.5.patch +++ b/shell_blur_effect.patch |