qubes-input-proxy: upgrade to 1.0.39
All checks were successful
/ lint (pull_request) Successful in 32s
/ deploy-v3.19 (pull_request) Successful in 36s
/ build-v3.19 (pull_request) Successful in 1m19s
/ deploy-v3.20 (pull_request) Successful in 35s
/ build-v3.20 (pull_request) Successful in 1m17s
/ build-edge (pull_request) Successful in 1m33s
/ deploy-edge (pull_request) Successful in 33s

This commit is contained in:
Antoine Martin 2024-11-10 09:31:02 -05:00
parent 98832aa3d5
commit f7b636e20a
Signed by: forge
GPG key ID: D62A472A4AA7D541
2 changed files with 9 additions and 8 deletions

View file

@ -1,7 +1,7 @@
# Contributor: Antoine Martin (ayakael) <dev@ayakael.net> # Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
pkgname=qubes-input-proxy pkgname=qubes-input-proxy
pkgver=1.0.38 pkgver=1.0.39
_gittag=v$pkgver _gittag=v$pkgver
pkgrel=0 pkgrel=0
pkgdesc="The Qubes service for proxying input devices" pkgdesc="The Qubes service for proxying input devices"
@ -46,8 +46,8 @@ package() {
install -Dm755 "$srcdir"/qubes-input-sender.openrc "$pkgdir"/etc/init.d/qubes-input-sender install -Dm755 "$srcdir"/qubes-input-sender.openrc "$pkgdir"/etc/init.d/qubes-input-sender
} }
sha512sums=" sha512sums="
bf4b44ee58347d78682a9b2c9eac10679a7ff17dfd56019a83b009b1165fd3833bc484df3cf9b13068b6754343c017f38a8d2ac2c06e1a0ee53646066daf658a qubes-input-proxy-v1.0.38.tar.gz 097056a4700a70b9e1e109f622bbff100728166ff30bfc4b58edf3b18f8f4b053c3152f7e43b60c6c671cb2ad2eb8de7d6544d844ba6456d74f2376d6967dcaf qubes-input-proxy-v1.0.39.tar.gz
88aa950c3014fc9e87af9bafd7cfaed9ac123c01c5ec1731cb654802e2139f5eb7a94ca58c7746dde773c2110deab9f0b90cf0f94bcc3f2ecf9421d7e17d2d40 qubes-input-trigger_use-openrc.patch 4f8881928a32d83dbf0872067e04ab269e8f4cc622bdf0e35c53ccc330456e4b15112a142aa648fb07070ae88d9c327e6958cc8e39600820a9291fc4cd7ea242 qubes-input-trigger_use-openrc.patch
21e7b95c94ec1a3f3499e79cf8b1931da2c3e33d8f1af2efe6b52b7e2678d4648bb0597b3a4a95cc10d0ca3cb83df93075b99cf1b615d8493a9e2fd21fb7f8f7 makefile_skip-systemd.patch 21e7b95c94ec1a3f3499e79cf8b1931da2c3e33d8f1af2efe6b52b7e2678d4648bb0597b3a4a95cc10d0ca3cb83df93075b99cf1b615d8493a9e2fd21fb7f8f7 makefile_skip-systemd.patch
2d5cb4369bc4d4c83403bb3e7cd7bc784769950a8fbf581996074fe53cc65c56fe4039e2689b6fa34e51ce22e552fc145115c12e71601809767962a3682dd299 qubes-input-sender.openrc 2d5cb4369bc4d4c83403bb3e7cd7bc784769950a8fbf581996074fe53cc65c56fe4039e2689b6fa34e51ce22e552fc145115c12e71601809767962a3682dd299 qubes-input-sender.openrc
" "

View file

@ -1,15 +1,16 @@
diff --git a/qubes-rpc/qubes-input-trigger.orig b/qubes-rpc/qubes-input-trigger diff --git a/qubes-rpc/qubes-input-trigger.orig b/qubes-rpc/qubes-input-trigger
index 5fa0e5a..0dd3773 100755 index 264788e..edd40ec 100755
--- a/qubes-rpc/qubes-input-trigger.orig --- a/qubes-rpc/qubes-input-trigger.orig
+++ b/qubes-rpc/qubes-input-trigger +++ b/qubes-rpc/qubes-input-trigger
@@ -42,48 +42,68 @@ def get_service_name(udevreturn, input_dev): @@ -51,49 +51,69 @@ def get_service_name(udevreturn, input_dev):
('ID_INPUT_TOUCHPAD' in udevreturn) or ('ID_INPUT_TOUCHPAD' in udevreturn) or
('QEMU_USB_Tablet' in udevreturn) ('QEMU_USB_Tablet' in udevreturn)
) and 'ID_INPUT_KEY' not in udevreturn: ) and 'ID_INPUT_KEY' not in udevreturn:
- service = 'qubes-input-sender-tablet' - service = 'qubes-input-sender-tablet'
+ service = 'qubes-input-sender.tablet' + service = 'qubes-input-sender.tablet'
# PiKVM "mouse" is special, as it sends absolute events # if mouse report absolute events, prefer tablet service
elif 'ID_INPUT_MOUSE' in udevreturn and 'ID_USB_VENDOR=PiKVM' in udevreturn: # (0x3 is ABS_X | ABS_Y)
elif 'ID_INPUT_MOUSE' in udevreturn and abs_caps & 0x3:
- service = 'qubes-input-sender-tablet' - service = 'qubes-input-sender-tablet'
+ service = 'qubes-input-sender.tablet' + service = 'qubes-input-sender.tablet'
elif 'ID_INPUT_MOUSE' in udevreturn and 'ID_INPUT_KEY' not in udevreturn: elif 'ID_INPUT_MOUSE' in udevreturn and 'ID_INPUT_KEY' not in udevreturn:
@ -20,7 +21,7 @@ index 5fa0e5a..0dd3773 100755
+ service = 'qubes-input-sender.keyboard' + service = 'qubes-input-sender.keyboard'
elif 'ID_INPUT_MOUSE' in udevreturn and 'ID_INPUT_KEY' in udevreturn: elif 'ID_INPUT_MOUSE' in udevreturn and 'ID_INPUT_KEY' in udevreturn:
- service = 'qubes-input-sender-keyboard-mouse' - service = 'qubes-input-sender-keyboard-mouse'
+ service = 'qubes-input-sender.mouse' + service = 'qubes-input-sender.keyboardmouse'
if service: if service:
- service = '{}@{}.service'.format(service, input_dev) - service = '{}@{}.service'.format(service, input_dev)