From 8c3a25cd9dde83f9daa79f7146af11469c4ccb65883c1a2b50e155b27ce7d590 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 15 Oct 2016 07:52:27 +0000 Subject: [PATCH] Accepting request 435421 from GNOME:Next New stable rel OBS-URL: https://build.opensuse.org/request/show/435421 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=213 --- mutter-3.22.0.tar.xz | 3 --- mutter-3.22.1.tar.xz | 3 +++ mutter-fix-string-format.patch | 28 ---------------------------- mutter.changes | 13 +++++++++++++ mutter.spec | 5 +---- 5 files changed, 17 insertions(+), 35 deletions(-) delete mode 100644 mutter-3.22.0.tar.xz create mode 100644 mutter-3.22.1.tar.xz delete mode 100644 mutter-fix-string-format.patch diff --git a/mutter-3.22.0.tar.xz b/mutter-3.22.0.tar.xz deleted file mode 100644 index a946dea..0000000 --- a/mutter-3.22.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a5acdde788f5d137ec6dfe218a214c1f6cfb7e2e851fbcebe0b2d67b4c96e5f3 -size 3531916 diff --git a/mutter-3.22.1.tar.xz b/mutter-3.22.1.tar.xz new file mode 100644 index 0000000..29ec46c --- /dev/null +++ b/mutter-3.22.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ffba28b955dc1b8a4734020de4ed4dff4afed435f0a059974be9bf3168acf59e +size 3532404 diff --git a/mutter-fix-string-format.patch b/mutter-fix-string-format.patch deleted file mode 100644 index dc7466f..0000000 --- a/mutter-fix-string-format.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 028157081c0428bac1269078dd7f3360e3810824 Mon Sep 17 00:00:00 2001 -From: Olav Vitters -Date: Thu, 22 Sep 2016 21:00:29 +0200 -Subject: Fix string format build error - -backends/meta-input-settings.c:1245:27: error: format '%lx' expects -argument of type 'long unsigned int', but argument 3 has type 'guint64 -{aka long long unsigned int}' [-Werror=format=] ---- - src/backends/meta-input-settings.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/backends/meta-input-settings.c b/src/backends/meta-input-settings.c -index ae17f7b..74cf30a 100644 ---- a/src/backends/meta-input-settings.c -+++ b/src/backends/meta-input-settings.c -@@ -1242,7 +1242,7 @@ lookup_tool_settings (ClutterInputDeviceTool *tool, - - tool_id = clutter_input_device_tool_get_id (tool); - device_id = get_tablet_settings_id (device, lookup_mapping_info (device)); -- path = g_strdup_printf ("/org/gnome/settings-daemon/peripherals/wacom/%s/%lx/", -+ path = g_strdup_printf ("/org/gnome/settings-daemon/peripherals/wacom/%s/%" G_GUINT64_FORMAT "/", - device_id, tool_id); - tool_settings = tool_settings_new (tool, path); - g_object_set_qdata_full (G_OBJECT (tool), quark_tool_settings, tool_settings, --- -cgit v0.12 - diff --git a/mutter.changes b/mutter.changes index 558e93f..56d7812 100644 --- a/mutter.changes +++ b/mutter.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue Oct 11 09:15:33 UTC 2016 - zaitor@opensuse.org + +- Update to version 3.22.1: + + Fix feedback loop between StClipboard and X11 bridge + (bgo#760745). + + Fall back gracefully if DRM plane rotation fails (bgo#772512). + + Approximate native monitor backend behavior to X (bgo#772176). + + Fix crash on VT switch on wayland (bgo#771646). + + Expose Flatpak ID for application matching (bgo#772613, + bgo#772614). +- Drop mutter-fix-string-format.patch: Fixed upstream. + ------------------------------------------------------------------- Sat Sep 24 11:06:47 UTC 2016 - zaitor@opensuse.org diff --git a/mutter.spec b/mutter.spec index c05d9f1..5612d74 100644 --- a/mutter.spec +++ b/mutter.spec @@ -25,7 +25,7 @@ %global __provides_exclude_from ^%{_libdir}/mutter/.*.typelib$ Name: mutter -Version: 3.22.0 +Version: 3.22.1 Release: 0 Summary: Window and compositing manager based on Clutter License: GPL-2.0+ @@ -42,8 +42,6 @@ Patch3: mutter-bsc984738-grab-display.patch Patch4: mutter-screeenshot-coords.patch # PATCH-FIX-UPSTREAM mutter-scale-positioner-coordinates.patch bgo#771841 zaitor@opensuse.org -- wayland/xdg-shell: Scale positioner coordinates, fix hidpi menus. Patch5: mutter-scale-positioner-coordinates.patch -# PATCH-FIX-UPSTREAM mutter-fix-string-format.patch zaitor@opensuse.org -- Fix string format build error -Patch6: mutter-fix-string-format.patch BuildRequires: fdupes BuildRequires: gobject-introspection-devel >= 0.9.5 BuildRequires: libSM-devel @@ -145,7 +143,6 @@ translation-update-upstream %endif %patch4 -p1 %patch5 -p1 -%patch6 -p1 %build %configure \