Accepting request 706723 from GNOME:Factory

OBS-URL: https://build.opensuse.org/request/show/706723 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mutter?expand=0&rev=136
2019-06-02 13:14:46 +00:00 · 2019-06-02 13:14:46 +00:00 · e4a4b8946e
commit e4a4b8946e
parent 56303211fa 9e22cc7d85
5 changed files with 74 additions and 25 deletions
--- a/mutter-3.32.1.tar.xz
+++ b/mutter-3.32.1.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:520082efae0f60f252eed2d0e45e174524f7d7ee1e6bbdbaf5c06f0456a6e4e0
-size 2797144
--- a/mutter-3.32.2.tar.xz
+++ b/mutter-3.32.2.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6ab3ec487228d3e6a12aa5eda719608c7d6bd8960184278377b79dab443ca7c0
+size 2797664
--- a/mutter-xwayland-create-xauthority.patch
+++ b/mutter-xwayland-create-xauthority.patch
@ -4,11 +4,11 @@ Date:   Wed Mar 14 19:06:42 2018 +0100

    Patch 3: mutter-xwayland-use-gdm-auth-file.patch

-Index: mutter-3.29.2/src/wayland/meta-wayland.c
+Index: mutter-3.32.1/src/wayland/meta-wayland.c
 ===================================================================
--- mutter-3.29.2.orig/src/wayland/meta-wayland.c	2018-05-10 12:43:15.000000000 +0200
-+++ mutter-3.29.2/src/wayland/meta-wayland.c	2018-07-24 21:26:48.916684038 +0200
-@@ -359,6 +359,7 @@ meta_wayland_init (void)
+--- mutter-3.32.1.orig/src/wayland/meta-wayland.c
+++ mutter-3.32.1/src/wayland/meta-wayland.c
+@@ -367,6 +367,7 @@ meta_wayland_init (void)
 {
   MetaWaylandCompositor *compositor = meta_wayland_compositor_get_default ();
   GSource *wayland_event_source;
@ -16,7 +16,7 @@ Index: mutter-3.29.2/src/wayland/meta-wayland.c
 
   wayland_event_source = wayland_event_source_new (compositor->wayland_display);
 
-@@ -404,7 +405,8 @@ meta_wayland_init (void)
+@@ -415,7 +416,8 @@ meta_wayland_init (void)
 
   if (meta_should_autostart_x11_display ())
     {
@ -26,7 +26,7 @@ Index: mutter-3.29.2/src/wayland/meta-wayland.c
         g_error ("Failed to start X Wayland");
     }
 
-@@ -429,6 +431,9 @@ meta_wayland_init (void)
+@@ -440,6 +442,9 @@ meta_wayland_init (void)
 
   if (meta_should_autostart_x11_display ())
     set_gnome_env ("DISPLAY", meta_wayland_get_xwayland_display_name (compositor));
@ -36,10 +36,10 @@ Index: mutter-3.29.2/src/wayland/meta-wayland.c
 
   set_gnome_env ("WAYLAND_DISPLAY", meta_wayland_get_wayland_display_name (compositor));
 }
-Index: mutter-3.29.2/src/wayland/meta-xwayland-private.h
+Index: mutter-3.32.1/src/wayland/meta-xwayland-private.h
 ===================================================================
--- mutter-3.29.2.orig/src/wayland/meta-xwayland-private.h	2017-03-09 19:39:07.000000000 +0100
-+++ mutter-3.29.2/src/wayland/meta-xwayland-private.h	2018-07-24 21:26:48.916684038 +0200
+--- mutter-3.32.1.orig/src/wayland/meta-xwayland-private.h
+++ mutter-3.32.1/src/wayland/meta-xwayland-private.h
@@ -26,7 +26,8 @@
 
 gboolean
@ -50,11 +50,11 @@ Index: mutter-3.29.2/src/wayland/meta-xwayland-private.h
 
 void
 meta_xwayland_complete_init (MetaDisplay *display);
-Index: mutter-3.29.2/src/wayland/meta-xwayland.c
+Index: mutter-3.32.1/src/wayland/meta-xwayland.c
 ===================================================================
--- mutter-3.29.2.orig/src/wayland/meta-xwayland.c	2018-05-10 12:43:15.000000000 +0200
-+++ mutter-3.29.2/src/wayland/meta-xwayland.c	2018-07-24 21:26:48.916684038 +0200
-@@ -34,6 +34,13 @@
+--- mutter-3.32.1.orig/src/wayland/meta-xwayland.c
+++ mutter-3.32.1/src/wayland/meta-xwayland.c
+@@ -32,6 +32,13 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 
@ -66,9 +66,9 @@ Index: mutter-3.29.2/src/wayland/meta-xwayland.c
 +#include <sys/stat.h>
 +
 #include "compositor/meta-surface-actor-wayland.h"
+ #include "meta/main.h"
 #include "wayland/meta-wayland-actor-surface.h"
