[arch-commits] Commit in libinput/trunk (2 files)

[Andreas Radke]

    Date: Tuesday, July 3, 2018 @ 16:54:12
  Author: andyrtr
Revision: 327942

upgpkg: libinput 1.11.2-1

upstream update 1.11.2

Modified:
  libinput/trunk/PKGBUILD
Deleted:
  libinput/trunk/pass_a_valid_grab_parameter_to_list-devices.patch

---------------------------------------------------+
 PKGBUILD                                          |   14 +---
 pass_a_valid_grab_parameter_to_list-devices.patch |   59 --------------------
 2 files changed, 5 insertions(+), 68 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-07-03 16:22:02 UTC (rev 327941)
+++ PKGBUILD	2018-07-03 16:54:12 UTC (rev 327942)
@@ -3,8 +3,8 @@
 # Maintainer: Jan de Groot
 
 pkgname=libinput
-pkgver=1.11.1
-pkgrel=2
+pkgver=1.11.2
+pkgrel=1
 pkgdesc="Input device management and event handling library"
 url="https://www.freedesktop.org/wiki/Software/libinput/"
 arch=(x86_64)
@@ -14,17 +14,13 @@
 optdepends=('gtk3: libinput debug-gui'
             'python-pyudev: libinput measure'
             'python-evdev: libinput measure')
-source=(https://freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}
-        pass_a_valid_grab_parameter_to_list-devices.patch)
-sha512sums=('3dd1a318c89d66f5a66016c6dbfa5277b61a8cb5337d99f85b1eeef40ed894bdc04fd4588a97383988daea0f034df5a72bff318325320a01b857db9deb94a2b0'
-            'SKIP'
-            '98ced6bcc5bc0ae22fbf2c9fe74bffb79eb575f34f0e0dfb8c7b84b3e54aee94b0bfb9ba0245b19a920e4d01984f7fc26029bbb7963cbce03409ea8db2dc9d7c')
+source=(https://freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
+sha512sums=('cb6ada877fc3c09f634f3db39d5507e66d4b86c3d632bb8f7498c7b01fdf8372b2053a79b641293900b7fcc0aa4e920f7c830d9c7b2d9ff3cd61c58eb7c20b65'
+            'SKIP')
 validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') # Peter Hutterer (Who-T) <office at who-t.net>
 
 prepare() {
   cd $pkgname-$pkgver
-  # fix core dump in list-devices FS#59082
-  patch -Np1 -i ../pass_a_valid_grab_parameter_to_list-devices.patch
   # Reduce docs size
   printf '%s\n' >>doc/libinput.doxygen.in \
     HAVE_DOT=yes DOT_IMAGE_FORMAT=svg INTERACTIVE_SVG=yes

Deleted: pass_a_valid_grab_parameter_to_list-devices.patch
===================================================================
--- pass_a_valid_grab_parameter_to_list-devices.patch	2018-07-03 16:22:02 UTC (rev 327941)
+++ pass_a_valid_grab_parameter_to_list-devices.patch	2018-07-03 16:54:12 UTC (rev 327942)
@@ -1,59 +0,0 @@
-From 7c51c881dc72827ca50ae9eea3d123eef9cb4a66 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer at who-t.net>
-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 <peter.hutterer at 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 aa225ca..4cbdf77 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 d1f0270..d3fb629 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));
- 
---
-libgit2 0.27.1
-
-