libinput 1.11.2

This commit is contained in:
Peter Hutterer 2018-07-03 15:05:10 +10:00
parent 53669d8e66
commit 18f75835c4
4 changed files with 7 additions and 63 deletions

1
.gitignore vendored
View File

@ -27,3 +27,4 @@
/libinput-1.10.902.tar.xz
/libinput-1.11.0.tar.xz
/libinput-1.11.1.tar.xz
/libinput-1.11.2.tar.xz

View File

@ -1,58 +0,0 @@
From 7c51c881dc72827ca50ae9eea3d123eef9cb4a66 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 20 Jun 2018 07:56:05 +1000
Subject: [PATCH libinput] tools: pass a valid grab parameter to list-devices
My kingdome for a compiler warning. Or a scan-build warning. Or a coverity
warning. Or anything... But no, nothing.
Also make the open_restricted() more robust to a NULL userdata, because
effectively that's what we were passing here.
Fixes https://gitlab.freedesktop.org/libinput/libinput/issues/50
Introduced in 0a13223c39fdf0f079715bf83d498c0dcd9cf4f8
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
tools/libinput-list-devices.c | 3 ++-
tools/shared.c | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/tools/libinput-list-devices.c b/tools/libinput-list-devices.c
index aa225ca0..4cbdf775 100644
--- a/tools/libinput-list-devices.c
+++ b/tools/libinput-list-devices.c
@@ -372,6 +372,7 @@ main(int argc, char **argv)
{
struct libinput *li;
struct libinput_event *ev;
+ bool grab = false;
/* This is kept for backwards-compatibility with the old
libinput-list-devices */
@@ -388,7 +389,7 @@ main(int argc, char **argv)
}
}
- li = tools_open_backend(BACKEND_UDEV, "seat0", false, false);
+ li = tools_open_backend(BACKEND_UDEV, "seat0", false, &grab);
if (!li)
return 1;
diff --git a/tools/shared.c b/tools/shared.c
index d1f02702..d3fb6294 100644
--- a/tools/shared.c
+++ b/tools/shared.c
@@ -232,7 +232,7 @@ open_restricted(const char *path, int flags, void *user_data)
if (fd < 0)
fprintf(stderr, "Failed to open %s (%s)\n",
path, strerror(errno));
- else if (*grab && ioctl(fd, EVIOCGRAB, (void*)1) == -1)
+ else if (grab && *grab && ioctl(fd, EVIOCGRAB, (void*)1) == -1)
fprintf(stderr, "Grab requested, but failed for %s (%s)\n",
path, strerror(errno));
--
2.17.1

View File

@ -4,8 +4,8 @@
%global gitversion 58abea394
Name: libinput
Version: 1.11.1
Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
Version: 1.11.2
Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
Summary: Input device library
License: MIT
@ -18,8 +18,6 @@ Source2: commitid
Source0: http://www.freedesktop.org/software/libinput/libinput-%{version}.tar.xz
%endif
Patch01: 0001-tools-pass-a-valid-grab-parameter-to-list-devices.patch
BuildRequires: git-core
BuildRequires: gcc gcc-c++
BuildRequires: meson
@ -115,6 +113,9 @@ The %{name}-utils package contains tools to debug hardware and analyze
%{_mandir}/man1/libinput-replay.1*
%changelog
* Tue Jul 03 2018 Peter Hutterer <peter.hutterer@redhat.com> 1.11.2-1
- libinput 1.11.2
* Wed Jun 20 2018 Peter Hutterer <peter.hutterer@redhat.com> 1.11.1-2
- Fix segfault in libinput list-devices

View File

@ -1 +1 @@
SHA512 (libinput-1.11.1.tar.xz) = 3dd1a318c89d66f5a66016c6dbfa5277b61a8cb5337d99f85b1eeef40ed894bdc04fd4588a97383988daea0f034df5a72bff318325320a01b857db9deb94a2b0
SHA512 (libinput-1.11.2.tar.xz) = cb6ada877fc3c09f634f3db39d5507e66d4b86c3d632bb8f7498c7b01fdf8372b2053a79b641293900b7fcc0aa4e920f7c830d9c7b2d9ff3cd61c58eb7c20b65