Compare commits

..

10 Commits

4 changed files with 127 additions and 58 deletions

View File

@ -0,0 +1,10 @@
--- mutter-3.18.2/src/backends/meta-cursor-renderer.c.orig 2015-12-13 13:57:50.161557488 +0100
+++ mutter-3.18.2/src/backends/meta-cursor-renderer.c 2015-12-13 13:56:43.415124424 +0100
@@ -33,6 +33,7 @@
#include <clutter/clutter.h>
#include "meta-stage.h"
+#include <math.h>
struct _MetaCursorRendererPrivate
{

View File

@ -0,0 +1,11 @@
--- mutter-3.20.3/src/core/startup-notification.c.orig 2016-07-08 23:09:06.728564374 +0200
+++ mutter-3.20.3/src/core/startup-notification.c 2016-07-08 23:09:56.925482612 +0200
@@ -418,7 +418,7 @@
elapsed = ctod->now - timestamp;
meta_topic (META_DEBUG_STARTUP,
- "Sequence used %ld ms vs. %d max: %s\n",
+ "Sequence used %lld ms vs. %d max: %s\n",
elapsed, STARTUP_TIMEOUT,
meta_startup_notification_sequence_get_id (sequence));

View File

@ -0,0 +1,11 @@
--- mutter-3.28.3/src/backends/meta-input-settings.c.orig 2018-08-16 10:52:09.588761885 +0200
+++ mutter-3.28.3/src/backends/meta-input-settings.c 2018-08-16 10:52:24.214825217 +0200
@@ -1299,7 +1299,7 @@
}
else
{
- path = g_strdup_printf ("/org/gnome/desktop/peripherals/stylus/%lx/", serial);
+ path = g_strdup_printf ("/org/gnome/desktop/peripherals/stylus/%llx/", serial);
}
tool_settings =

View File

