summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Vincent2017-10-15 13:37:13 +0100
committerTom Vincent2017-10-15 13:37:13 +0100
commit4b0bf1aaba779926018f3696853f74f7979d767f (patch)
tree95f9c7b9ea89c07deca435af68f7347e9ba0502b
parent91e9d6d4052476c7d540a3f4d03641bb5b6e049b (diff)
downloadaur-4b0bf1aaba779926018f3696853f74f7979d767f.tar.gz
fix: add meson build patch
FS#55925
-rw-r--r--.SRCINFO4
-rw-r--r--0001-fix-Invalid-kwargs-for-option-udev-dir-FS-55925.patch42
-rw-r--r--PKGBUILD10
3 files changed, 52 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 12b23f9babc..fd45a3691a8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = libinput-no-hysteresis
pkgdesc = Input device management and event handling library sans hysteresis
pkgver = 1.8.3
- pkgrel = 1
+ pkgrel = 2
url = https://www.freedesktop.org/wiki/Software/libinput/
arch = i686
arch = x86_64
@@ -19,10 +19,12 @@ pkgbase = libinput-no-hysteresis
source = https://freedesktop.org/software/libinput/libinput-1.8.3.tar.xz
source = https://freedesktop.org/software/libinput/libinput-1.8.3.tar.xz.sig
source = disable-hysteresis.patch
+ source = 0001-fix-Invalid-kwargs-for-option-udev-dir-FS-55925.patch
validpgpkeys = 3C2C43D9447D5938EF4551EBE23B7E70B467F0BF
sha512sums = 88006d217e3507858fa6b9ac1f25c267255fb51d1bcf1208d2afd423bf2a9292944bc5526ea91f27fad3ff04c2f9f43ab3aa25fd9fb7ace1231ecd33ddf18de6
sha512sums = SKIP
sha512sums = 22c97898b8bd2ed6757ce2a0f2c19d8ff908b3134a9bd435285bc5c59d9d4a17cc5bb4ef0bfb01001ef9aeb2c917bdcc79324cc68bc442c2038d9c448773ac5e
+ sha512sums = dd07a48986a2d335b4b4bd68a280e73ded422974489d8b4c2ed3337f6de103b3374400ebd732a54445ab451c3a15ed4b3a73c9cab5053cd7658d27cc0e2cd427
pkgname = libinput-no-hysteresis
diff --git a/0001-fix-Invalid-kwargs-for-option-udev-dir-FS-55925.patch b/0001-fix-Invalid-kwargs-for-option-udev-dir-FS-55925.patch
new file mode 100644
index 00000000000..14a661d0926
--- /dev/null
+++ b/0001-fix-Invalid-kwargs-for-option-udev-dir-FS-55925.patch
@@ -0,0 +1,42 @@
+From 441bf5973aff8741a6b5bd93254b79a955a2c0eb Mon Sep 17 00:00:00 2001
+From: fafryd <dz1125.bug.tracker@gmail.com>
+Date: Mon, 9 Oct 2017 20:53:34 +0200
+Subject: [PATCH] fix Invalid kwargs for option "udev-dir" FS#55925
+
+---
+ meson_options.txt | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/meson_options.txt b/meson_options.txt
+index 9861d2d..144f916 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,20 +1,20 @@
+ option('udev-dir',
+ type: 'string',
+- default: '',
++ value: '',
+ description: 'udev base directory [default=$prefix/lib/udev]')
+ option('libwacom',
+ type: 'boolean',
+- default: true,
++ value: true,
+ description: 'Use libwacom for tablet identification (default=true)')
+ option('debug-gui',
+ type: 'boolean',
+- default: true,
++ value: true,
+ description: 'Enable the "debug-gui" feature in the libinput tool [default=true]')
+ option('tests',
+ type: 'boolean',
+- default: true,
++ value: true,
+ description: 'Build the tests [default=true]')
+ option('documentation',
+ type: 'boolean',
+- default: true,
++ value: true,
+ description: 'Build the documentation [default=true]')
+--
+2.14.2
+
diff --git a/PKGBUILD b/PKGBUILD
index 8c01cd1980e..a1c8de679ca 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=libinput-no-hysteresis
_pkgname=libinput
pkgver=1.8.3
-pkgrel=1
+pkgrel=2
pkgdesc="Input device management and event handling library sans hysteresis"
arch=(i686 x86_64)
url="https://www.freedesktop.org/wiki/Software/libinput/"
@@ -14,16 +14,20 @@ provides=("libinput=${pkgver}")
depends=('mtdev' 'systemd' 'libevdev' 'libwacom')
makedepends=('doxygen' 'graphviz' 'gtk3' 'meson')
optdepends=('gtk3: libinput debug-gui')
-source=(https://freedesktop.org/software/$_pkgname/$_pkgname-$pkgver.tar.xz{,.sig} disable-hysteresis.patch)
+source=(https://freedesktop.org/software/$_pkgname/$_pkgname-$pkgver.tar.xz{,.sig}
+ disable-hysteresis.patch
+ 0001-fix-Invalid-kwargs-for-option-udev-dir-FS-55925.patch)
sha512sums=('88006d217e3507858fa6b9ac1f25c267255fb51d1bcf1208d2afd423bf2a9292944bc5526ea91f27fad3ff04c2f9f43ab3aa25fd9fb7ace1231ecd33ddf18de6'
'SKIP'
- '22c97898b8bd2ed6757ce2a0f2c19d8ff908b3134a9bd435285bc5c59d9d4a17cc5bb4ef0bfb01001ef9aeb2c917bdcc79324cc68bc442c2038d9c448773ac5e')
+ '22c97898b8bd2ed6757ce2a0f2c19d8ff908b3134a9bd435285bc5c59d9d4a17cc5bb4ef0bfb01001ef9aeb2c917bdcc79324cc68bc442c2038d9c448773ac5e'
+ 'dd07a48986a2d335b4b4bd68a280e73ded422974489d8b4c2ed3337f6de103b3374400ebd732a54445ab451c3a15ed4b3a73c9cab5053cd7658d27cc0e2cd427')
validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') # Peter Hutterer (Who-T) <office@who-t.net>
prepare() {
mkdir build
cd $_pkgname-$pkgver
patch -p1 -i "${srcdir}/disable-hysteresis.patch"
+ patch -p1 -i "${srcdir}/0001-fix-Invalid-kwargs-for-option-udev-dir-FS-55925.patch"
}
build() {