| 1 |
commit: 079fc0ca922964e6705420084e5c63e8912ec38b |
| 2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 24 21:03:32 2020 +0000 |
| 4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 24 21:04:55 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=079fc0ca |
| 7 |
|
| 8 |
gnome-base/gnome-settings-daemon: fix USE="input_devices_wacom -wayland" build |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/677494 |
| 11 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
| 12 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
| 13 |
|
| 14 |
.../files/3.32.1-fix-wacom-no-wayland.patch | 25 ++++++++++++++++++++++ |
| 15 |
.../gnome-settings-daemon-3.32.1-r1.ebuild | 1 + |
| 16 |
2 files changed, 26 insertions(+) |
| 17 |
|
| 18 |
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 |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..ea343c44b6f |
| 21 |
--- /dev/null |
| 22 |
+++ b/gnome-base/gnome-settings-daemon/files/3.32.1-fix-wacom-no-wayland.patch |
| 23 |
@@ -0,0 +1,25 @@ |
| 24 |
+From ec6982cc8b3fccc35dbd5df3c4e22ab94709c66d Mon Sep 17 00:00:00 2001 |
| 25 |
+From: Vlad Banea <vlb@××××××.ca> |
| 26 |
+Date: Tue, 31 Dec 2019 15:35:41 -0500 |
| 27 |
+Subject: [PATCH] plugins/wacom: Fix build without WAYLAND |
| 28 |
+ |
| 29 |
+--- |
| 30 |
+ plugins/wacom/gsd-wacom-manager.c | 2 +- |
| 31 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 32 |
+ |
| 33 |
+diff --git a/plugins/wacom/gsd-wacom-manager.c b/plugins/wacom/gsd-wacom-manager.c |
| 34 |
+index e1c8eaa7..92fd96c3 100644 |
| 35 |
+--- a/plugins/wacom/gsd-wacom-manager.c |
| 36 |
++++ b/plugins/wacom/gsd-wacom-manager.c |
| 37 |
+@@ -190,7 +190,7 @@ gsd_wacom_manager_class_init (GsdWacomManagerClass *klass) |
| 38 |
+ static gchar * |
| 39 |
+ get_device_path (GdkDevice *device) |
| 40 |
+ { |
| 41 |
+-#ifdef HAVE_WAYLAND |
| 42 |
++#if HAVE_WAYLAND |
| 43 |
+ if (gnome_settings_is_wayland ()) |
| 44 |
+ return g_strdup (gdk_wayland_device_get_node_path (device)); |
| 45 |
+ else |
| 46 |
+-- |
| 47 |
+2.20.1 |
| 48 |
+ |
| 49 |
|
| 50 |
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 |
| 51 |
index ae8ba7216b1..10a45fa6a23 100644 |
| 52 |
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.32.1-r1.ebuild |
| 53 |
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.32.1-r1.ebuild |
| 54 |
@@ -85,6 +85,7 @@ PATCHES=( |
| 55 |
# Allow disabling udev and networkmanager on Linux |
| 56 |
# Make colord and wacom optional |
| 57 |
"${WORKDIR}"/patches/ |
| 58 |
+ "${FILESDIR}"/${PV}-fix-wacom-no-wayland.patch #677494, fixed in 3.36 |
| 59 |
) |
| 60 |
|
| 61 |
python_check_deps() { |
Archives