summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2017-03-09 14:19:17 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2017-03-09 14:44:24 +0100
commit7f1e5277c8f284fc7749aaaa45ebf06236c9cc65 (patch)
tree769b72a3c567239aa0a031473e656979b17e9720
parent2f88e1549baa6d51b3ea1dc824c115c2fb483571 (diff)
downloaddrakx-kbd-mouse-x11-7f1e5277c8f284fc7749aaaa45ebf06236c9cc65.tar
drakx-kbd-mouse-x11-7f1e5277c8f284fc7749aaaa45ebf06236c9cc65.tar.gz
drakx-kbd-mouse-x11-7f1e5277c8f284fc7749aaaa45ebf06236c9cc65.tar.bz2
drakx-kbd-mouse-x11-7f1e5277c8f284fc7749aaaa45ebf06236c9cc65.tar.xz
drakx-kbd-mouse-x11-7f1e5277c8f284fc7749aaaa45ebf06236c9cc65.zip
rely on libinput for synaptics (mga#20424)
we no longer install x11-driver-input-synaptics by default
-rw-r--r--NEWS1
-rw-r--r--lib/mouse.pm3
2 files changed, 2 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index e769da5..aef2bc7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+- rely on libinput for synaptics (mga#20424)
- speedup checking for x11-driver-input-libinput
Version 1.19 - 7 March 2017
diff --git a/lib/mouse.pm b/lib/mouse.pm
index 4f9e839..4996721 100644
--- a/lib/mouse.pm
+++ b/lib/mouse.pm
@@ -359,8 +359,7 @@ sub various_xfree_conf {
require Xconfig::card;
my $inputdrvpath = Xconfig::card::modules_dir() . '/input';
my $pkgs = [
- if_($mouse->{synaptics}, ['x11-driver-input-synaptics', "$inputdrvpath/synaptics_drv.so"]),
- if_($mouse->{evdev_mice}, ['x11-driver-input-libinput', "$inputdrvpath/libinput_drv.so"]),
+ if_($mouse->{synaptics} || $mouse->{evdev_mice}, ['x11-driver-input-libinput', "$inputdrvpath/libinput_drv.so"]),
if_(@{$mouse->{wacom}}, ['x11-driver-input-wacom', "$inputdrvpath/wacom_drv.so"]),
];
$do_pkgs->ensure_files_are_installed($pkgs, 1);