summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD15
-rw-r--r--fix1.patch29
-rw-r--r--fix2.patch25
4 files changed, 10 insertions, 73 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7ef40beee580..bf11caf24be5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,15 @@
# Generated by mksrcinfo v8
-# Wed Jan 18 06:33:41 UTC 2017
+# Thu Feb 23 14:04:48 UTC 2017
pkgbase = input-utils
pkgdesc = Equivalent of Ubuntu/Debian's input-utils. Contains lsinput
- pkgver = 1.2
- pkgrel = 2
+ pkgver = 1.3
+ pkgrel = 1
url = http://www.kraxel.org/releases/input/
arch = x86_64
arch = i686
license = GPLv2
- source = http://www.kraxel.org/releases/input/input-1.2.tar.gz
- source = fix1.patch
- source = fix2.patch
- sha256sums = 7934244f34d5cd5d31a67d14892d4c0d8260dc0f622e01cf21bc1eddf4b98b56
- sha256sums = dd3a286493a3a792c2e09f6cb33bb27de416caede532ed091e46780e973659cf
- sha256sums = 7d54421a081d6e52b3c1d570531a1558d235537691358df7dd251e33f2d31749
+ source = http://www.kraxel.org/releases/input/input-1.3.tar.gz
+ sha256sums = 9142c34d508f2da4cd53d6348fee77e30b69c35c8dabfadfc5a6db09c4bd8087
pkgname = input-utils
diff --git a/PKGBUILD b/PKGBUILD
index 67a7effd3b7e..58afc6a5f213 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,23 +2,18 @@
# Contributor: Marek Skrobacki <skrobul@skrobul.com>
pkgname=input-utils
-pkgver=1.2
-pkgrel=2
+pkgver=1.3
+pkgrel=1
pkgdesc="Equivalent of Ubuntu/Debian's input-utils. Contains lsinput"
url="http://www.kraxel.org/releases/input/"
arch=('x86_64' 'i686')
license=('GPLv2')
-source=("http://www.kraxel.org/releases/input/input-$pkgver.tar.gz"
-"fix1.patch"
-"fix2.patch")
-sha256sums=('7934244f34d5cd5d31a67d14892d4c0d8260dc0f622e01cf21bc1eddf4b98b56'
- 'dd3a286493a3a792c2e09f6cb33bb27de416caede532ed091e46780e973659cf'
- '7d54421a081d6e52b3c1d570531a1558d235537691358df7dd251e33f2d31749')
+source=("http://www.kraxel.org/releases/input/input-$pkgver.tar.gz")
+sha256sums=('9142c34d508f2da4cd53d6348fee77e30b69c35c8dabfadfc5a6db09c4bd8087')
build() {
cd "$srcdir/input-$pkgver"
- patch -Np1 -i "$srcdir"/fix1.patch
- patch -Np1 -i "$srcdir"/fix2.patch
+ make
}
package() {
diff --git a/fix1.patch b/fix1.patch
deleted file mode 100644
index c99747e86d4e..000000000000
--- a/fix1.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From c3f5e30069efd2d645121652f1eb63cdcb725194 Mon Sep 17 00:00:00 2001
-From: Gerd Hoffmann <kraxel@redhat.com>
-Date: Tue, 12 Apr 2016 07:43:57 +0200
-Subject: fix build with newer linux kernels
-
----
- name.sh | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/name.sh b/name.sh
-index 9da92fc..288ea8f 100755
---- a/name.sh
-+++ b/name.sh
-@@ -1,7 +1,11 @@
- #!/bin/sh
-
- TYPE="$1"
--INPUT="/usr/include/linux/input.h"
-+if test -f "/usr/include/linux/input-event-codes.h"; then
-+ INPUT="/usr/include/linux/input-event-codes.h"
-+else
-+ INPUT="/usr/include/linux/input.h"
-+fi
-
- awk "
- /KEY_MIN_INTERESTING/ {next};
---
-cgit v0.12
-
diff --git a/fix2.patch b/fix2.patch
deleted file mode 100644
index 514269f79c3c..000000000000
--- a/fix2.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From fd1bab80e5f9e514facce49c1a462c04ed9df991 Mon Sep 17 00:00:00 2001
-From: Gerd Hoffmann <kraxel@redhat.com>
-Date: Fri, 17 Jun 2016 14:32:25 +0200
-Subject: fix bus name generation
-
----
- name.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/name.sh b/name.sh
-index 288ea8f..f75e2af 100755
---- a/name.sh
-+++ b/name.sh
-@@ -1,7 +1,7 @@
- #!/bin/sh
-
- TYPE="$1"
--if test -f "/usr/include/linux/input-event-codes.h"; then
-+if test -f "/usr/include/linux/input-event-codes.h" -a "$TYPE" != "BUS"; then
- INPUT="/usr/include/linux/input-event-codes.h"
- else
- INPUT="/usr/include/linux/input.h"
---
-cgit v0.12
-