From 95cd0d0ea6307704e70fa352e23a8f225ade2893 Mon Sep 17 00:00:00 2001 From: Florian Müllner Date: May 24 2017 19:19:26 +0000 Subject: Update to 3.25.2 --- diff --git a/.gitignore b/.gitignore index f63457b..9ecbede 100644 --- a/.gitignore +++ b/.gitignore @@ -124,3 +124,4 @@ mutter-2.31.5.tar.bz2 /mutter-3.24.0.tar.xz /mutter-3.24.1.tar.xz /mutter-3.25.1.tar.xz +/mutter-3.25.2.tar.xz diff --git a/0001-xwayland-Use-the-right-atom-type-for-further-selecti.patch b/0001-xwayland-Use-the-right-atom-type-for-further-selecti.patch deleted file mode 100644 index 5de0728..0000000 --- a/0001-xwayland-Use-the-right-atom-type-for-further-selecti.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 5758401443d09e10184f11e61e6bb14f83688a89 Mon Sep 17 00:00:00 2001 -From: Carlos Garnacho -Date: Wed, 10 May 2017 20:28:42 +0200 -Subject: [PATCH] xwayland: Use the right atom type for further selection - requests to X11 - -If we translate between text/plain;charset-utf-8 from the wayland side to -UTF8_STRING on the X11 side, we want to continue all further X11 selection -requests using the same translated UTF8_STRING atom than we use in the -first XConvertSelection call. - -https://bugzilla.gnome.org/show_bug.cgi?id=782472 ---- - src/wayland/meta-xwayland-selection.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/wayland/meta-xwayland-selection.c b/src/wayland/meta-xwayland-selection.c -index a78e84666..24b8cd2c1 100644 ---- a/src/wayland/meta-xwayland-selection.c -+++ b/src/wayland/meta-xwayland-selection.c -@@ -829,7 +829,7 @@ meta_x11_source_send (MetaWaylandDataSource *source, - /* Takes ownership of fd */ - selection->x11_selection = - x11_selection_data_new (compositor->xwayland_manager.selection_data, -- fd, mime_type); -+ fd, gdk_x11_get_xatom_name (type_atom)); - - XConvertSelection (xdisplay, - selection->selection_atom, type_atom, --- -2.12.2 - diff --git a/mutter.spec b/mutter.spec index a47848b..66ddc95 100644 --- a/mutter.spec +++ b/mutter.spec @@ -4,8 +4,8 @@ %global libinput_version 1.4 Name: mutter -Version: 3.25.1 -Release: 2%{?dist} +Version: 3.25.2 +Release: 1%{?dist} Summary: Window and compositing manager based on Clutter License: GPLv2+ @@ -14,7 +14,6 @@ URL: http://www.gnome.org Source0: http://download.gnome.org/sources/%{name}/3.25/%{name}-%{version}.tar.xz Patch0: startup-notification.patch -Patch1: 0001-xwayland-Use-the-right-atom-type-for-further-selecti.patch BuildRequires: chrpath BuildRequires: pango-devel @@ -109,7 +108,6 @@ the functionality of the installed %{name} package. %prep %setup -q %patch0 -p1 -%patch1 -p1 %build autoreconf -f -i @@ -182,6 +180,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/mutter/tests %changelog +* Wed May 24 2017 Florian Müllner - 3.25.2-1 +- Update to 3.25.2 + * Thu May 18 2017 Florian Müllner - 3.25.1-2 - Fix copy+paste of UTF8 strings between X11 and wayland diff --git a/sources b/sources index cb397a2..cf45a32 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mutter-3.25.1.tar.xz) = 80fbe85a826833191aa20e53b3a15762752e45ac6dc0467588871fb59815e26f1cdf9a596920b4404aae43ffe1d730ca3852ac8689c79a9814dbdb93d70f9d3b +SHA512 (mutter-3.25.2.tar.xz) = 72f3513555d42c61a65fdd226eefc47f5effce926e2b5cae5cd6eb36947020798e653819886c5e57b56b5d1d8b25b9e0448865548092588c91d83042b176b63a