diff options
| author |   Mart Raudsepp <leio@gentoo.org> | 2020-02-24 23:03:32 +0200 |
|---|---|---|
| committer | Mart Raudsepp <leio@gentoo.org> | 2020-02-24 23:04:55 +0200 |
| commit | 079fc0ca922964e6705420084e5c63e8912ec38b (patch) | |
| tree | 8f4b06be4fab1d4468ee743f79f9d23822d50733 /gnome-base/gnome-settings-daemon | |
| parent | x11-plugins/wmdots: replace ":" as sed delimiter (diff) | |
| download | gentoo-079fc0ca922964e6705420084e5c63e8912ec38b.tar.gz gentoo-079fc0ca922964e6705420084e5c63e8912ec38b.tar.bz2 gentoo-079fc0ca922964e6705420084e5c63e8912ec38b.zip | |
gnome-base/gnome-settings-daemon: fix USE="input_devices_wacom -wayland" build
Closes: https://bugs.gentoo.org/677494
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio@gentoo.org>
Diffstat (limited to 'gnome-base/gnome-settings-daemon')
| -rw-r--r-- | gnome-base/gnome-settings-daemon/files/3.32.1-fix-wacom-no-wayland.patch | 25 | ||||
| -rw-r--r-- | gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.32.1-r1.ebuild | 1 |
2 files changed, 26 insertions, 0 deletions
diff --git a/gnome-base/gnome-settings-daemon/files/3.32.1-fix-wacom-no-wayland.patch b/gnome-base/gnome-settings-daemon/files/3.32.1-fix-wacom-no-wayland.patch new file mode 100644 index 000000000000..ea343c44b6f7 --- /dev/null +++ b/gnome-base/gnome-settings-daemon/files/3.32.1-fix-wacom-no-wayland.patch @@ -0,0 +1,25 @@ +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: [PATCH] plugins/wacom: Fix build without WAYLAND + +--- + 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 + diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.32.1-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.32.1-r1.ebuild index ae8ba7216b15..10a45fa6a23c 100644 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.32.1-r1.ebuild +++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.32.1-r1.ebuild @@ -85,6 +85,7 @@ PATCHES=( # Allow disabling udev and networkmanager on Linux # Make colord and wacom optional "${WORKDIR}"/patches/ + "${FILESDIR}"/${PV}-fix-wacom-no-wayland.patch #677494, fixed in 3.36 ) python_check_deps() { |