diff --git a/common/shlibs b/common/shlibs index e2edb9f7a1b..f829ee12e80 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1495,10 +1495,10 @@ libector.so.1 efl-1.25.1_2 libemile.so.1 efl-1.25.1_2 libcjs.so.0 cjs-2.0.0_1 libmuffin.so.0 muffin-2.0.5_1 -libmuffin-cogl-pango-0.so muffin-4.0.5_1 -libmuffin-cogl-path-0.so muffin-4.0.5_1 -libmuffin-cogl-0.so muffin-4.0.5_1 -libmuffin-clutter-0.so muffin-4.0.5_1 +libmuffin-cogl-pango-0.so.0 muffin-5.4.5_1 +libmuffin-cogl-path-0.so.0 muffin-5.4.5_1 +libmuffin-cogl-0.so.0 muffin-5.4.5_1 +libmuffin-clutter-0.so.0 muffin-5.4.5_1 libcinnamon-desktop.so.4 cinnamon-desktop-2.0.4_1 libcinnamon-control-center.so.1 libcinnamon-control-center-2.4.2_1 libcvc.so.0 cinnamon-desktop-3.2.0_1 diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template index cb8032a75d2..9383775a47f 100644 --- a/srcpkgs/muffin/template +++ b/srcpkgs/muffin/template @@ -1,14 +1,24 @@ # Template file for 'muffin' pkgname=muffin -version=5.2.1 +version=5.4.5 revision=1 -build_style=gnu-configure +build_style=meson build_helper=gir -configure_args="--disable-static --disable-schemas-compile --disable-gtk-doc - --enable-compile-warnings=minimum ac_cv_path_ZENITY=/usr/bin/zenity" -hostmakedepends="automake gdk-pixbuf-devel gettext-devel glib-devel - gobject-introspection gtk-doc intltool libtool pkg-config" -makedepends="cinnamon-desktop-devel libSM-devel libinput-devel +# -Dtests requires -Dwayland, which is explicitly disabled +configure_args="-Dopengl=true -Degl=true -Dglx=true -Dgles2=true + -Dudev=true -Dsm=true -Dlibwacom=true -Dpango_ft2=true + -Dstartup_notification=true -Dremote_desktop=true -Dintrospection=true + -Dprofiler=false -Ddebug=false -Ddefault_driver=auto" +hostmakedepends="gdk-pixbuf-devel gettext-devel-tools glib-devel + gobject-introspection intltool pkg-config wayland-devel wayland-protocols" +makedepends="cinnamon-desktop-devel libSM-devel libinput-devel fribidi-devel + libglib-devel graphene-devel gtk+3-devel gdk-pixbuf-devel pango-devel + cairo-devel upower-devel libXcomposite-devel libxkbcommon-devel + libXfixes-devel libXi-devel libXrandr-devel libwacom-devel atk-devel + libXcursor-devel libXdamage-devel libXext-devel libxkbfile-devel + xkeyboard-config libXrender-devel libX11-devel libxcb-devel libXau-devel + libXinerama-devel libICE-devel dbus-devel libglvnd-devel + eudev-libudev-devel libgudev-devel wayland-devel libgbm-devel pipewire-devel libcanberra-devel startup-notification-devel libXtst-devel json-glib-devel" depends="zenity" short_desc="Cinnamon window manager based on Mutter" @@ -17,13 +27,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="https://github.com/linuxmint/muffin" changelog="https://raw.githubusercontent.com/linuxmint/muffin/master/debian/changelog" distfiles="https://github.com/linuxmint/muffin/archive/${version}.tar.gz" -checksum=356a9fce1f4e9f39a6e0156c5dcab1e4190113a191cf1422d1ea08dbea4bfda4 -shlib_provides="libmuffin-clutter-0.so libmuffin-cogl-pango-0.so - libmuffin-cogl-path-0.so libmuffin-cogl-0.so" - -pre_configure() { - NOCONFIGURE=1 ./autogen.sh -} +checksum=e02802d72c9d5d0cdd62194528c0aff80a2e6fa5f74b49191332f316516acdb0 post_install() { vmkdir usr/share/gir-1.0 @@ -39,5 +43,6 @@ muffin-devel_package() { vmove usr/include vmove usr/lib/pkgconfig vmove usr/share/gir-1.0 + vmove "usr/lib/*.so" } }