open-vm-tools/wayland-crash.patch
Ravindra Kumar fec5bc0e04 Patch for a Wayland related crash in the desktopEvents plugin (RHBZ#1526952).
gdk_set_allowed_backends() is available in version 3.10 and later only.
2017-12-29 14:59:01 -08:00

36 lines
1.4 KiB
Diff

diff -ru open-vm-tools-10.2.0-7253323.orig/services/plugins/desktopEvents/x11Lock.c open-vm-tools-10.2.0-7253323/services/plugins/desktopEvents/x11Lock.c
--- open-vm-tools-10.2.0-7253323.orig/services/plugins/desktopEvents/x11Lock.c 2017-12-15 11:09:51.000000000 -0800
+++ open-vm-tools-10.2.0-7253323/services/plugins/desktopEvents/x11Lock.c 2017-12-29 14:39:35.821511531 -0800
@@ -364,6 +364,13 @@
g_set_prgname(VMUSER_TITLE);
argv[0] = VMUSER_TITLE;
+#if defined(GTK3) && GTK_MINOR_VERSION >= 10
+ /*
+ * There is no Wayland support yet, only X11 backend is supported.
+ */
+ gdk_set_allowed_backends("x11");
+#endif
+
/* XXX: is calling gtk_init() multiple times safe? */
gtk_init(&argc, (char ***) &argv);
diff -ru open-vm-tools-10.2.0-7253323.orig/services/plugins/dndcp/copyPasteDnDX11.cpp open-vm-tools-10.2.0-7253323/services/plugins/dndcp/copyPasteDnDX11.cpp
--- open-vm-tools-10.2.0-7253323.orig/services/plugins/dndcp/copyPasteDnDX11.cpp 2017-12-15 11:09:51.000000000 -0800
+++ open-vm-tools-10.2.0-7253323/services/plugins/dndcp/copyPasteDnDX11.cpp 2017-12-29 14:39:51.587510648 -0800
@@ -211,6 +211,14 @@
CopyPasteDnDX11::Init(ToolsAppCtx *ctx)
{
TRACE_CALL();
+
+#if defined(GTK3) && GTK_MINOR_VERSION >= 10
+ /*
+ * There is no Wayland support yet, only X11 backend is supported.
+ */
+ gdk_set_allowed_backends("x11");
+#endif
+
CopyPasteDnDWrapper *wrapper = CopyPasteDnDWrapper::GetInstance();
ASSERT(ctx);