summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD13
-rw-r--r--header.patch12
3 files changed, 25 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 74d5b32c181..0250b35397c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = hal
pkgdesc = Hardware Abstraction Layer
pkgver = 0.5.15
- pkgrel = 1
+ pkgrel = 2
url = http://www.freedesktop.org/wiki/Software/hal
install = hal.install
arch = i686
@@ -21,8 +21,10 @@ pkgbase = hal
options = !makeflags
source = https://github.com/bbidulock/hal/releases/download/HAL_0_5_15/hal-0.5.15.tar.gz
source = hal.service
+ source = header.patch
md5sums = a8a7d380f3791c818a08a5f74befe3aa
md5sums = ca4a7932fe7e8acbfa17245b62cc3b9b
+ md5sums = 5448c3074a62337faafc586203a07649
pkgname = hal
diff --git a/PKGBUILD b/PKGBUILD
index c88cda03aa4..d939891e729 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@
pkgname=hal
pkgver=0.5.15
-pkgrel=1
+pkgrel=2
pkgdesc="Hardware Abstraction Layer"
arch=(i686 x86_64)
license=('GPL' 'custom')
@@ -22,9 +22,16 @@ makedepends=('gperf')
options=('!libtool' '!makeflags')
install="${pkgname}.install"
source=("https://github.com/bbidulock/${pkgname}/releases/download/${pkgname^^[a-z]}_${pkgver//\./_}/${pkgname}-${pkgver}.tar.gz"
- "${pkgname}.service")
+ "${pkgname}.service"
+ "header.patch")
md5sums=('a8a7d380f3791c818a08a5f74befe3aa'
- 'ca4a7932fe7e8acbfa17245b62cc3b9b')
+ 'ca4a7932fe7e8acbfa17245b62cc3b9b'
+ '5448c3074a62337faafc586203a07649')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -Np2 -b -z .orig <../header.patch
+}
build() {
cd ${pkgname}-${pkgver}
diff --git a/header.patch b/header.patch
new file mode 100644
index 00000000000..a5e3da8f0ec
--- /dev/null
+++ b/header.patch
@@ -0,0 +1,12 @@
+diff -up src/hal-0.5.15/tools/Makefile.in.orig src/hal-0.5.15/tools/Makefile.in
+--- src/hal-0.5.15/tools/Makefile.in.orig 2015-08-13 18:09:13.000000000 -0600
++++ src/hal-0.5.15/tools/Makefile.in 2016-05-31 18:30:15.000000000 -0600
+@@ -1345,7 +1345,7 @@ uninstall-am: uninstall-binPROGRAMS unin
+
+
+ @BUILD_KEYMAPS_TRUE@@HAVE_GPERF_TRUE@hal-setup-keymap-keys.txt: @LINUX_INPUT_H@
+-@BUILD_KEYMAPS_TRUE@@HAVE_GPERF_TRUE@ awk '/^#define.*KEY_/ { if ($$2 != "KEY_MAX") { print substr($$2, 5) } }' < $< > $@
++@BUILD_KEYMAPS_TRUE@@HAVE_GPERF_TRUE@ cpp -fdirectives-only $< | awk '/^#define.*KEY_/ { if ($$2 != "KEY_MAX" && $$2 != "__KEY_T_TYPE") { print substr($$2, 5) } }' > $@
+
+ @BUILD_KEYMAPS_TRUE@@HAVE_GPERF_TRUE@hal-setup-keymap-hash-name.gperf: hal-setup-keymap-keys.txt
+ @BUILD_KEYMAPS_TRUE@@HAVE_GPERF_TRUE@ awk 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print $$1 ", KEY_" $$1 }' < $< > $@