diff --git a/_service b/_service
new file mode 100644
index 0000000..acf37f9
--- /dev/null
+++ b/_service
@@ -0,0 +1,15 @@
+
+
+ git://git.gnome.org/mutter
+ git
+ gnome-3-26
+ 3.26.2+%cd.%h
+ enable
+
+
+ *.tar
+ xz
+
+
+
+
diff --git a/_servicedata b/_servicedata
new file mode 100644
index 0000000..95ed0d5
--- /dev/null
+++ b/_servicedata
@@ -0,0 +1,4 @@
+
+
+ git://git.gnome.org/mutter
+ 0bd1d7cf09be046d6a698fde88540bfb8cbc78e7
\ No newline at end of file
diff --git a/mutter-3.26.2+20171231.0bd1d7cf0.tar.xz b/mutter-3.26.2+20171231.0bd1d7cf0.tar.xz
new file mode 100644
index 0000000..23d111e
--- /dev/null
+++ b/mutter-3.26.2+20171231.0bd1d7cf0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:db528068e2beaf363a0d89c777be09a493429e9107d34983f52bdb5c08c882e0
+size 2833772
diff --git a/mutter-3.26.2.tar.xz b/mutter-3.26.2.tar.xz
deleted file mode 100644
index 6228010..0000000
--- a/mutter-3.26.2.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:83309feb05a4635c47713665c0592af8ab6d7f17a36e4bd626d67609b6422fab
-size 3622904
diff --git a/mutter.changes b/mutter.changes
index 89d2cc5..0dce8ed 100644
--- a/mutter.changes
+++ b/mutter.changes
@@ -1,3 +1,32 @@
+-------------------------------------------------------------------
+Thu Jan 04 20:35:43 UTC 2018 - zaitor@opensuse.org
+
+- Update to version 3.26.2+20171231.0bd1d7cf0:
+ + Revert "window: Raise and lower tile match in tandem".
+ + wayland: Only send full sequences of touch events to clients.
+ + stage: Push framebuffer before setting up viewport.
+ + keybindings: Only add multiple keycodes from the same level.
+ + wayland-outputs: Delay wl_output destruction.
+ + monitor-manager-kms:
+ - Fix recently introduced build issue.
+ - poll() on KMS fd on EAGAIN.
+ + compositor: reset top_window_actor and remove it from windows
+ when destroyed.
+ + monitor-manager: Compare keys when checking whether a config is
+ complete.
+ + Updated translations.
+- Switch to git-checkout via source services.
+- Following the above, add intltool and libtool BuildRequires and
+ pass autogen.sh to bootstrap the generated tarball.
+- Pkgconfigy the BuildRequires, replace:
+ gobject-introspection-devel, libSM-devel, libX11-devel and
+ libXinerama-devel with pkgconfig(gobject-introspection-1.0),
+ pkgconfig(sm), pkgconfig(x11) and pkgconfig(xinerama).
+- Drop update-desktop-files BuildRequires and stop using
+ suse_update_desktop_file macro, no longer needed.
+- Drop pkgconfig(gbm) BuildRequires listed twice.
+- Run spec-cleaner, modernize spec, use make_build macro.
+
-------------------------------------------------------------------
Sat Nov 4 02:03:57 UTC 2017 - luc14n0@linuxmail.org
diff --git a/mutter.spec b/mutter.spec
index da99227..be33331 100644
--- a/mutter.spec
+++ b/mutter.spec
@@ -1,7 +1,7 @@
#
# spec file for package mutter
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,13 +17,15 @@
Name: mutter
-Version: 3.26.2
+Version: 3.26.2+20171231.0bd1d7cf0
Release: 0
Summary: Window and compositing manager based on Clutter
License: GPL-2.0+
Group: System/GUI/GNOME
-Url: https://www.gnome.org
-Source: https://download.gnome.org/sources/mutter/3.26/%{name}-%{version}.tar.xz
+URL: https://www.gnome.org
+#Source0: https://download.gnome.org/sources/mutter/3.26/%%{name}-%%{version}.tar.xz
+Source: %{name}-%{version}.tar.xz
+
# PATCH-FIX-UPSTREAM mutter-fix-startup.patch bgo#768531 zaitor@opensuse.org -- Fix slow startup notification on wayland
Patch0: mutter-fix-startup.patch
# PATCH-FEATURE-UPSTREAM mutter-iconcache-Support-RGB16_565-format-for-16-bit-color-.patch FATE#323412 bgo#781704 bsc#1024748 vliaskovitis@suse.com -- iconcache: Support RGB16_565 format for 16-bit sessions
@@ -36,32 +38,38 @@ Patch1000: mutter-SLE-bell.patch
Patch1001: mutter-SLE-relax-some-constraints-on-CSD-windows.patch
# PATCH-FIX-UPSTREAM mutter-SLE-bsc984738-grab-display.patch bsc#984738 bgo#769387 hpj@suse.com -- Revert a upstream commit to avoid X11 race condition that results in wrong dialog sizes.
Patch1002: mutter-SLE-bsc984738-grab-display.patch
+
BuildRequires: fdupes
-BuildRequires: gobject-introspection-devel >= 0.9.5
-BuildRequires: libSM-devel
-BuildRequires: libX11-devel
-BuildRequires: libXinerama-devel
+BuildRequires: intltool
+BuildRequires: libtool
BuildRequires: pkgconfig
-BuildRequires: update-desktop-files
BuildRequires: zenity
BuildRequires: pkgconfig(cairo) >= 1.10.0
BuildRequires: pkgconfig(egl)
-BuildRequires: pkgconfig(gbm)
+BuildRequires: pkgconfig(gbm) >= 10.3
BuildRequires: pkgconfig(gio-unix-2.0) >= 2.53.2
BuildRequires: pkgconfig(glesv2)
BuildRequires: pkgconfig(gnome-desktop-3.0)
+BuildRequires: pkgconfig(gobject-introspection-1.0) >= 0.9.5
BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.19.3
BuildRequires: pkgconfig(gtk+-3.0) >= 3.19.7
+BuildRequires: pkgconfig(gudev-1.0) >= 232
BuildRequires: pkgconfig(json-glib-1.0)
BuildRequires: pkgconfig(libcanberra-gtk3)
+BuildRequires: pkgconfig(libdrm)
BuildRequires: pkgconfig(libinput)
# Not available in openSUSE yet
# BuildRequires: pkgconfig(libpipewire-0.1)
BuildRequires: pkgconfig(libstartup-notification-1.0)
+BuildRequires: pkgconfig(libsystemd)
BuildRequires: pkgconfig(libudev) >= 136
BuildRequires: pkgconfig(libwacom)
BuildRequires: pkgconfig(pango) >= 1.2.0
+BuildRequires: pkgconfig(sm)
BuildRequires: pkgconfig(upower-glib) >= 0.99.0
+BuildRequires: pkgconfig(wayland-protocols) >= 1.9
+BuildRequires: pkgconfig(wayland-server) >= 1.13.0
+BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(x11-xcb)
BuildRequires: pkgconfig(xcb-randr)
BuildRequires: pkgconfig(xcomposite) >= 0.2
@@ -70,6 +78,7 @@ BuildRequires: pkgconfig(xdamage)
BuildRequires: pkgconfig(xext)
BuildRequires: pkgconfig(xfixes)
BuildRequires: pkgconfig(xi)
+BuildRequires: pkgconfig(xinerama)
BuildRequires: pkgconfig(xkbcommon) >= 0.4.3
BuildRequires: pkgconfig(xkbcommon-x11)
BuildRequires: pkgconfig(xkbfile)
@@ -85,12 +94,6 @@ Obsoletes: typelib-1_0-Meta-3_0
%if !0%{?is_opensuse}
BuildRequires: translation-update-upstream
%endif
-BuildRequires: pkgconfig(gbm) >= 10.3
-BuildRequires: pkgconfig(gudev-1.0) >= 232
-BuildRequires: pkgconfig(libdrm)
-BuildRequires: pkgconfig(libsystemd)
-BuildRequires: pkgconfig(wayland-protocols) >= 1.9
-BuildRequires: pkgconfig(wayland-server) >= 1.13.0
%description
Mutter is a window and compositing manager based on Clutter, forked
@@ -148,28 +151,28 @@ translation-update-upstream
%build
# FIXME add --enable-remote-desktop when libpipewire-0.1 is available
+NOCONFIGURE=1 ./autogen.sh
%configure \
- --enable-wayland \
- --enable-native-backend \
- --disable-static \
- --enable-egl-device \
- --enable-compile-warnings=maximum
-make %{?_smp_mflags}
+ --enable-wayland \
+ --enable-native-backend \
+ --disable-static \
+ --enable-egl-device \
+ --enable-compile-warnings=maximum \
+ %{nil}
+%make_build
%install
%make_install
find %{buildroot}%{_libdir} -type f -name '*.la' -delete -print
-%suse_update_desktop_file %{name}
%find_lang %{name} %{?no_lang_C}
%fdupes %{buildroot}%{_prefix}
%post -n libmutter-1-0 -p /sbin/ldconfig
-
%postun -n libmutter-1-0 -p /sbin/ldconfig
%files
-%defattr (-, root, root)
-%doc COPYING NEWS
+%license COPYING
+%doc NEWS
%{_mandir}/man1/mutter.1%{?ext_man}
%{_bindir}/mutter
# These so files are not split out since they are private to mutter
@@ -186,27 +189,24 @@ find %{buildroot}%{_libdir} -type f -name '*.la' -delete -print
%{_libdir}/mutter/Clutter-1.typelib
%{_libdir}/mutter/ClutterX11-1.typelib
%{_libdir}/mutter/Cogl-1.typelib
-#{_libdir}/mutter/Cogl-2.0.typelib
%{_libdir}/mutter/CoglPango-1.typelib
-#{_libdir}/mutter/CoglPango-2.0.typelib
%{_libdir}/mutter/Meta-1.typelib
#
%files -n libmutter-1-0
-%defattr(-,root,root)
%{_libdir}/libmutter-1.so.*
%dir %{_libdir}/mutter/
# users of libmutter need this directory
%dir %{_libdir}/mutter/plugins/
%files data
-%defattr(-,root,root)
# Do not depend on g-c-c just for a directory
%dir %{_datadir}/gnome-control-center
%dir %{_datadir}/gnome-control-center/keybindings
%{_datadir}/gnome-control-center/keybindings/50-mutter-windows.xml
%{_datadir}/gnome-control-center/keybindings/50-mutter-navigation.xml
%{_datadir}/gnome-control-center/keybindings/50-mutter-system.xml
+%{_datadir}/gnome-control-center/keybindings/50-mutter-wayland.xml
%{_datadir}/GConf/gsettings/mutter-schemas.convert
%{_datadir}/glib-2.0/schemas/org.gnome.mutter.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.mutter.wayland.gschema.xml
@@ -214,7 +214,6 @@ find %{buildroot}%{_libdir} -type f -name '*.la' -delete -print
%files lang -f %{name}.lang
%files devel
-%defattr(-,root,root)
%{_includedir}/mutter/
%{_libdir}/libmutter-1.so
%{_libdir}/mutter/Meta-1.gir
@@ -222,9 +221,7 @@ find %{buildroot}%{_libdir} -type f -name '*.la' -delete -print
%{_libdir}/mutter/Clutter-1.gir
%{_libdir}/mutter/ClutterX11-1.gir
%{_libdir}/mutter/Cogl-1.gir
-#{_libdir}/mutter/Cogl-2.0.gir
%{_libdir}/mutter/CoglPango-1.gir
-#{_libdir}/mutter/CoglPango-2.0.gir
%{_libdir}/pkgconfig/libmutter-1.pc
%{_libdir}/pkgconfig/mutter-clutter-1.pc
%{_libdir}/pkgconfig/mutter-clutter-x11-1.pc