commit 105d14a18eebc6eb6f0b6ffee3a69ee1bad55fce
Author: Jakub Bogusz <[email protected]>
Date: Tue Jun 13 22:52:08 2023 +0200
- updated to 5.8.0
muffin-gir.patch | 11 ----
muffin.spec | 190 ++++++++++++++++++++++---------------------------------
2 files changed, 76 insertions(+), 125 deletions(-)
---
diff --git a/muffin.spec b/muffin.spec
index e70f53b..51ed421 100644
--- a/muffin.spec
+++ b/muffin.spec
@@ -1,63 +1,82 @@
+#
+# Conditional build
+%bcond_without pipewire # remote desktop via pipewire
+%bcond_with sysprof # sysprof tracing support
+
Summary: Window and compositing manager based on Clutter
Summary(pl.UTF-8): Zarządca okien i składania oparty na bibliotece Clutter
Name: muffin
-Version: 5.0.1
+Version: 5.8.0
Release: 1
License: GPL v2+
Group: X11/Applications
-#Source0Download: https://github.com/linuxmint/muffin/releases
+#Source0Download: https://github.com/linuxmint/muffin/tags
Source0:
https://github.com/linuxmint/muffin/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 79758ea632d118cd2b5d9546390125cb
-Patch0: %{name}-gir.patch
+# Source0-md5: 9bc750e05279cd1df74bfb28079addbf
URL: https://github.com/linuxmint/muffin
BuildRequires: EGL-devel
-BuildRequires: Mesa-libGL-devel
+BuildRequires: Mesa-libgbm-devel >= 10.3
+BuildRequires: OpenGL-GLX-devel
BuildRequires: atk-devel
-BuildRequires: autoconf >= 2.50
-BuildRequires: autoconf-archive
-BuildRequires: automake >= 1:1.11
BuildRequires: cairo-devel >= 1.10.0
-BuildRequires: cinnamon-desktop-devel >= 2.4.0
-BuildRequires: desktop-file-utils
+BuildRequires: cinnamon-desktop-devel >= 5.3
+BuildRequires: dbus-devel
+BuildRequires: fribidi-devel >= 1.0.0
BuildRequires: gettext-devel
BuildRequires: gettext-tools
-BuildRequires: glib2-devel >= 1:2.50.3
+BuildRequires: glib2-devel >= 1:2.61.1
BuildRequires: gobject-introspection-devel >= 1.40
-BuildRequires: gtk+3-devel >= 3.9.12
-BuildRequires: gtk-doc >= 1.15
-BuildRequires: intltool >= 0.35.0
-BuildRequires: json-glib-devel
+BuildRequires: graphene-devel >= 1.9.3
+BuildRequires: gtk+3-devel >= 3.19.8
+BuildRequires: json-glib-devel >= 0.12.0
BuildRequires: libcanberra-gtk3-devel >= 0.26
-BuildRequires: libtool >= 2:2.2.6
+BuildRequires: libdrm-devel
+BuildRequires: libgudev-devel >= 232
+BuildRequires: libinput-devel >= 1.7
BuildRequires: libwacom-devel >= 0.13
# xcb-randr xcb-res
BuildRequires: libxcb-devel
+BuildRequires: meson >= 0.50.0
+BuildRequires: ninja >= 1.5
BuildRequires: pango-devel >= 1:1.30
+%{?with_pipewire:BuildRequires: pipewire-devel >= 0.3.0}
BuildRequires: pkgconfig >= 1:0.21
BuildRequires: python >= 1:2.5
-BuildRequires: rpm-build >= 4.6
+BuildRequires: rpmbuild(macros) >= 1.736
BuildRequires: startup-notification-devel >= 0.7
+%{?with_sysprof:BuildRequires: sysprof-devel >= 3.35.2}
+# or elogind-devel
+BuildRequires: systemd-devel >= 1:209
+BuildRequires: udev-devel >= 1:228
+# wayland-client wayland-server
+BuildRequires: wayland-devel >= 1.13.0
+BuildRequires: wayland-egl-devel
+BuildRequires: wayland-protocols >= 1.19
BuildRequires: xkeyboard-config
+BuildRequires: xorg-lib-libICE-devel
BuildRequires: xorg-lib-libSM-devel
BuildRequires: xorg-lib-libX11-devel
+BuildRequires: xorg-lib-libXau-devel
BuildRequires: xorg-lib-libXcomposite-devel >= 0.4
BuildRequires: xorg-lib-libXcursor-devel
BuildRequires: xorg-lib-libXdamage-devel
BuildRequires: xorg-lib-libXext-devel
BuildRequires: xorg-lib-libXfixes-devel >= 3
-BuildRequires: xorg-lib-libXi-devel >= 1.6.0
+BuildRequires: xorg-lib-libXi-devel >= 1.7.4
BuildRequires: xorg-lib-libXinerama-devel
-BuildRequires: xorg-lib-libXrandr-devel >= 1.2
+BuildRequires: xorg-lib-libXrandr-devel >= 1.5.0
BuildRequires: xorg-lib-libXrender-devel
+BuildRequires: xorg-lib-libXtst-devel
BuildRequires: xorg-lib-libxkbcommon-devel >= 0.4.3
-BuildRequires: xorg-lib-libxkbcommon-x11-devel
+BuildRequires: xorg-lib-libxkbcommon-x11-devel >= 0.4.3
BuildRequires: xorg-lib-libxkbfile-devel
Requires: %{name}-libs = %{version}-%{release}
-Requires: cinnamon-desktop >= 2.4.0
+Requires: cinnamon-desktop >= 5.3
#Requires: control-center-filesystem
Requires: dbus-x11
Requires: libcanberra-gtk3 >= 0.26
Requires: startup-notification >= 0.7
+Requires: wayland >= 1.13.0
Requires: zenity
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -92,16 +111,18 @@ Group: X11/Libraries
Requires: atk >= 1:2.5.3
Requires: cairo >= 1.10
Requires: cairo-gobject >= 1.14.0
-Requires: cinnamon-desktop-libs >= 2.4.0
-Requires: glib2 >= 1:2.50.3
-Requires: gtk+3 >= 3.9.12
+Requires: cinnamon-desktop-libs >= 5.3
+Requires: glib2 >= 1:2.61.1
+Requires: graphene >= 1.9.3
+Requires: gtk+3 >= 3.19.8
Requires: json-glib >= 0.12.0
+Requires: libgudev >= 232
Requires: libwacom >= 0.13
Requires: pango >= 1:1.30
Requires: xorg-lib-libXcomposite >= 0.4
Requires: xorg-lib-libXfixes >= 3
-Requires: xorg-lib-libXi >= 1.6.0
-Requires: xorg-lib-libXrandr >= 1.2
+Requires: xorg-lib-libXi >= 1.7.4
+Requires: xorg-lib-libXrandr >= 1.5.0
%description libs
Muffin shared libraries.
@@ -115,13 +136,16 @@ Summary(pl.UTF-8): Pakiet programistyczny dla
Muffina
Group: X11/Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
Requires: EGL-devel
+Requires: OpenGL-devel
+Requires: OpenGLESv2-devel >= 2.0
Requires: atk-devel >= 1:2.5.3
Requires: cairo-devel >= 1.10
Requires: cairo-gobject-devel >= 1.14.0
-Requires: cinnamon-desktop-devel >= 2.4.0
+Requires: cinnamon-desktop-devel >= 5.3
Requires: gdk-pixbuf2-devel >= 2.0
-Requires: glib2-devel >= 1:2.50.3
-Requires: gtk+3-devel >= 3.9.12
+Requires: glib2-devel >= 1:2.61.1
+Requires: graphene-devel >= 1.9.3
+Requires: gtk+3-devel >= 3.19.8
Requires: json-glib-devel >= 0.12.0
Requires: pango-devel >= 1:1.30
Requires: xorg-lib-libX11-devel
@@ -129,9 +153,10 @@ Requires: xorg-lib-libXcomposite-devel >= 0.4
Requires: xorg-lib-libXdamage-devel
Requires: xorg-lib-libXext-devel
Requires: xorg-lib-libXfixes-devel >= 3
-Requires: xorg-lib-libXi-devel >= 1.6.0
-Requires: xorg-lib-libXrandr-devel >= 1.2
+Requires: xorg-lib-libXi-devel >= 1.7.4
+Requires: xorg-lib-libXrandr-devel >= 1.5.0
Requires: xorg-lib-libXtst-devel
+Obsoletes: muffin-apidocs < 5.8
%description devel
Header files for developing Muffin plugins. Also includes utilities
@@ -141,68 +166,20 @@ for testing Metacity/Muffin themes.
Pliki nagłówkowe do tworzenia wtyczek Muffina. Pakiet zawiera
dodatkowo narzędzia do testowania motywów Metacity/Muffina.
-%package apidocs
-Summary: API documentation for Muffin libraries
-Summary(pl.UTF-8): Dokumentacja API bibliotek Muffina
-Group: Documentation
-BuildArch: noarch
-
-%description apidocs
-API documentation for Muffin libraries.
-
-%description apidocs -l pl.UTF-8
-Dokumentacja API bibliotek Muffina.
-
%prep
%setup -q
-%patch0 -p1
%build
-install -d m4
-%{__glib_gettextize}
-%{__gtkdocize}
-%{__intltoolize}
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-cd cogl
-%{__libtoolize}
-%{__aclocal} -I build/autotools
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-cd ../clutter
-%{__libtoolize}
-%{__aclocal} -I build/autotools
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-cd ..
-%configure \
- ZENITY=%{_bindir}/zenity \
- --disable-silent-rules \
- --disable-static \
- --enable-compile-warnings=minimum \
- --with-html-dir=%{_gtkdocdir}
+%meson build \
+ %{?with_sysprof:-Dprofiler=true} \
+ %{!?with_pipewire:-Dremote_desktop=false} \
-%{__make}
+%ninja_build -C build
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT
-
-# obsoleted by pkg-config
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la \
- $RPM_BUILD_ROOT%{_libdir}/muffin/*.la
-
-# Muffin contains a .desktop file so we just need to validate it
-desktop-file-validate $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
-
-%{__mv} $RPM_BUILD_ROOT%{_gtkdocdir}/{clutter,muffin-clutter}
+%ninja_install -C build
%find_lang %{name}
@@ -220,65 +197,50 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog MAINTAINERS NEWS README
+%doc NEWS README.md
%attr(755,root,root) %{_bindir}/muffin
-%attr(755,root,root) %{_bindir}/muffin-message
-%attr(755,root,root) %{_bindir}/muffin-theme-viewer
-%attr(755,root,root) %{_bindir}/muffin-window-demo
%attr(755,root,root) %{_libexecdir}/muffin-restart-helper
%dir %{_libdir}/muffin/plugins
-%attr(755,root,root) %{_libdir}/muffin/plugins/default.so
+%attr(755,root,root) %{_libdir}/muffin/plugins/libdefault.so
%{_datadir}/glib-2.0/schemas/org.cinnamon.muffin.gschema.xml
-%dir %{_datadir}/muffin
-%dir %{_datadir}/muffin/icons
-%{_datadir}/muffin/icons/muffin-window-demo.png
-%dir %{_datadir}/muffin/theme
-%{_datadir}/muffin/theme/metacity-theme-3.xml
+%{_datadir}/glib-2.0/schemas/org.cinnamon.muffin.wayland.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.cinnamon.muffin.x11.gschema.xml
%{_desktopdir}/muffin.desktop
%{_mandir}/man1/muffin.1*
-%{_mandir}/man1/muffin-message.1*
-%{_mandir}/man1/muffin-theme-viewer.1*
-%{_mandir}/man1/muffin-window-demo.1*
%files libs
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libmuffin.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libmuffin.so.0
-%attr(755,root,root) %{_libdir}/muffin/libmuffin-clutter-0.so
-%attr(755,root,root) %{_libdir}/muffin/libmuffin-cogl-0.so
-%attr(755,root,root) %{_libdir}/muffin/libmuffin-cogl-pango-0.so
-%attr(755,root,root) %{_libdir}/muffin/libmuffin-cogl-path-0.so
+%attr(755,root,root) %{_libdir}/muffin/libmuffin-clutter-0.so.*
+%attr(755,root,root) %{_libdir}/muffin/libmuffin-cogl-0.so.*
+%attr(755,root,root) %{_libdir}/muffin/libmuffin-cogl-pango-0.so.*
+%attr(755,root,root) %{_libdir}/muffin/libmuffin-cogl-path-0.so.*
%dir %{_libdir}/muffin
%{_libdir}/muffin/Cally-0.typelib
%{_libdir}/muffin/Clutter-0.typelib
%{_libdir}/muffin/ClutterX11-0.typelib
%{_libdir}/muffin/Cogl-0.typelib
%{_libdir}/muffin/CoglPango-0.typelib
-%{_libdir}/muffin/Meta-Muffin.0.typelib
+%{_libdir}/muffin/Meta-0.typelib
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libmuffin.so
-%attr(755,root,root) %{_libdir}/libmuffin-clutter-0.so
-%attr(755,root,root) %{_libdir}/libmuffin-cogl-0.so
-%attr(755,root,root) %{_libdir}/libmuffin-cogl-pango-0.so
-%attr(755,root,root) %{_libdir}/libmuffin-cogl-path-0.so
+%attr(755,root,root) %{_libdir}/muffin/libmuffin-clutter-0.so
+%attr(755,root,root) %{_libdir}/muffin/libmuffin-cogl-0.so
+%attr(755,root,root) %{_libdir}/muffin/libmuffin-cogl-pango-0.so
+%attr(755,root,root) %{_libdir}/muffin/libmuffin-cogl-path-0.so
%{_libdir}/muffin/Cally-0.gir
%{_libdir}/muffin/Clutter-0.gir
%{_libdir}/muffin/ClutterX11-0.gir
%{_libdir}/muffin/Cogl-0.gir
%{_libdir}/muffin/CoglPango-0.gir
-%{_libdir}/muffin/Meta-Muffin.0.gir
+%{_libdir}/muffin/Meta-0.gir
%{_includedir}/muffin
-%{_pkgconfigdir}/libmuffin.pc
+%{_pkgconfigdir}/libmuffin-0.pc
%{_pkgconfigdir}/muffin-clutter-0.pc
%{_pkgconfigdir}/muffin-clutter-x11-0.pc
%{_pkgconfigdir}/muffin-cogl-0.pc
%{_pkgconfigdir}/muffin-cogl-pango-0.pc
%{_pkgconfigdir}/muffin-cogl-path-0.pc
-%{_pkgconfigdir}/muffin-plugins.pc
-
-%files apidocs
-%defattr(644,root,root,755)
-%{_gtkdocdir}/muffin
-%{_gtkdocdir}/muffin-clutter
diff --git a/muffin-gir.patch b/muffin-gir.patch
deleted file mode 100644
index 81fd69f..0000000
--- a/muffin-gir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- muffin-4.6.0/src/Makefile.am.orig 2020-05-15 22:05:25.908877961 +0200
-+++ muffin-4.6.0/src/Makefile.am 2020-05-15 22:06:05.885328057 +0200
-@@ -282,7 +282,7 @@
- muffin-enum-types.h \
- $(libmuffininclude_base_headers) \
- $(filter %.c,$(libmuffin_la_SOURCES))
--@META_GIR@_SCANNERFLAGS = $(WARN_SCANNERFLAGS) --warn-all --warn-error
--identifier-prefix=Meta
-+@META_GIR@_SCANNERFLAGS = $(WARN_SCANNERFLAGS) --warn-all
--identifier-prefix=Meta
-
- endif
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/muffin.git/commitdiff/105d14a18eebc6eb6f0b6ffee3a69ee1bad55fce
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
