gnome-settings-daemon: Backport 3.36 fix for building without wayland

/usr/src/debug/gnome-settings-daemon/3.34.2-r0/build/../gnome-settings-daemon-3.34.2/plugins/wacom/gsd-wacom-manager.c:195: undefined reference to `gdk_wayland_device_get_node_path'

Signed-off-by: Adrian Bunk <bunk@stusta.de>
[AK: hand applied]
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Armin Kuster
2020-09-02 20:38:17 -07:00
parent 6a8d6ddc54
commit a6adc08626
2 changed files with 29 additions and 0 deletions
@@ -0,0 +1,27 @@
From ec6982cc8b3fccc35dbd5df3c4e22ab94709c66d Mon Sep 17 00:00:00 2001
From: Vlad Banea <vlb@xiphos.ca>
Date: Tue, 31 Dec 2019 15:35:41 -0500
Subject: plugins/wacom: Fix build without WAYLAND
Upstream-Status: Backport
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
plugins/wacom/gsd-wacom-manager.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plugins/wacom/gsd-wacom-manager.c b/plugins/wacom/gsd-wacom-manager.c
index e1c8eaa7..92fd96c3 100644
--- a/plugins/wacom/gsd-wacom-manager.c
+++ b/plugins/wacom/gsd-wacom-manager.c
@@ -190,7 +190,7 @@ gsd_wacom_manager_class_init (GsdWacomManagerClass *klass)
static gchar *
get_device_path (GdkDevice *device)
{
-#ifdef HAVE_WAYLAND
+#if HAVE_WAYLAND
if (gnome_settings_is_wayland ())
return g_strdup (gdk_wayland_device_get_node_path (device));
else
--
2.20.1
@@ -31,6 +31,8 @@ UNKNOWN_CONFIGURE_WHITELIST_append = " introspection"
SRC_URI[archive.md5sum] = "493332fa0f36645188468fed41c0060b"
SRC_URI[archive.sha256sum] = "9fbae67e217e53b99e4f9e7d392c91ffbe31253941c9b136ef09c2d9db7ad7ed"
SRC_URI += "file://0001-plugins-wacom-Fix-build-without-WAYLAND.patch"
# allow cross build mixed with build of native tools
do_write_config_append() {
cat >${WORKDIR}/meson.native <<EOF