upgpkg: keymapper 1.9.0-1

upstream release

4 files changed, 14 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 23e687f1756d..4b402497832b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = keymapper
 	pkgdesc = A cross-platform context-aware keyremapper
-	pkgver = 1.8.2
+	pkgver = 1.9.0
 	pkgrel = 1
 	url = https://github.com/houmain/keymapper
 	arch = i686
@@ -13,11 +13,9 @@ pkgbase = keymapper
 	depends = gcc-libs
 	depends = libusb
 	depends = libx11
-	source = https://github.com/houmain/keymapper/archive/1.8.2/keymapper-1.8.2.tar.gz
-	source = keymapperd.service
-	source = keymapper.desktop
-	sha256sums = 816040542d90a79f3f5e039952c7c23ebc81e92845baaeb418c9d349c2d0fd97
-	sha256sums = 1c403c317815a339cd1f9c081533b207e93464b138696a9caef9a62489a70416
-	sha256sums = 32797443d2b92d3b01d683563426fbea3a18e16ad965759c9ce06ea301488654
+	depends = dbus
+	depends = wayland
+	source = https://github.com/houmain/keymapper/archive/1.9.0/keymapper-1.9.0.tar.gz
+	sha256sums = 9f748e4869564dd019751992dbf334fd86fe99ea395f8dcd6e38eb35ff45123d
 
 pkgname = keymapper
diff --git a/PKGBUILD b/PKGBUILD
index 4732c4d88dde..1c14e5705b3a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,40 +2,34 @@
 # Contributor: houmain <houmain at posteo dot net>
 
 pkgname=keymapper
-pkgver=1.8.2
+pkgver=1.9.0
 pkgrel=1
 pkgdesc="A cross-platform context-aware keyremapper"
 arch=(i686 x86_64 armv6h armv7h aarch64)
 url=https://github.com/houmain/keymapper
 license=(GPL3)
-depends=(gcc-libs libusb libx11)
+depends=(gcc-libs libusb libx11 dbus wayland)
 makedepends=(cmake)
-source=(https://github.com/houmain/$pkgname/archive/$pkgver/$pkgname-$pkgver.tar.gz
-        ${pkgname}d.service
-        $pkgname.desktop)
-sha256sums=('816040542d90a79f3f5e039952c7c23ebc81e92845baaeb418c9d349c2d0fd97'
-            '1c403c317815a339cd1f9c081533b207e93464b138696a9caef9a62489a70416'
-            '32797443d2b92d3b01d683563426fbea3a18e16ad965759c9ce06ea301488654')
+source=(https://github.com/houmain/$pkgname/archive/$pkgver/$pkgname-$pkgver.tar.gz)
+sha256sums=('9f748e4869564dd019751992dbf334fd86fe99ea395f8dcd6e38eb35ff45123d')
 
 prepare() {
   cd $pkgname-$pkgver
-  echo "\"$pkgver\"" > src/_version.h
+
+  # use full path for execstart
+  sed -i 's|^ExecStart=keymapperd|ExecStart=/usr/bin/keymapperd|' \
+    extra/lib/systemd/system/keymapperd.service
 }
 
 build() {
   cd $pkgname-$pkgver
-  cmake . -DCMAKE_INSTALL_PREFIX=/usr
+  cmake . -DVERSION="$pkgver" -DCMAKE_INSTALL_PREFIX=/usr
   make
 }
 
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
-
-  install -Dm0644 "$srcdir/$pkgname.desktop" \
-    "$pkgdir/usr/share/applications/$pkgname.desktop"
-  install -Dm0644 "$srcdir/${pkgname}d.service" \
-    "$pkgdir/usr/lib/systemd/system/${pkgname}d.service"
 }
 
 # vim: set ts=2 sw=2 et:
diff --git a/keymapper.desktop b/keymapper.desktop
deleted file mode 100644
index e14129da7a15..000000000000
--- a/keymapper.desktop
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Keymapper
-Exec=keymapper -u
-Icon=input-keyboard
diff --git a/keymapperd.service b/keymapperd.service
deleted file mode 100644
index 5fc333a4f114..000000000000
--- a/keymapperd.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Keymapper Daemon
-
-[Service]
-ExecStart=/usr/bin/keymapperd
-
-[Install]
-WantedBy=multi-user.target