[pkg-upd] 46.0-1

2 files changed, 93 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1b722dd5be42..6e2c5fba8db7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mutter-x11-scaling
 	pkgdesc = Window manager and compositor for GNOME with X11 fractional scaling patch
-	pkgver = 45.5
+	pkgver = 46.0
 	pkgrel = 1
 	url = https://gitlab.gnome.org/GNOME/mutter
 	arch = x86_64
@@ -19,32 +19,67 @@ pkgbase = mutter-x11-scaling
 	makedepends = wayland-protocols
 	makedepends = xorg-server
 	makedepends = xorg-server-xvfb
+	depends = at-spi2-core
+	depends = cairo
 	depends = colord
 	depends = dconf
+	depends = fontconfig
+	depends = fribidi
+	depends = gcc-libs
+	depends = gdk-pixbuf2
+	depends = glib2
+	depends = glibc
 	depends = gnome-desktop-4
 	depends = gnome-settings-daemon
 	depends = graphene
 	depends = gsettings-desktop-schemas
+	depends = gtk4
+	depends = harfbuzz
 	depends = iio-sensor-proxy
 	depends = lcms2
 	depends = libcanberra
+	depends = libcolord
 	depends = libdisplay-info
+	depends = libdrm
 	depends = libei
+	depends = libglvnd
 	depends = libgudev
+	depends = libice
 	depends = libinput
+	depends = libpipewire
 	depends = libsm
 	depends = libsysprof-capture
+	depends = libwacom
+	depends = libx11
+	depends = libxau
+	depends = libxcb
+	depends = libxcomposite
+	depends = libxcursor
+	depends = libxdamage
+	depends = libxext
+	depends = libxfixes
+	depends = libxi
+	depends = libxinerama
+	depends = libxkbcommon
 	depends = libxkbcommon-x11
 	depends = libxkbfile
+	depends = libxrandr
+	depends = libxtst
+	depends = mesa
+	depends = pango
 	depends = pipewire
+	depends = pixman
+	depends = python
 	depends = startup-notification
+	depends = systemd-libs
+	depends = wayland
 	depends = xorg-xwayland
-	provides = mutter=45.5
-	provides = libmutter-13.so
+	provides = mutter=46.0
+	provides = libmutter-14.so
 	conflicts = mutter
-	source = git+https://gitlab.gnome.org/GNOME/mutter.git#commit=4e8ccf5f9c177595aac11895ed50a4e35d5087e4
-	source = https://raw.githubusercontent.com/puxplaying/mutter-x11-scaling/mutter-45/mutter-45.0-x11-Add-support-for-fractional-scaling-using-Randr.patch
-	b2sums = SKIP
-	b2sums = c25a4c909aa9a07d3c0a131a8419d510583ecdd883950c82ff487b0f578a13b2cb093c54b966cb48509c77ffdcc93cbadcd67318173454fb8cb424f01fd0bcb5
+	source = git+https://gitlab.gnome.org/GNOME/mutter.git#commit=c4753689e3413cd9332d885dd0297b3b7d9ba9ca
+	source = https://raw.githubusercontent.com/puxplaying/mutter-x11-scaling/a3b0d22d435cac6a2ce4e9fef9ebcd994639c9b4/x11-Add-support-for-fractional-scaling-using-Randr.patch
+	b2sums = 04a14854c8ec2668a340b241102b7b2ebbc0387a9771a5bd2c2366419ee08e7ebb308f2288f4a64b9d08053e1897eb514a46802584d1590f8bcebde4a613afaa
+	b2sums = c1b433d089bc63de2e7a4dc7e134d98639bc060d2219c67e6a17739281d526c30157963fdc13ee9aa021132d81e2f807bfda539536fb1f1de13e8c39b7ca28f9
 
 pkgname = mutter-x11-scaling
diff --git a/PKGBUILD b/PKGBUILD
index 2fd8a8af9a4a..13e605c2b261 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,9 +5,11 @@
 # Contributor: Jonathon Fernyhough
 # Contributor: realqhc <https://github.com/realqhc>
 # Contributor: Brett Alcox <https://github.com/brettalcox>
+# Contributor: runsisi https://github.com/runsisi
 
 # Archlinux credits:
 # Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
+# Maintainer: Fabian Bornschein <fabiscafe@archlinux.org>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Michael Kanis <mkanis_at_gmx_dot_de>
 
@@ -15,32 +17,67 @@
 # Marco Trevisan: <https://salsa.debian.org/gnome-team/mutter/-/blob/ubuntu/master/debian/patches/ubuntu/x11-Add-support-for-fractional-scaling-using-Randr.patch>
 
 pkgname=mutter-x11-scaling
