Accepting request 429128 from GNOME:Factory

New stable (forwarded request 428856 from Zaitor)

OBS-URL: https://build.opensuse.org/request/show/429128
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mutter?expand=0&rev=94

mutter-3.20.3.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:142c5271df4bde968c725ed09026173292c07b4dd7ba75f19c4b14fc363af916
-size 1488396

mutter-3.22.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a5acdde788f5d137ec6dfe218a214c1f6cfb7e2e851fbcebe0b2d67b4c96e5f3
+size 3531916

mutter.changes

@@ -1,5 +1,154 @@
 -------------------------------------------------------------------
-Sat Jul 30 03:45:15 CEST 2016 - hpj@suse.com
+Mon Sep 19 22:51:36 UTC 2016 - zaitor@opensuse.org
+
+- Update to version 3.22.0:
+  + Fix wayland crashes (bgo#771305, bgo#771345, bgo#770940,
+    bgo#771495).
+  + Fix display rotation on wayland (bgo#770672).
+  + Fix framebuffer capture origin offset (bgo#771502).
+  + Misc. bug fixes (bgo#770937, bgo#771536, bgo#771628,
+    bgo#771549).
+  + Updated translations.
+- Only apply mutter-bsc984738-grab-display.patch for SLE until it
+  can be verified that it's needed for 3.22.x too.
+
+-------------------------------------------------------------------
+Tue Sep 13 20:30:58 UTC 2016 - zaitor@opensuse.org
+
+- Update to version 3.21.92:
+  + Fix absolute pointer motion events on wayland (bgo#770557).
+  + Default to using stage views (bgo#770366).
+  + Fix animated cursors on wayland (bgo#749913).
+  + Fix various crashes on wayland (bgo#757568, bgo#770727,
+    bgo#770992).
+  + Fix screen capture for stage views not at (0, 0) (bgo#770127).
+  + Compress motion events instead of discarding them (bgo#771049).
+  + Fix XWayland pointer warp emulation (bgo#771050).
+  + Add common monitor modes in KMS backend (bgo#744544).
+  + Temporarily use g-s-d schemas for tablet configuration
+    (bgo#771315).
+  + Misc. bug fixes: bgo#770402, bgo#770647, bgo#770991,
+    bgo#770994, bgo#770929.
+  + Updated translations.
+
+-------------------------------------------------------------------
+Tue Aug 30 10:54:29 UTC 2016 - zaitor@opensuse.org
+
+- Update to version 3.21.91:
+  + Add support for xdg-foreign protocol (bgo#769786).
+  + Support monitor rotation on wayland (bgo#745079).
+  + Port xdg-shell implementation to unstable v6 (bgo#769936).
+  + Handle unsupported buffer sizes more gracefully (bgo#770387).
+  + Use the same output naming logic as the X server on wayland
+    (bgo#770338).
+  + Fix replies in gnome-shell's chat notifications on wayland
+    (bgo#758167).
+  + Misc. bug fixes and cleanups: bgo#769276, bgo#769636,
+    bgo#770131, bgo#770324, bgo#769731.
+  + Updated translations.
+
+-------------------------------------------------------------------
+Fri Aug 19 22:03:16 UTC 2016 - zaitor@opensuse.org
+
+- Update to version 3.21.90:
+  + Consider XDG_SESSION_TYPE when determining session type
+    (bgo#759388).
+  + Re-add support for edge scrolling on some touchpads
+    (bgo#768245).
+  + Support mouse and trackball acceleration profile (bgo#769179).
+  + Draw monitor contentn to individual framebuffer (bgo#768976).
+  + Support virtual input devices (bgo#765009).
+  + Set correct output scale on hotplug (bgo#769505).
+  + Bugs fixed: bgo#769014, bgo#769024, bgo#769054, bgo#769070,
+    bgo#769036, bgo#769305, bgo#769578, bgo#769800, bgo#769073.
+- Drop mutter-32bit-cogl-gles2-conflict-def.patch: Fixed upstream.
+- Drop intltool BuildRequires following upstream changes.
+
+-------------------------------------------------------------------
+Thu Aug 18 19:07:19 UTC 2016 - zaitor@opensuse.org
+
+- Obsolete typelib-1_0-Meta-3_0 to ease updates.
+
+-------------------------------------------------------------------
+Wed Aug 17 20:43:03 UTC 2016 - dimstar@opensuse.org
+
+- Filter out private typelib provides. Providing those only breaks
+  other applications, as they won't be able to find our typelibs.
+
+-------------------------------------------------------------------
+Sun Aug  7 11:08:59 UTC 2016 - zaitor@opensuse.org
+
+- Drop typelib-1_0-Meta-3_0 subpackage, and package typelib in main
+  package with the other private libs. Following this, drop
+  typelib-1_0-Meta-3_0 Requires from devel package.
+
+-------------------------------------------------------------------
+Sat Jul 30 03:45:19 UTC 2016 - badshah400@gmail.com
+
+- Update to version 3.21.4:
+  + Fix missing frame border around GTK+ dialogs (bgo#745060).
+  + Improve X11 <-> wayland copy and paste interaction (bgo#768007).
+  + Add support for NV_robustness_video_memory_purge extension
+    (bgo#739178).
+  + Fix restoring the old focused window on restart (bgo#766243).
+  + Fix fullscreen windows on other monitors stealing focus after
+    closing a window (bgo#768221).
+  + Draw monitor content to individual framebuffer (bgo#768976).
+  + Provide screen capture API (bgo#768978).
+  + Bugs fixed: bgo#767969, bgo#768243, bgo#762407, bgo#767997,
+    bgo#768039, bgo#768977, bgo#768977.
+  + Updated translations.
+- Fix build on i586 with patch
+  mutter-32bit-cogl-gles2-conflict-def.patch taken from upstream
+  git (bgo#769014).
+
+-------------------------------------------------------------------
+Sat Jul 30 03:45:18 UTC 2016 - zaitor@opensuse.org
+
+- Update to version 3.21.3:
+  + Don't create invalid UTF-8 window description strings
+    (bgo#765535).
+  + Convert window titles and wm_class to UTF-8 (bgo#752788).
+  + Communicate tiled state to GTK+ on wayland (bgo#766860).
+  + Use kill() to force-quit unresponsive wayland clients
+    (bgo#767464).
+  + Fix window position when unmaximizing via DND on wayland
+    (bgo#764180).
+  + Avoid full window redraws when using extended frame sync
+    (bgo#767798).
+
+-------------------------------------------------------------------
+Sat Jul 30 03:45:17 UTC 2016 - zaitor@opensuse.org
+
+- Update to version 3.21.2:
+  + Clean up surface <-> shell interaction (bgo#763431).
+  + Fix grabbing random keys for disabled shortcuts (bgo#766270).
+  + Fix stacking of hidden windows on wayland (bgo#764844).
+  + Misc. bug fixes: bgo#766306, bgo#766326, bgo#751847,
+    bgo#763832, bgo#766528.
+  + Updated translations.
+
+-------------------------------------------------------------------
+Sat Jul 30 03:45:16 UTC 2016 - zaitor@opensuse.org
+
+- Update to version 3.21.1:
+  + Notify clients of pending modifier state changes (bgo#748526).
+  + Add get_is_builtin_display_on() method (bgo#765267).
+  + Fix 2-finger titlebar taps on wayland (bgo#764519).
+  + Merge clutter and cogl forks into mutter (bgo#760439).
+  + Misc. bug fixes: bgo#765058, bgo#765252, bgo#765062.
+  + Updated translations.
+- Drop pkgconfig(clutter-1.0), pkgconfig(cogl-1.0),
+  pkgconfig(clutter-egl-1.0), pkgconfig(clutter-wayland-1.0),
+  pkgconfig(clutter-wayland-compositor-1.0) BuildRequires:
+  Following upstream merging of clutter and cogl into mutter.
+- Add pkgconfig(json-glib-1.0) BuildRequires: New dependency.
+- Drop an obsolete clean section.
+- Remove mutter-tools Obsoletes: We dropped the package in version
+  3.9.90, no support for updates from openSUSE versions that old.
+
+-------------------------------------------------------------------
+Sat Jul 30 03:45:15 UTC 2016 - hpj@suse.com
 
 - Add mutter-bsc984738-grab-display.patch (bsc#984738, bgo#769387).
 

mutter.spec

@@ -22,14 +22,16 @@
 %bcond_without wayland
 %endif
 
+%global __provides_exclude_from ^%{_libdir}/mutter/.*.typelib$
+
 Name:           mutter
-Version:        3.20.3
+Version:        3.22.0
 Release:        0
 Summary:        Window and compositing manager based on Clutter
 License:        GPL-2.0+
 Group:          System/GUI/GNOME
 Url:            http://www.gnome.org
-Source:         http://download.gnome.org/sources/mutter/3.20/%{name}-%{version}.tar.xz
+Source:         http://download.gnome.org/sources/mutter/3.22/%{name}-%{version}.tar.xz
 # PATCH-FEATURE-SLE mutter-bell.patch FATE#316042 bnc#889218 idonmez@suse.com -- make audible bell work out of the box.
 Patch1:         mutter-bell.patch
 # PATCH-FIX-SLE relax-some-constraints-on-CSD-windows-in-sle-classic.patch bnc#883491 cxiong@suse.com -- Relax some constraints on window positioning for CSD windows s.t. they can be placed at the very top of the monitor.
@@ -38,7 +40,6 @@ Patch2:         relax-some-constraints-on-CSD-windows-in-sle-classic.patch
 Patch3:         mutter-bsc984738-grab-display.patch
 BuildRequires:  fdupes
 BuildRequires:  gobject-introspection-devel >= 0.9.5
-BuildRequires:  intltool
 BuildRequires:  libSM-devel
 BuildRequires:  libX11-devel
 BuildRequires:  libXinerama-devel
@@ -48,12 +49,11 @@ BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
 BuildRequires:  zenity
 BuildRequires:  pkgconfig(cairo) >= 1.10.0
-BuildRequires:  pkgconfig(clutter-1.0) >= 1.25.6
-BuildRequires:  pkgconfig(cogl-1.0) >= 1.17.1
 BuildRequires:  pkgconfig(gio-unix-2.0) >= 2.25.10
 BuildRequires:  pkgconfig(gnome-desktop-3.0)
 BuildRequires:  pkgconfig(gsettings-desktop-schemas) >= 3.19.3
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.19.7
+BuildRequires:  pkgconfig(json-glib-1.0)
 BuildRequires:  pkgconfig(libcanberra-gtk3)
 BuildRequires:  pkgconfig(libstartup-notification-1.0)
 BuildRequires:  pkgconfig(pango) >= 1.2.0
@@ -73,22 +73,19 @@ BuildRequires:  pkgconfig(xkeyboard-config)
 BuildRequires:  pkgconfig(xrandr) >= 1.5.0
 BuildRequires:  pkgconfig(xrender)
 %if %{with wayland}
-BuildRequires:  pkgconfig(clutter-egl-1.0)
-BuildRequires:  pkgconfig(clutter-wayland-1.0)
-BuildRequires:  pkgconfig(clutter-wayland-compositor-1.0)
 BuildRequires:  pkgconfig(gbm) >= 10.3
 BuildRequires:  pkgconfig(gudev-1.0)
 BuildRequires:  pkgconfig(libdrm)
 BuildRequires:  pkgconfig(libinput)
 BuildRequires:  pkgconfig(libsystemd)
-BuildRequires:  pkgconfig(wayland-protocols) >= 1.0
+BuildRequires:  pkgconfig(wayland-protocols) >= 1.7
 BuildRequires:  pkgconfig(wayland-server) >= 1.4.93
 %endif
 Requires:       zenity
 Recommends:     %{name}-lang
 Provides:       windowmanager
-# mutter 3.9.90 dropped old, unused tools. Likely, nobody has them installed anyway
+# Obsolete the now private typelib.
-Obsoletes:      %{name}-tools < %{version}
+Obsoletes:      typelib-1_0-Meta-3_0
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -108,16 +105,6 @@ from Metacity.
 
 This package contains a library for shared features.
 
-%package -n typelib-1_0-Meta-3_0
-Summary:        Window and compositing manager based on Clutter -- Introspection bindings
-Group:          System/Libraries
-
-%description -n typelib-1_0-Meta-3_0
-Mutter is a window and compositing manager based on Clutter, forked
-from Metacity.
-
-This package provides the GObject Introspection bindings for libmutter.
-
 %package data
 Summary:        Window and compositing manager based on Clutter -- Data Files
 Group:          System/GUI/GNOME
@@ -133,8 +120,8 @@ This package contains data files needed by mutter and its library.
 %package devel
 Summary:        Include Files and Libraries mandatory for Development
 Group:          Development/Libraries/GNOME
+Requires:       %{name} = %{version}
 Requires:       libmutter0 = %{version}
-Requires:       typelib-1_0-Meta-3_0 = %{version}
 
 %description devel
 This package contains all necessary include files and libraries needed
@@ -148,8 +135,8 @@ to develop applications that require these.
 translation-update-upstream
 %patch1 -p1
 %patch2 -p1
-%endif
 %patch3 -p1
+%endif
 
 %build
 %configure \
@@ -162,7 +149,7 @@ translation-update-upstream
 %endif
         --disable-static \
         --enable-compile-warnings=maximum
-make %{?_smp_mflags} V=1
+make %{?_smp_mflags}
 
 %install
 %make_install
@@ -171,9 +158,6 @@ find %{buildroot}%{_libdir} -type f -name '*.la' -delete -print
 %find_lang %{name} %{?no_lang_C}
 %fdupes %{buildroot}
 
-%clean
-rm -rf %{buildroot}
-
 %post
 %desktop_database_post
 
@@ -193,11 +177,27 @@ rm -rf %{buildroot}
 %files
 %defattr (-, root, root)
 %doc COPYING NEWS
+%doc %{_mandir}/man1/mutter.1%{?ext_man}
 %{_bindir}/mutter
+# These so files are not split out since they are private to mutter
+%{_libdir}/mutter/libmutter-clutter-1.0.so
+%{_libdir}/mutter/libmutter-cogl-pango.so
+%{_libdir}/mutter/libmutter-cogl-path.so
+%{_libdir}/mutter/libmutter-cogl.so
 %{_libdir}/mutter/plugins/default.so
+#
 %{_libexecdir}/mutter-restart-helper
 %{_datadir}/applications/mutter.desktop
-%doc %{_mandir}/man1/mutter.1%{?ext_man}
+# These typelibs are not split out since they are private to mutter
+%{_libdir}/mutter/Cally-1.0.typelib
+%{_libdir}/mutter/Clutter-1.0.typelib
+%{_libdir}/mutter/ClutterX11-1.0.typelib
+%{_libdir}/mutter/Cogl-1.0.typelib
+#{_libdir}/mutter/Cogl-2.0.typelib
+%{_libdir}/mutter/CoglPango-1.0.typelib
+#{_libdir}/mutter/CoglPango-2.0.typelib
+%{_libdir}/mutter/Meta-3.0.typelib
+#
 
 %files -n libmutter0
 %defattr(-,root,root)
@@ -206,10 +206,6 @@ rm -rf %{buildroot}
 # users of libmutter need this directory
 %dir %{_libdir}/mutter/plugins/
 
-%files -n typelib-1_0-Meta-3_0
-%defattr(-,root,root)
-%{_libdir}/mutter/Meta-3.0.typelib
-
 %files data
 %defattr(-,root,root)
 # Do not depend on g-c-c just for a directory
@@ -229,6 +225,18 @@ rm -rf %{buildroot}
 %{_includedir}/mutter/
 %{_libdir}/libmutter.so
 %{_libdir}/mutter/Meta-3.0.gir
+%{_libdir}/mutter/Cally-1.0.gir
+%{_libdir}/mutter/Clutter-1.0.gir
+%{_libdir}/mutter/ClutterX11-1.0.gir
+%{_libdir}/mutter/Cogl-1.0.gir
+#{_libdir}/mutter/Cogl-2.0.gir
+%{_libdir}/mutter/CoglPango-1.0.gir
+#{_libdir}/mutter/CoglPango-2.0.gir
 %{_libdir}/pkgconfig/libmutter.pc
+%{_libdir}/pkgconfig/mutter-clutter-1.0.pc
+%{_libdir}/pkgconfig/mutter-clutter-x11-1.0.pc
+%{_libdir}/pkgconfig/mutter-cogl-1.0.pc
+%{_libdir}/pkgconfig/mutter-cogl-pango-1.0.pc
+%{_libdir}/pkgconfig/mutter-cogl-path-1.0.pc
 
 %changelog