diff --git a/ydotool/.SRCINFO b/ydotool/.SRCINFO index 670841f..26e2033 100644 --- a/ydotool/.SRCINFO +++ b/ydotool/.SRCINFO @@ -1,19 +1,23 @@ pkgbase = ydotool pkgdesc = Generic command-line automation tool (no X!) pkgver = 0.2.0 - pkgrel = 1 + pkgrel = 2 url = https://github.com/ReimuNotMoe/ydotool + install = ydotool.install arch = x86_64 - license = MIT + arch = aarch64 + license = AGPL3 makedepends = cmake makedepends = ninja - makedepends = boost makedepends = scdoc depends = libevdevplus depends = libuinputplus - depends = boost-libs source = https://github.com/ReimuNotMoe/ydotool/archive/v0.2.0.tar.gz + source = https://github.com/ReimuNotMoe/ydotool/pull/96.patch + source = 80-uinput.rules sha256sums = 2311b003d2ff383f3348f17101f0df74f56616d530d66d0a014a52ba85a5dcf1 + sha256sums = f462b5f62306a5431e5aa39d1a8ba670300f7304a15cc720af5ded65193eaeda + sha256sums = e092f5e7e474aec6c980c458046d0ff11b18750b53de2bf0a0aba1ca26e6d58e pkgname = ydotool diff --git a/ydotool/.gitignore b/ydotool/.gitignore index 018a3de..c774706 100644 --- a/ydotool/.gitignore +++ b/ydotool/.gitignore @@ -1,4 +1,6 @@ * +!80-uinput.rules +!ydotool.install !PKGBUILD !.SRCINFO !.gitignore diff --git a/ydotool/.gitrepo b/ydotool/.gitrepo index 6e1be5b..0e4c300 100644 --- a/ydotool/.gitrepo +++ b/ydotool/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = https://aur.archlinux.org/ydotool branch = master - commit = 35ccdc8fd314177d829a3a558cd285da6dbc0125 - parent = 8ba772bacca6ab58a787e573552067bb957f5f3e + commit = 3d582f978636ffcd1e98be5a6a0f476a41863f41 + parent = 2384d984319aab21ca7ccbca3699a68f8513e226 method = merge cmdver = 0.4.3 diff --git a/ydotool/80-uinput.rules b/ydotool/80-uinput.rules new file mode 100644 index 0000000..9287e38 --- /dev/null +++ b/ydotool/80-uinput.rules @@ -0,0 +1,3 @@ +## ydotoold fix +## https://github.com/ReimuNotMoe/ydotool/issues/25#issuecomment-535842993 +KERNEL=="uinput", GROUP="input", MODE="0660", OPTIONS+="static_node=uinput" diff --git a/ydotool/PKGBUILD b/ydotool/PKGBUILD index 58cebc6..b58ce5a 100644 --- a/ydotool/PKGBUILD +++ b/ydotool/PKGBUILD @@ -2,38 +2,39 @@ pkgname=ydotool pkgver=0.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="Generic command-line automation tool (no X!)" -arch=('x86_64') -depends=('libevdevplus' 'libuinputplus' 'boost-libs') -makedepends=('cmake' 'ninja' 'boost' 'scdoc') +arch=('x86_64' 'aarch64') +depends=('libevdevplus' 'libuinputplus') +makedepends=('cmake' 'ninja' 'scdoc') url="https://github.com/ReimuNotMoe/ydotool" -license=('MIT') -source=("$url/archive/v$pkgver.tar.gz") -sha256sums=('2311b003d2ff383f3348f17101f0df74f56616d530d66d0a014a52ba85a5dcf1') +license=('AGPL3') +source=("$url/archive/v$pkgver.tar.gz" + "$url/pull/96.patch" + "80-uinput.rules") +sha256sums=('2311b003d2ff383f3348f17101f0df74f56616d530d66d0a014a52ba85a5dcf1' + 'f462b5f62306a5431e5aa39d1a8ba670300f7304a15cc720af5ded65193eaeda' + 'e092f5e7e474aec6c980c458046d0ff11b18750b53de2bf0a0aba1ca26e6d58e') +install=ydotool.install + +prepare() { + cd "$pkgname-$pkgver" + patch -sp1 -i ../96.patch +} build() { cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_MANDIR=/usr/share/man \ -DCMAKE_BUILD_TYPE=Release \ -DCXXOPTS_ENABLE_INSTALL=OFF \ -G Ninja \ -S "$pkgname-$pkgver" -B build ninja -C build - - scdoc < "$pkgname-$pkgver"/manpage/ydotool.1.scd > "build/ydotool.1" - scdoc < "$pkgname-$pkgver"/manpage/ydotoold.8.scd > "build/ydotoold.8" } package() { - #TODO: install is broken upstream - # DESTDIR="$pkgdir" ninja -C build install + DESTDIR="$pkgdir" ninja -C build install - install -Dm755 build/ydotool "$pkgdir/usr/bin/ydotool" - install -Dm755 build/ydotoold "$pkgdir/usr/bin/ydotoold" - - install -Dm644 build/ydotool.1 "$pkgdir/usr/share/man/man1/ydotool.1" - install -Dm644 build/ydotoold.8 "$pkgdir/usr/share/man/man8/ydotoold.8" - - install -Dm644 "$pkgname-$pkgver"/Daemon/ydotool.service "$pkgdir/usr/lib/systemd/user/ydotool.service" + install -Dm644 80-uinput.rules "$pkgdir/etc/udev/rules.d/80-uinput.rules" } diff --git a/ydotool/ydotool.install b/ydotool/ydotool.install new file mode 100644 index 0000000..065f9b4 --- /dev/null +++ b/ydotool/ydotool.install @@ -0,0 +1,8 @@ +post_install() { + echo 'Make sure your user is in the `input` group by running the following command:' + echo ' $ usermod -aG input $USER' +} + +post_upgrade() { + post_install +}