diff --git a/common/shlibs b/common/shlibs index bec2f470613..9382f78b201 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3042,11 +3042,11 @@ libdecoration.so.0 compiz-core-0.8.14_1 libcompizconfig.so.0 libcompizconfig-0.8.14_1 libemeraldengine.so.0 emerald-0.8.14_1 libhangul.so.1 libhangul-0.1.0_1 -libmutter-15.so.0 mutter-47.0_1 -libmutter-clutter-15.so.0 mutter-47.0_1 -libmutter-cogl-15.so.0 mutter-47.0_1 -libmutter-cogl-pango-15.so.0 mutter-47.0_1 -libmutter-mtk-15.so.0 mutter-47.0_1 +libmutter-16.so.0 mutter-48.2_1 +libmutter-clutter-16.so.0 mutter-48.2_1 +libmutter-cogl-16.so.0 mutter-48.2_1 +libmutter-cogl-pango-16.so.0 mutter-48.2_1 +libmutter-mtk-16.so.0 mutter-48.2_1 libgeoclue-2.so.0 geoclue2-2.4.4_1 libgepub-0.7.so.0 libgepub-0.7.1_1 libslopy.so.7.6 slop-7.6_1 diff --git a/srcpkgs/mutter/patches/fixudev.patch b/srcpkgs/mutter/patches/fixudev.patch deleted file mode 100644 index 93753ae0dbf..00000000000 --- a/srcpkgs/mutter/patches/fixudev.patch +++ /dev/null @@ -1,16 +0,0 @@ -Apparently the version limit is only required for systemd udev, it works -just fine with our version of eudev. - -diff --git meson.build meson.build -index dc210e6..6e080ca 100644 ---- a/meson.build -+++ b/meson.build -@@ -168,7 +168,7 @@ endif - - have_libgudev = get_option('udev') - if have_libgudev -- libudev_dep = dependency('libudev', version: udev_req) -+ libudev_dep = dependency('libudev') - gudev_dep = dependency('gudev-1.0', version: gudev_req) - endif - diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template index ccaad9646e9..ac321dea9b3 100644 --- a/srcpkgs/mutter/template +++ b/srcpkgs/mutter/template @@ -1,14 +1,14 @@ # Template file for 'mutter' pkgname=mutter -version=47.5 -revision=2 +version=48.2 +revision=1 build_helper="gir" build_style=meson configure_args="-Degl_device=true -Dudev=true -Dnative_backend=true -Dprofiler=false -Dintrospection=true -Dxwayland_path=/usr/bin/Xwayland - -Dxwayland_initfd=disabled -Dtests=disabled -Dlibdisplay_info=enabled" + -Dxwayland_initfd=disabled -Dtests=disabled" hostmakedepends="gettext glib-devel pkg-config zenity wayland-devel xorg-server - xorg-server-xwayland" + xorg-server-xwayland python3-argcomplete python3-docutils" makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel json-glib-devel libglib-devel libSM-devel libXtst-devel libcanberra-devel libinput-devel MesaLib-devel pipewire-devel startup-notification-devel gtk4-devel @@ -20,11 +20,11 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/Mutter/" #changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/main/NEWS" -changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-47/NEWS" +changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-48/NEWS" distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz" -checksum=6551a33ce887e68415b13952af6d6b430e95306f9297adc8c111953e995c515b -shlib_provides="libmutter-clutter-15.so libmutter-cogl-15.so - libmutter-cogl-pango-15.so libmutter-mtk-15.so" +checksum=3c18ba4e093ea9a378113dcafa7bdb5c1f9d6f5af9765026b7e66cb78daf614e +shlib_provides="libmutter-clutter-16.so libmutter-cogl-16.so + libmutter-cogl-pango-16.so libmutter-mtk-16.so" make_check=no # needs a full graphical session # Upstream keeps pulling generated headers even though it can cause race @@ -36,18 +36,23 @@ pre_build() { post_install() { # modify the pkg-config files to respect ${pc_sysrootdir} for variables that are # meant to be called with 'pkg-config --variable' - vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-15|g' \ - -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-15.pc + vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-16|g' \ + -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-16.pc + vmkdir usr/share/bash-completion/completions + mv $DESTDIR/etc/bash_completion.d/* \ + $DESTDIR/usr/share/bash-completion/completions } mutter-devel_package() { depends="gtk4-devel graphene-devel clutter-devel - libX11-devel libXtst-devel mutter-${version}_${revision}" + libX11-devel libXtst-devel mutter-${version}_${revision} + gnome-settings-daemon-devel libei-devel libdisplay-info-devel + libcanberra-devel libwacom-devel libICE-devel libSM-devel" short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove "usr/lib/mutter-15/*.gir" + vmove "usr/lib/mutter-16/*.gir" vmove "usr/lib/*.so" } }