Hello community,

here is the log from the commit of package mutter for openSUSE:Factory checked 
in at 2019-06-02 15:14:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mutter (Old)
 and      /work/SRC/openSUSE:Factory/.mutter.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "mutter"

Sun Jun  2 15:14:46 2019 rev:136 rq:706723 version:3.32.2

Changes:
--------
--- /work/SRC/openSUSE:Factory/mutter/mutter.changes    2019-05-03 
22:19:36.428367020 +0200
+++ /work/SRC/openSUSE:Factory/.mutter.new.5148/mutter.changes  2019-06-02 
15:14:50.250118402 +0200
@@ -1,0 +2,26 @@
+Wed May 29 17:29:16 UTC 2019 - Bjørn Lie <[email protected]>
+
+- Drop unneeded and unused libtool BuildRequires.
+
+-------------------------------------------------------------------
+Sun May 26 17:52:24 UTC 2019 - Bjørn Lie <[email protected]>
+
+- 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 <[email protected]>
+
+- Update spec to reflect the rebase of
+  mutter-xwayland-create-xauthority.patch (bsc#1084737).
+
+-------------------------------------------------------------------
+Fri May 24 04:50:08 UTC 2019 - Xiaoguang Wang <[email protected]>
+
+- Update mutter-xwayland-create-xauthority.patch (bsc#1084737).
+
+-------------------------------------------------------------------

Old:
----
  mutter-3.32.1.tar.xz

New:
----
  mutter-3.32.2.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ mutter.spec ++++++
--- /var/tmp/diff_new_pack.owtv40/_old  2019-06-02 15:14:50.854118141 +0200
+++ /var/tmp/diff_new_pack.owtv40/_new  2019-06-02 15:14:50.858118138 +0200
@@ -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 @@
 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 [email protected] -- 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 
[email protected] -- Create and pass an Xauthority file to Xwayland and session 
(WAS: PATCH-FIx-OPENSUSE)
+# PATCH-FIX-OPENSUSE mutter-xwayland-create-xauthority.patch bsc#1084737 
[email protected] -- 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 [email protected] -- Lower HIDPI_LIMIT to 144
 Patch3:         mutter-Lower-HIDPI_LIMIT-to-144.patch
@@ -42,7 +42,6 @@
 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-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 @@
 %prep
 %setup -q
 %patch1 -p1
-# Needs rebase
-#patch2 -p1
+%patch2 -p1
 %patch3 -p1
 
 # SLE-only patches and translations.

++++++ mutter-3.32.1.tar.xz -> mutter-3.32.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mutter-3.32.1/NEWS new/mutter-3.32.2/NEWS
--- old/mutter-3.32.1/NEWS      2019-04-17 21:10:50.000000000 +0200
+++ new/mutter-3.32.2/NEWS      2019-05-14 19:57:10.000000000 +0200
@@ -1,3 +1,14 @@
+3.32.2
+======
+* Disable mouse keys with Numlock on [Olivier; #530]
+* Fix crash when restarting on X11 [Marco; #576]
+* Fix mapping of touchscreens that don't report dimensions [Carlos; #581]
+* Fix spurious idle signals that prevent session unblank [Jonas; !543]
+* Misc. bug fixes and cleanups [Olivier, Marco, Carlos; !552, !557, #586]
+
+Contributors:
+  Jonas Ådahl, Olivier Fourdan, Carlos Garnacho, Marco Trevisan (Treviño)
+
 3.32.1
 ======
 * Fix fallback app menu on wayland [Florian; #493]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/mutter-3.32.1/clutter/clutter/evdev/clutter-input-device-evdev.c 
new/mutter-3.32.2/clutter/clutter/evdev/clutter-input-device-evdev.c
--- old/mutter-3.32.1/clutter/clutter/evdev/clutter-input-device-evdev.c        
2019-04-17 21:10:50.000000000 +0200
+++ new/mutter-3.32.2/clutter/clutter/evdev/clutter-input-device-evdev.c        
2019-05-14 19:57:10.000000000 +0200
@@ -855,6 +855,14 @@
   clutter_virtual_input_device_notify_relative_motion 
(device->mousekeys_virtual_device,
                                                        time_us, dx_motion, 
dy_motion);
 }
+static gboolean
+is_numlock_active (ClutterInputDeviceEvdev *device)
+{
+  ClutterSeatEvdev *seat = device->seat;
+  return xkb_state_mod_name_is_active (seat->xkb,
+                                       "Mod2",
+                                       XKB_STATE_MODS_LOCKED);
+}
 
 static void
 enable_mousekeys (ClutterInputDeviceEvdev *device)
@@ -1013,6 +1021,10 @@
   if (!(event->key.flags & CLUTTER_EVENT_FLAG_SYNTHETIC))
     stop_mousekeys_move (device);
 
+  /* Do not handle mousekeys if NumLock is ON */
+  if (is_numlock_active (device))
+    return FALSE;
+
   /* Button selection */
   switch (event->key.keyval)
     {
@@ -1084,6 +1096,10 @@
 handle_mousekeys_release (ClutterEvent            *event,
                           ClutterInputDeviceEvdev *device)
 {
+  /* Do not handle mousekeys if NumLock is ON */
+  if (is_numlock_active (device))
+    return FALSE;
+
   switch (event->key.keyval)
     {
     case XKB_KEY_KP_0:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/mutter-3.32.1/clutter/clutter/x11/clutter-backend-x11.c 
new/mutter-3.32.2/clutter/clutter/x11/clutter-backend-x11.c
--- old/mutter-3.32.1/clutter/clutter/x11/clutter-backend-x11.c 2019-04-17 
21:10:50.000000000 +0200
+++ new/mutter-3.32.2/clutter/clutter/x11/clutter-backend-x11.c 2019-05-14 
19:57:10.000000000 +0200
@@ -54,6 +54,7 @@
 #include "clutter-main.h"
 #include "clutter-private.h"
 #include "clutter-settings-private.h"
+#include "clutter-xkb-a11y-x11.h"
 
 G_DEFINE_TYPE (ClutterBackendX11, clutter_backend_x11, CLUTTER_TYPE_BACKEND)
 
@@ -277,6 +278,20 @@
 }
 
 static void
+on_keymap_state_change (ClutterKeymapX11 *keymap_x11,
+                        gpointer          data)
+{
+  ClutterDeviceManager *device_manager = CLUTTER_DEVICE_MANAGER (data);
+  ClutterKbdA11ySettings kbd_a11y_settings;
+
+  /* On keymaps state change, just reapply the current settings, it'll
+   * take care of enabling/disabling mousekeys based on NumLock state.
+   */
+  clutter_device_manager_get_kbd_a11y_settings (device_manager, 
&kbd_a11y_settings);
+  clutter_device_manager_x11_apply_kbd_a11y_settings (device_manager, 
&kbd_a11y_settings);
+}
+
+static void
 clutter_backend_x11_create_keymap (ClutterBackendX11 *backend_x11)
 {
   if (backend_x11->keymap == NULL)
@@ -292,6 +307,11 @@
       backend = CLUTTER_BACKEND (backend_x11);
       translator = CLUTTER_EVENT_TRANSLATOR (backend_x11->keymap);
       _clutter_backend_add_event_translator (backend, translator);
+
+      g_signal_connect (backend_x11->keymap,
+                        "state-changed",
+                        G_CALLBACK (on_keymap_state_change),
+                        backend->device_manager);
     }
 }
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/mutter-3.32.1/clutter/clutter/x11/clutter-xkb-a11y-x11.c 
new/mutter-3.32.2/clutter/clutter/x11/clutter-xkb-a11y-x11.c
--- old/mutter-3.32.1/clutter/clutter/x11/clutter-xkb-a11y-x11.c        
2019-04-17 21:10:50.000000000 +0200
+++ new/mutter-3.32.2/clutter/clutter/x11/clutter-xkb-a11y-x11.c        
2019-05-14 19:57:10.000000000 +0200
@@ -241,8 +241,13 @@
     }
 
   /* mouse keys */
-  if (set_xkb_ctrl (desc, kbd_a11y_settings->controls,
-                    CLUTTER_A11Y_MOUSE_KEYS_ENABLED, XkbMouseKeysMask | 
XkbMouseKeysAccelMask))
+  if (clutter_keymap_get_num_lock_state (CLUTTER_KEYMAP (backend_x11->keymap)))
+    {
+      /* Disable mousekeys when NumLock is ON */
+      desc->ctrls->enabled_ctrls &= ~(XkbMouseKeysMask | 
XkbMouseKeysAccelMask);
+    }
+  else if (set_xkb_ctrl (desc, kbd_a11y_settings->controls,
+                         CLUTTER_A11Y_MOUSE_KEYS_ENABLED, XkbMouseKeysMask | 
XkbMouseKeysAccelMask))
     {
       gint mk_max_speed;
       gint mk_accel_time;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mutter-3.32.1/meson.build 
new/mutter-3.32.2/meson.build
--- old/mutter-3.32.1/meson.build       2019-04-17 21:10:50.000000000 +0200
+++ new/mutter-3.32.2/meson.build       2019-05-14 19:57:10.000000000 +0200
@@ -1,5 +1,5 @@
 project('mutter', 'c',
-  version: '3.32.1',
+  version: '3.32.2',
   meson_version: '>= 0.48.0',
   license: 'GPLv2+'
 )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mutter-3.32.1/src/backends/meta-idle-monitor.c 
new/mutter-3.32.2/src/backends/meta-idle-monitor.c
--- old/mutter-3.32.1/src/backends/meta-idle-monitor.c  2019-04-17 
21:10:50.000000000 +0200
+++ new/mutter-3.32.2/src/backends/meta-idle-monitor.c  2019-05-14 
19:57:10.000000000 +0200
@@ -316,11 +316,18 @@
                                gpointer     user_data)
 {
   MetaIdleMonitorWatch *watch = (MetaIdleMonitorWatch *) user_data;
+  int64_t now;
+  int64_t ready_time;
+
+  now = g_source_get_time (source);
+  ready_time = g_source_get_ready_time (source);
+  if (ready_time > now)
+    return G_SOURCE_CONTINUE;
 
   _meta_idle_monitor_watch_fire (watch);
   g_source_set_ready_time (watch->timeout_source, -1);
 
-  return TRUE;
+  return G_SOURCE_CONTINUE;
 }
 
 static GSourceFuncs idle_monitor_source_funcs = {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mutter-3.32.1/src/backends/meta-input-mapper.c 
new/mutter-3.32.2/src/backends/meta-input-mapper.c
--- old/mutter-3.32.1/src/backends/meta-input-mapper.c  2019-04-17 
21:10:50.000000000 +0200
+++ new/mutter-3.32.2/src/backends/meta-input-mapper.c  2019-05-14 
19:57:10.000000000 +0200
@@ -381,7 +381,7 @@
       info->candidates[META_MATCH_SIZE] = matched_monitor;
     }
 
-  if (input->builtin)
+  if (input->builtin || best == N_OUTPUT_MATCHES)
     {
       best = MIN (best, META_MATCH_IS_BUILTIN);
       find_builtin_output (mapper, &info->candidates[META_MATCH_IS_BUILTIN]);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mutter-3.32.1/src/backends/meta-input-settings.c 
new/mutter-3.32.2/src/backends/meta-input-settings.c
--- old/mutter-3.32.1/src/backends/meta-input-settings.c        2019-04-17 
21:10:50.000000000 +0200
+++ new/mutter-3.32.2/src/backends/meta-input-settings.c        2019-05-14 
19:57:10.000000000 +0200
@@ -1216,7 +1216,7 @@
                              ClutterInputDevice *device)
 {
   MetaInputSettingsPrivate *priv = meta_input_settings_get_instance_private 
(input_settings);
-  ClutterKbdA11ySettings kbd_a11y_settings;
+  ClutterKbdA11ySettings kbd_a11y_settings = { 0 };
   ClutterInputDevice *core_keyboard;
   guint i;
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mutter-3.32.1/src/compositor/compositor-private.h 
new/mutter-3.32.2/src/compositor/compositor-private.h
--- old/mutter-3.32.1/src/compositor/compositor-private.h       2019-04-17 
21:10:50.000000000 +0200
+++ new/mutter-3.32.2/src/compositor/compositor-private.h       2019-05-14 
19:57:10.000000000 +0200
@@ -18,6 +18,9 @@
   guint           pre_paint_func_id;
   guint           post_paint_func_id;
 
+  guint           stage_presented_id;
+  guint           stage_after_paint_id;
+
   gint64          server_time_query_time;
   gint64          server_time_offset;
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mutter-3.32.1/src/compositor/compositor.c 
new/mutter-3.32.2/src/compositor/compositor.c
--- old/mutter-3.32.1/src/compositor/compositor.c       2019-04-17 
21:10:50.000000000 +0200
+++ new/mutter-3.32.2/src/compositor/compositor.c       2019-05-14 
19:57:10.000000000 +0200
@@ -92,6 +92,10 @@
               ClutterFrameInfo *frame_info,
               MetaCompositor   *compositor);
 
+static void
+on_top_window_actor_destroyed (MetaWindowActor *window_actor,
+                               MetaCompositor  *compositor);
+
 static gboolean
 is_modal (MetaDisplay *display)
 {
@@ -131,9 +135,31 @@
 void
 meta_compositor_destroy (MetaCompositor *compositor)
 {
+  g_signal_handler_disconnect (compositor->stage,
+                               compositor->stage_after_paint_id);
+  g_signal_handler_disconnect (compositor->stage,
+                               compositor->stage_presented_id);
+
+  compositor->stage_after_paint_id = 0;
+  compositor->stage_presented_id = 0;
+  compositor->stage = NULL;
+
   clutter_threads_remove_repaint_func (compositor->pre_paint_func_id);
   clutter_threads_remove_repaint_func (compositor->post_paint_func_id);
 
+  if (compositor->top_window_actor)
+    {
+      g_signal_handlers_disconnect_by_func (compositor->top_window_actor,
+                                            on_top_window_actor_destroyed,
+                                            compositor);
+      compositor->top_window_actor = NULL;
+    }
+
+  g_clear_pointer (&compositor->window_group, clutter_actor_destroy);
+  g_clear_pointer (&compositor->top_window_group, clutter_actor_destroy);
+  g_clear_pointer (&compositor->feedback_group, clutter_actor_destroy);
+  g_clear_pointer (&compositor->windows, g_list_free);
+
   if (compositor->have_x11_sync_object)
     meta_sync_ring_destroy ();
 }
@@ -503,9 +529,10 @@
 
   compositor->stage = meta_backend_get_stage (backend);
 
-  g_signal_connect (compositor->stage, "presented",
-                    G_CALLBACK (on_presented),
-                    compositor);
+  compositor->stage_presented_id =
+    g_signal_connect (compositor->stage, "presented",
+                      G_CALLBACK (on_presented),
+                                                     compositor);
 
   /* We use connect_after() here to accomodate code in GNOME Shell that,
    * when benchmarking drawing performance, connects to ::after-paint
@@ -515,8 +542,9 @@
    * connections to ::after-paint, connect() vs. connect_after() doesn't
    * matter.
    */
-  g_signal_connect_after (CLUTTER_STAGE (compositor->stage), "after-paint",
-                          G_CALLBACK (after_stage_paint), compositor);
+  compositor->stage_after_paint_id =
+    g_signal_connect_after (compositor->stage, "after-paint",
+                            G_CALLBACK (after_stage_paint), compositor);
 
   clutter_stage_set_sync_delay (CLUTTER_STAGE (compositor->stage), 
META_SYNC_DELAY);
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mutter-3.32.1/src/core/meta-launch-context.c 
new/mutter-3.32.2/src/core/meta-launch-context.c
--- old/mutter-3.32.1/src/core/meta-launch-context.c    2019-04-17 
21:10:50.000000000 +0200
+++ new/mutter-3.32.2/src/core/meta-launch-context.c    2019-05-14 
19:57:10.000000000 +0200
@@ -110,13 +110,24 @@
 meta_launch_context_constructed (GObject *object)
 {
   MetaLaunchContext *context = META_LAUNCH_CONTEXT (object);
+  const char *x11_display, *wayland_display;
 
   G_OBJECT_CLASS (meta_launch_context_parent_class)->constructed (object);
 
-  g_app_launch_context_setenv (G_APP_LAUNCH_CONTEXT (context),
-                               "DISPLAY", getenv ("DISPLAY"));
-  g_app_launch_context_setenv (G_APP_LAUNCH_CONTEXT (context),
-                               "WAYLAND_DISPLAY", getenv ("WAYLAND_DISPLAY"));
+  x11_display = getenv ("DISPLAY");
+  wayland_display = getenv ("WAYLAND_DISPLAY");
+
+  if (x11_display)
+    {
+      g_app_launch_context_setenv (G_APP_LAUNCH_CONTEXT (context),
+                                   "DISPLAY", x11_display);
+    }
+
+  if (wayland_display)
+    {
+      g_app_launch_context_setenv (G_APP_LAUNCH_CONTEXT (context),
+                                   "WAYLAND_DISPLAY", wayland_display);
+    }
 }
 
 static gchar *

++++++ mutter-xwayland-create-xauthority.patch ++++++
--- /var/tmp/diff_new_pack.owtv40/_old  2019-06-02 15:14:51.950117666 +0200
+++ /var/tmp/diff_new_pack.owtv40/_new  2019-06-02 15:14:51.954117664 +0200
@@ -4,11 +4,11 @@
 
     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 @@
  
    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 @@
          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 @@
  
    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 @@
  
  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 @@
 +#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 @@
    /* 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 @@
                                                 "-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 @@
    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 += [


Reply via email to