@ -1,6 +1,6 @@
%define majver %(echo %version | cut -d. -f1-2)
Name: mutter
Version: 3.16.3
Version: 3.32.2
Release: 1mamba
Summary: A compositing window manager based on Metacity
Group: Graphical Desktop/Libraries/GNOME
@ -12,60 +12,52 @@ Source: ftp://ftp.gnome.org/pub/gnome/sources/mutter/%{majver}/mutter-%{v
Patch0: mutter-3.14.1-gcc-4.9.patch
Patch1: mutter-3.14.2-build-fix-x86.patch
Patch2: mutter-3.16.1.1-gcc-4.9.2.patch
Patch3: mutter-3.18.2-missing_math_header.patch
Patch4: mutter-3.20.3-x86-longlong.patch
Patch5: mutter-3.28.3-x86-printf-llx-type.patch
License: GPL
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
BuildRequires: gnome-desktop-devel
BuildRequires: gobject-introspection-devel
BuildRequires: gsettings-desktop-schemas-devel
BuildRequires: libEGL-devel
BuildRequires: libGL-devel
BuildRequires: libGLESv2-devel
BuildRequires: libICE-devel
BuildRequires: libSM-devel
BuildRequires: libX11-devel
BuildRequires: libXau-devel
BuildRequires: libXcomposite-devel
BuildRequires: libXcursor-devel
BuildRequires: libXdamage-devel
BuildRequires: libXdmcp-devel
BuildRequires: libXext-devel
BuildRequires: libXfixes-devel
BuildRequires: libXi-devel
BuildRequires: libXinerama-devel
BuildRequires: libXrandr-devel
BuildRequires: libXrender-devel
BuildRequires: libXtst-devel
BuildRequires: libatk-devel
BuildRequires: libbzip2-devel
BuildRequires: libcairo-devel
BuildRequires: libcanberra-devel
BuildRequires: libclutter-devel
BuildRequires: libcogl-devel
BuildRequires: libdrm-devel
BuildRequires: libexpat-devel
BuildRequires: libffi-devel
BuildRequires: libfontconfig-devel
BuildRequires: libfreetype-devel
BuildRequires: libgbm-devel
BuildRequires: libgdk-pixbuf-devel
BuildRequires: libglib-devel
BuildRequires: libgraphite2-devel
BuildRequires: libgtk-devel
BuildRequires: libharfbuzz-devel
BuildRequires: libgudev-devel
BuildRequires: libinput-devel
BuildRequires: libjson-glib-devel
BuildRequires: libltdl-devel
BuildRequires: libogg-devel
BuildRequires: libpango-devel
BuildRequires: libpng-devel
BuildRequires: libselinux-devel
BuildRequires: libpipewire-devel
BuildRequires: libstartup-notification-devel
BuildRequires: libtdb-devel
BuildRequires: libuuid-devel
BuildRequires: libvorbis-devel
BuildRequires: libsystemd-devel
BuildRequires: libudev-devel
BuildRequires: libwacom-devel
BuildRequires: libwayland-devel
BuildRequires: libxcb-devel
BuildRequires: libxkbcommon-devel
BuildRequires: libxkbfile-devel
BuildRequires: libxkbcommon-devel
BuildRequires: libz-devel
BuildRequires: upower-devel
## AUTOBUILDREQ-END
BuildRequires: libcogl-devel >= 1.18
BuildRequires: libgnome-desktop-devel >= %{majver}
@ -87,8 +79,7 @@ This package contains shared libraries for %{name}.
Group: Development/Libraries
Summary: Development files for %{name}
Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
## note: you can add this requirement if .pc files are provided by this package
#Requires: pkg-config
Requires: pkg-config
%description -n lib%{name}-devel
This package contains libraries and header files for developing applications that use %{name}.
@ -107,20 +98,22 @@ This package includes the %{name} API documentation.
%prep
%setup -q
#%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
%configure \
#%patch1 -p1
#%patch2 -p1
#%patch3 -p1
#%patch4 -p1
%ifnarch x86_64
CFLAGS="-Wno-error=sign-compare"
%patch5 -p1
%endif
%make
%build
%meson
%meson_build
%install
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
%makeinstall
%meson_install
%find_lang %{name} || touch %{name}.lang
@ -144,50 +137,94 @@ fi
%files -f %{name}.lang
%defattr(-,root,root)
%{_bindir}/mutter
#%{_bindir}/mutter-message
#%{_bindir}/mutter-theme-viewer
#%{_bindir}/mutter-window-demo
%{_datadir}/applications/mutter.desktop
%{_datadir}/applications/mutter-wayland.desktop
#%{_datadir}/mutter/icons/mutter-window-demo.png
%{_datadir}/GConf/gsettings/mutter-schemas.convert
%{_datadir}/glib-2.0/schemas/org.gnome.mutter.wayland.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.mutter.gschema.xml
%{_datadir}/gnome-control-center/keybindings/50-mutter-*.xml
#%{_datadir}/gnome/wm-properties/mutter-wm.desktop
#%{_mandir}/man1/mutter-message.1.gz
#%{_mandir}/man1/mutter-theme-viewer.1.gz
#%{_mandir}/man1/mutter-window-demo.1.gz
%{_mandir}/man1/mutter.1*
%files -n lib%{name}
%defattr(-,root,root)
%{_libdir}/libmutter.so.*
%dir %{_libdir}/mutter
%dir %{_libdir}/mutter/plugins
%{_libdir}/mutter/plugins/default.so
%{_libdir}/mutter/Meta-3.0.typelib
%{_libdir}/libmutter-4.so.*
%dir %{_libdir}/mutter-4
%{_libdir}/mutter-4/libmutter-*-4.so.*
%dir %{_libdir}/mutter-4/plugins
%{_libdir}/mutter-4/plugins/libdefault.so
%{_libdir}/mutter-4/*.typelib
%{_libdir}/mutter-4/libmutter-*.so
%{_libexecdir}/mutter-restart-helper
%doc COPYING
%files -n lib%{name}-devel
%defattr(-,root,root)
%dir %{_includedir}/mutter
%dir %{_includedir}/mutter/meta
%{_includedir}/mutter/meta/*.h
#%{_libdir}/libmutter.a
%{_libdir}/libmutter.la
%{_libdir}/libmutter.so
%{_libdir}/mutter/Meta-3.0.gir
%{_libdir}/pkgconfig/libmutter.pc
#%{_libdir}/pkgconfig/mutter-plugins.pc
%dir %{_includedir}/mutter-4
%{_includedir}/mutter-4/*
%{_libdir}/libmutter-4.so
%{_libdir}/pkgconfig/libmutter-4.pc
%{_libdir}/pkgconfig/mutter-clutter-4.pc
%{_libdir}/pkgconfig/mutter-clutter-x11-4.pc
%{_libdir}/pkgconfig/mutter-cogl-4.pc
%{_libdir}/pkgconfig/mutter-cogl-pango-4.pc
%{_libdir}/pkgconfig/mutter-cogl-path-4.pc
%{_libdir}/pkgconfig/mutter-cogl-gles2-4.pc
%{_libdir}/mutter-4/*.gir
%dir %{_libexecdir}/installed-tests/mutter-4
%{_libexecdir}/installed-tests/mutter-4/*
%dir %{_datadir}/installed-tests/mutter-4
%{_datadir}/installed-tests/mutter-4/*.test
%dir %{_datadir}/mutter-4/tests
%dir %{_datadir}/mutter-4/tests/stacking
%{_datadir}/mutter-4/tests/stacking/*
%doc NEWS
%files apidocs
%defattr(-,root,root)
%{_datadir}/gtk-doc/html/meta/*
#%files apidocs
#%defattr(-,root,root)
#%{_datadir}/gtk-doc/html/meta/*
%changelog
* Sat Jul 06 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 3.32.2-1mamba
- update to 3.32.2
* Wed Nov 14 2018 Automatic Build System <autodist@mambasoft.it> 3.30.2-1mamba
- automatic version update by autodist
* Tue Oct 09 2018 Automatic Build System <autodist@mambasoft.it> 3.30.1-1mamba
- automatic version update by autodist
* Sun Sep 23 2018 Automatic Build System <autodist@mambasoft.it> 3.30.0-1mamba
- automatic version update by autodist
* Sun Aug 12 2018 Silvan Calarco <silvan.calarco@mambasoft.it> 3.28.3-1mamba
- update to 3.28.3
* Mon Aug 14 2017 Automatic Build System <autodist@mambasoft.it> 3.24.4-1mamba
- automatic version update by autodist
* Fri Mar 03 2017 Automatic Build System <autodist@mambasoft.it> 3.22.3-1mamba
- automatic version update by autodist
* Fri Nov 11 2016 Automatic Build System <autodist@mambasoft.it> 3.22.2-1mamba
- automatic version update by autodist
* Tue Oct 18 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 3.22.1-2mamba
- move %{_libdir}/mutter plugin libraries from -devel to lib- package
* Mon Oct 17 2016 Automatic Build System <autodist@mambasoft.it> 3.22.1-1mamba
- automatic version update by autodist
* Wed Jun 29 2016 Automatic Build System <autodist@mambasoft.it> 3.20.3-1mamba
- automatic version update by autodist
* Mon May 16 2016 Automatic Build System <autodist@mambasoft.it> 3.20.2-1mamba
- automatic version update by autodist
* Sun Mar 06 2016 Automatic Build System <autodist@mambasoft.it> 3.18.3-1mamba
- automatic version update by autodist
* Mon Nov 23 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 3.18.2-1mamba
- update to 3.18.2
* Thu Jul 02 2015 Automatic Build System <autodist@mambasoft.it> 3.16.3-1mamba
- automatic version update by autodist