- 
-@@ -459,20 +466,231 @@ on_displayfd_ready (int          fd,
+@@ -465,20 +472,231 @@ on_displayfd_ready (int          fd,
   return G_SOURCE_REMOVE;
 }
 
@ -301,7 +301,7 @@ Index: mutter-3.29.2/src/wayland/meta-xwayland.c
   /* We want xwayland to be a wayland client so we make a socketpair to setup a
    * wayland protocol connection. */
   if (socketpair (AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, xwayland_client_fd) < 0)
-@@ -517,6 +735,7 @@ meta_xwayland_start (MetaXWaylandManager
+@@ -523,6 +741,7 @@ meta_xwayland_start (MetaXWaylandManager
                                                "-terminate",
                                                "-accessx",
                                                "-core",
@ -309,7 +309,7 @@ Index: mutter-3.29.2/src/wayland/meta-xwayland.c
                                                "-listen", "4",
                                                "-listen", "5",
                                                "-displayfd", "6",
-@@ -539,6 +758,11 @@ meta_xwayland_start (MetaXWaylandManager
+@@ -545,6 +764,11 @@ meta_xwayland_start (MetaXWaylandManager
   manager->init_loop = g_main_loop_new (NULL, FALSE);
   g_main_loop_run (manager->init_loop);
 
@ -321,3 +321,27 @@ Index: mutter-3.29.2/src/wayland/meta-xwayland.c
   started = TRUE;
 
 out:
+Index: mutter-3.32.1/meson.build
+===================================================================
+--- mutter-3.32.1.orig/meson.build
+++ mutter-3.32.1/meson.build
+@@ -83,6 +83,7 @@ mutter_installed_tests_libexecdir = join
+ 
+ m_dep = cc.find_library('m', required: true)
+ x11_dep = dependency('x11')
+xau_dep = dependency('xau')
+ gtk3_dep = dependency('gtk+-3.0', version: gtk3_req)
+ gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0')
+ pango_dep = dependency('pango', version: pango_req)
+Index: mutter-3.32.1/src/meson.build
+===================================================================
+--- mutter-3.32.1.orig/src/meson.build
+++ mutter-3.32.1/src/meson.build
+@@ -84,6 +84,7 @@ if have_x11
+     xfixes_dep,
+     xi_dep,
+     x11_dep,
+    xau_dep,
+   ]
+ 
+   mutter_pkg_private_deps += [
--- a/mutter.changes
+++ b/mutter.changes
@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Wed May 29 17:29:16 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Drop unneeded and unused libtool BuildRequires.
+
+-------------------------------------------------------------------
+Sun May 26 17:52:24 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 3.32.2:
+  + Disable mouse keys with Numlock on.
+  + Fix crash when restarting on X11.
+  + Fix mapping of touchscreens that don't report dimensions.
+  + Fix spurious idle signals that prevent session unblank.
+  + Misc. bug fixes and cleanups.
+
+-------------------------------------------------------------------
+Fri May 24 08:57:35 UTC 2019 - Yifan Jiang <yfjiang@suse.com>
+
+- Update spec to reflect the rebase of
+  mutter-xwayland-create-xauthority.patch (bsc#1084737).
+
+-------------------------------------------------------------------
+Fri May 24 04:50:08 UTC 2019 - Xiaoguang Wang <xwang@suse.com>
+
+- Update mutter-xwayland-create-xauthority.patch (bsc#1084737).
+
 -------------------------------------------------------------------
 Wed Apr 24 09:42:26 UTC 2019 - Martin Liška <mliska@suse.cz>

--- a/mutter.spec
+++ b/mutter.spec
@ -20,7 +20,7 @@
 %define api_minor 0
 %define libmutter libmutter-%{api_major}-%{api_minor}
 Name:           mutter
-Version:        3.32.1
+Version:        3.32.2
 Release:        0
 Summary:        Window and compositing manager based on Clutter
 License:        GPL-2.0-or-later
@ -29,7 +29,7 @@ URL:            https://www.gnome.org
 Source0:        https://download.gnome.org/sources/mutter/3.32/%{name}-%{version}.tar.xz
 # 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
 Patch1:         mutter-iconcache-Support-RGB16_565-format-for-16-bit-color-.patch
-# PATCH-NEEDS-REBASE mutter-xwayland-create-xauthority.patch bsc#1084737 hpj@suse.com -- Create and pass an Xauthority file to Xwayland and session (WAS: PATCH-FIx-OPENSUSE)
+# PATCH-FIX-OPENSUSE mutter-xwayland-create-xauthority.patch bsc#1084737 hpj@suse.com -- Create and pass an Xauthority file to Xwayland and session
 Patch2:         mutter-xwayland-create-xauthority.patch
 # PATCH-FIX-OPENSUSE mutter-Lower-HIDPI_LIMIT-to-144.patch fate#326682, bsc#1125467 qkzhu@suse.com -- Lower HIDPI_LIMIT to 144
 Patch3:         mutter-Lower-HIDPI_LIMIT-to-144.patch
@ -42,7 +42,6 @@ Patch1001:      mutter-SLE-relax-some-constraints-on-CSD-windows.patch
 Patch1002:      mutter-SLE-bsc984738-grab-display.patch
 BuildRequires:  Mesa-libGLESv3-devel
 BuildRequires:  fdupes
-BuildRequires:  libtool
 BuildRequires:  meson
 BuildRequires:  pkgconfig
 BuildRequires:  translation-update-upstream
@ -76,6 +75,7 @@ BuildRequires:  pkgconfig(wayland-protocols) >= 1.10
 BuildRequires:  pkgconfig(wayland-server) >= 1.13.0
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(x11-xcb)
+BuildRequires:  pkgconfig(xau)
 BuildRequires:  pkgconfig(xcb-randr)
 BuildRequires:  pkgconfig(xcomposite) >= 0.2
 BuildRequires:  pkgconfig(xcursor)
@ -145,8 +145,7 @@ applications that want to make use of the mutter library.
 %prep
 %setup -q
 %patch1 -p1
-# Needs rebase
-#patch2 -p1
+%patch2 -p1
 %patch3 -p1

 # SLE-only patches and translations.