-pkgver=45.5
+pkgver=46.0
 pkgrel=1
 pkgdesc="Window manager and compositor for GNOME with X11 fractional scaling patch"
 url="https://gitlab.gnome.org/GNOME/mutter"
 arch=(x86_64)
 license=(GPL-2.0-or-later)
 depends=(
+  at-spi2-core
+  cairo
   colord
   dconf
+  fontconfig
+  fribidi
+  gcc-libs
+  gdk-pixbuf2
+  glib2
+  glibc
   gnome-desktop-4
   gnome-settings-daemon
   graphene
   gsettings-desktop-schemas
+  gtk4
+  harfbuzz
   iio-sensor-proxy
   lcms2
   libcanberra
+  libcolord
   libdisplay-info
+  libdrm
   libei
+  libglvnd
   libgudev
+  libice
   libinput
+  libpipewire
   libsm
   libsysprof-capture
+  libwacom
+  libx11
+  libxau
+  libxcb
+  libxcomposite
+  libxcursor
+  libxdamage
+  libxext
+  libxfixes
+  libxi
+  libxinerama
+  libxkbcommon
   libxkbcommon-x11
   libxkbfile
+  libxrandr
+  libxtst
+  mesa
+  pango
   pipewire
+  pixman
+  python
   startup-notification
+  systemd-libs
+  wayland
   xorg-xwayland
 )
 makedepends=(
@@ -61,15 +98,15 @@ checkdepends=(
   wireplumber
   zenity
 )
-provides=(mutter=$pkgver libmutter-13.so)
+provides=(mutter=$pkgver libmutter-14.so)
 conflicts=(mutter)
-_commit=4e8ccf5f9c177595aac11895ed50a4e35d5087e4  # tags/45.5^0
+_commit=c4753689e3413cd9332d885dd0297b3b7d9ba9ca  # tags/46.0^0
 source=(
   "git+https://gitlab.gnome.org/GNOME/mutter.git#commit=$_commit"
-  "https://raw.githubusercontent.com/puxplaying/mutter-x11-scaling/mutter-45/mutter-45.0-x11-Add-support-for-fractional-scaling-using-Randr.patch"
+  "https://raw.githubusercontent.com/puxplaying/mutter-x11-scaling/a3b0d22d435cac6a2ce4e9fef9ebcd994639c9b4/x11-Add-support-for-fractional-scaling-using-Randr.patch"
 )
-b2sums=('SKIP'
-        'c25a4c909aa9a07d3c0a131a8419d510583ecdd883950c82ff487b0f578a13b2cb093c54b966cb48509c77ffdcc93cbadcd67318173454fb8cb424f01fd0bcb5')
+b2sums=('04a14854c8ec2668a340b241102b7b2ebbc0387a9771a5bd2c2366419ee08e7ebb308f2288f4a64b9d08053e1897eb514a46802584d1590f8bcebde4a613afaa'
+        'c1b433d089bc63de2e7a4dc7e134d98639bc060d2219c67e6a17739281d526c30157963fdc13ee9aa021132d81e2f807bfda539536fb1f1de13e8c39b7ca28f9')
 
 pkgver() {
   cd mutter
@@ -80,7 +117,7 @@ prepare() {
   cd mutter
 
   # Add scaling support using randr under x11
-  patch -p1 -i "${srcdir}/mutter-45.0-x11-Add-support-for-fractional-scaling-using-Randr.patch"
+  patch -p1 -i "${srcdir}/x11-Add-support-for-fractional-scaling-using-Randr.patch"
 }
 
 build() {
@@ -88,7 +125,7 @@ build() {
     -D docs=false
     -D egl_device=true
     -D installed_tests=false
-    -D libdisplay_info=true
+    -D libdisplay_info=enabled
     -D wayland_eglstream=true
   )
 
@@ -107,9 +144,14 @@ check() (
   export NO_AT_BRIDGE=1 GTK_A11Y=none
   export MUTTER_DEBUG_DUMMY_MODE_SPECS="800x600@10.0"
 
+  # Tests fail:
+  # mutter:cogl+cogl/conform / cogl-test-offscreen-texture-formats-gles2
+  # mutter:core+mutter/stacking / fullscreen-maximize
+  ## https://gitlab.gnome.org/GNOME/mutter/-/issues/3343
   xvfb-run -s '-nolisten local +iglx -noreset' \
     mutter/src/tests/meta-dbus-runner.py --launch=pipewire --launch=wireplumber \
-    meson test -C build --print-errorlogs -t 5 --setup plain || :
+    meson test -C build --no-suite 'mutter/kvm' --no-rebuild \
+    --print-errorlogs --timeout-multiplier 10 --setup plain ||:
 )
 
 package() {