From e5163c855963c477a63491187bbd8f12b67ce8ee Mon Sep 17 00:00:00 2001 From: maxice8 <30738253+maxice8@users.noreply.github.com> Date: Fri, 6 Jul 2018 07:51:37 -0300 Subject: [PATCH] libinput: update to 1.11.2. (#596) --- .../patches/fix-null-derefencing.patch | 59 ------------------- srcpkgs/libinput/template | 6 +- 2 files changed, 3 insertions(+), 62 deletions(-) delete mode 100644 srcpkgs/libinput/patches/fix-null-derefencing.patch diff --git a/srcpkgs/libinput/patches/fix-null-derefencing.patch b/srcpkgs/libinput/patches/fix-null-derefencing.patch deleted file mode 100644 index 3a14e571334..00000000000 --- a/srcpkgs/libinput/patches/fix-null-derefencing.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 7c51c881dc72827ca50ae9eea3d123eef9cb4a66 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Wed, 20 Jun 2018 07:56:05 +1000 -Subject: [PATCH] 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 ---- - 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 aa225ca..4cbdf77 100644 ---- tools/libinput-list-devices.c -+++ 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 d1f0270..d3fb629 100644 ---- tools/shared.c -+++ 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)); - --- -libgit2 0.27.1 - - diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template index 9ad80ae7315..f4ea049baf6 100644 --- a/srcpkgs/libinput/template +++ b/srcpkgs/libinput/template @@ -1,7 +1,7 @@ # Template file for 'libinput' pkgname=libinput -version=1.11.1 -revision=2 +version=1.11.2 +revision=1 build_style=meson configure_args="-Ddebug-gui=false -Ddocumentation=false" hostmakedepends="pkg-config valgrind" @@ -11,7 +11,7 @@ maintainer="Juan RP " license="MIT" homepage="https://www.freedesktop.org/wiki/Software/libinput" distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=642e95aecc7a592c676cde5b4cfda6d2939d2e2f686a8edbbc369808e646f1fc +checksum=6b36e1163d306c292ec8359b35aa65431cd29d0a5254923775e8019ff5018107 post_install() { vlicense COPYING