diff options
-rw-r--r-- | .SRCINFO | 18 | ||||
-rw-r--r-- | PKGBUILD | 21 | ||||
-rw-r--r-- | desktop-file.patch | 43 | ||||
-rw-r--r-- | modernize-udev-rules.patch | 89 |
4 files changed, 10 insertions, 161 deletions
@@ -1,6 +1,6 @@ pkgbase = zsa-wally pkgdesc = Flash your ZSA Keyboard the EZ way. - pkgver = 2.1.2 + pkgver = 2.1.3 pkgrel = 1 url = https://github.com/zsa/wally arch = i686 @@ -11,17 +11,9 @@ pkgbase = zsa-wally depends = gtk3 depends = webkit2gtk depends = libusb - source = zsa-wally-2.1.2.tar.gz::https://github.com/zsa/wally/archive/refs/tags/2.1.2-linux.tar.gz - source = modernize-udev-rules.patch - source = desktop-file.patch - md5sums = 2a0ab169ee3ba27509c1ebc7e477f8a3 - md5sums = 08e3b0ae2f4fef743f7b7304fcc20ebd - md5sums = e1800d7066a392864619db15145fe735 - sha1sums = 32d1a33f45ba8dcba767184674a971a8824eef60 - sha1sums = c2a11854e3d34d676c3ac6859a35e950bfc6b5a2 - sha1sums = 3e1bd7e97924712381860ae3264b6600f5e9c23c - sha512sums = 50a5ed4f4ef87fd776089fc352ecf7c2e83c20aec5ae21444122ed8314b0a9219120c63402b2a686c023fbddd1ea2fcb43058c5b64d2a0b2ac73a065d8a6337f - sha512sums = 5c1015f5e480241e71a2dffd3c5d92d2934e7b8ec2fe5b50e0bbe3e94c049bbc67d5cdadb1941de4a99e0033c9ee568141f368ca52d4ab2913afb7bfa67f6141 - sha512sums = 1f967e5ec80760b9a0cf0345d5227caf679398b3b78e0f05ddd5a5c1909039c15a8547aee9174e76beac84395a2b63b31c74396a66bce2193517f494b92216b4 + source = zsa-wally-2.1.3.tar.gz::https://github.com/zsa/wally/archive/refs/tags/2.1.3-linux.tar.gz + md5sums = cc954f216d5afd6e2665de38365ab5aa + sha1sums = 00a4ca823dd2fbb8dfc54b494024ce4d475ea8f0 + sha512sums = f8afbef55e108986aeb5b97e924c1b98492b4ab3bca08fe56b32a21c047a085de663b0ac86724c2104ab63bb19bfdc023f4cff29a0a5284515f0d77ec9354201 pkgname = zsa-wally @@ -1,7 +1,7 @@ # Maintainer: Sebastian Wiesner <sebastian@swsnr.de> pkgname=zsa-wally -pkgver=2.1.2 +pkgver=2.1.3 pkgrel=1 pkgdesc="Flash your ZSA Keyboard the EZ way." arch=('i686' 'x86_64') @@ -11,28 +11,17 @@ depends=("gtk3" "webkit2gtk" "libusb") makedepends=("go" "npm") source=( "$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/$pkgver-linux.tar.gz" - "modernize-udev-rules.patch" - "desktop-file.patch" ) -md5sums=('2a0ab169ee3ba27509c1ebc7e477f8a3' - '08e3b0ae2f4fef743f7b7304fcc20ebd' - 'e1800d7066a392864619db15145fe735') -sha1sums=('32d1a33f45ba8dcba767184674a971a8824eef60' - 'c2a11854e3d34d676c3ac6859a35e950bfc6b5a2' - '3e1bd7e97924712381860ae3264b6600f5e9c23c') -sha512sums=('50a5ed4f4ef87fd776089fc352ecf7c2e83c20aec5ae21444122ed8314b0a9219120c63402b2a686c023fbddd1ea2fcb43058c5b64d2a0b2ac73a065d8a6337f' - '5c1015f5e480241e71a2dffd3c5d92d2934e7b8ec2fe5b50e0bbe3e94c049bbc67d5cdadb1941de4a99e0033c9ee568141f368ca52d4ab2913afb7bfa67f6141' - '1f967e5ec80760b9a0cf0345d5227caf679398b3b78e0f05ddd5a5c1909039c15a8547aee9174e76beac84395a2b63b31c74396a66bce2193517f494b92216b4') +md5sums=('cc954f216d5afd6e2665de38365ab5aa') +sha1sums=('00a4ca823dd2fbb8dfc54b494024ce4d475ea8f0') +sha512sums=('f8afbef55e108986aeb5b97e924c1b98492b4ab3bca08fe56b32a21c047a085de663b0ac86724c2104ab63bb19bfdc023f4cff29a0a5284515f0d77ec9354201') prepare() { cd "wally-$pkgver-linux" - patch --strip=1 --input="$srcdir/modernize-udev-rules.patch" - patch --strip=1 --input="$srcdir/desktop-file.patch" - export GOPATH="$srcdir/gopath" # This needs to be the same version as in mod.go from wally - go get -modcacherw github.com/wailsapp/wails/cmd/wails@v1.16.2 + go get -modcacherw github.com/wailsapp/wails/cmd/wails@v1.16.6 } build() { diff --git a/desktop-file.patch b/desktop-file.patch deleted file mode 100644 index 8ee93ba151b6..000000000000 --- a/desktop-file.patch +++ /dev/null @@ -1,43 +0,0 @@ -From b4dd6ca42c8a4b2cd7a6b79cf9938dd49d64e696 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= - <Mailaender@users.noreply.github.com> -Date: Thu, 14 Jan 2021 20:50:43 +0100 -Subject: [PATCH 1/2] Use a valid category. - ---- - dist/linux64/wally.desktop | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dist/linux64/wally.desktop b/dist/linux64/wally.desktop -index 396cede..b9556bc 100644 ---- a/dist/linux64/wally.desktop -+++ b/dist/linux64/wally.desktop -@@ -7,4 +7,4 @@ Comment=Flash your ZSA keyboard the EZ way - Exec=wally - Icon=wally - Terminal=false --Categories=Development; -+Categories=Settings;HardwareSettings; - -From f71c234e94fb4937485884cfe2fae13207517eb2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= - <Mailaender@users.noreply.github.com> -Date: Thu, 14 Jan 2021 20:51:22 +0100 -Subject: [PATCH 2/2] Add a generic name. - ---- - dist/linux64/wally.desktop | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/dist/linux64/wally.desktop b/dist/linux64/wally.desktop -index b9556bc..27d0cd8 100644 ---- a/dist/linux64/wally.desktop -+++ b/dist/linux64/wally.desktop -@@ -3,6 +3,7 @@ Type=Application - Version=1.0 - Name=Wally - Name[en_US]=Wally -+GenericName=ZSA Keyboard Flashing Tool - Comment=Flash your ZSA keyboard the EZ way - Exec=wally - Icon=wally diff --git a/modernize-udev-rules.patch b/modernize-udev-rules.patch deleted file mode 100644 index ff8d0adcaac5..000000000000 --- a/modernize-udev-rules.patch +++ /dev/null @@ -1,89 +0,0 @@ -From d9da6cd4a3f60dc4e6da20618019490632e15acb Mon Sep 17 00:00:00 2001 -From: Sebastian Wiesner <sebastian@swsnr.de> -Date: Sun, 21 Mar 2021 11:46:55 +0100 -Subject: [PATCH 1/3] Use uaccess tag instead of world permissions - ---- - dist/linux64/50-wally.rules | 8 +++----- - 1 file changed, 3 insertions(+), 5 deletions(-) - -diff --git a/dist/linux64/50-wally.rules b/dist/linux64/50-wally.rules -index bcbd6a2..1353099 100644 ---- a/dist/linux64/50-wally.rules -+++ b/dist/linux64/50-wally.rules -@@ -1,10 +1,8 @@ - # Teensy rules for the Ergodox EZ Original / Shine / Glow - ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", ENV{ID_MM_DEVICE_IGNORE}="1" - ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789A]?", ENV{MTP_NO_PROBE}="1" --SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789ABCD]?", MODE:="0666" --KERNEL=="ttyACM*", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", MODE:="0666" -+SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789ABCD]?", TAG+="uaccess" -+KERNEL=="ttyACM*", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", TAG+="uaccess" - - # STM32 rules for the Moonlander and Planck EZ Standard / Glow --SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", \ -- MODE:="0666", \ -- SYMLINK+="stm32_dfu" -+SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", TAG+="uaccess", SYMLINK+="stm32_dfu" - -From 8937bcad9d778c07e7ff57cdf613182101017f54 Mon Sep 17 00:00:00 2001 -From: Sebastian Wiesner <sebastian@swsnr.de> -Date: Sun, 21 Mar 2021 11:47:17 +0100 -Subject: [PATCH 2/3] Remove legacy udev-acl tag - ---- - dist/linux64/50-oryx.rules | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/dist/linux64/50-oryx.rules b/dist/linux64/50-oryx.rules -index 36367d4..d1f641e 100644 ---- a/dist/linux64/50-oryx.rules -+++ b/dist/linux64/50-oryx.rules -@@ -1,6 +1,6 @@ - # Rule for the Moonlander --SUBSYSTEM=="usb", ATTR{idVendor}=="3297", ATTR{idProduct}=="1969", TAG+="uaccess", TAG+="udev-acl" -+SUBSYSTEM=="usb", ATTR{idVendor}=="3297", ATTR{idProduct}=="1969", TAG+="uaccess" - # Rule for the Ergodox EZ Original / Shine / Glow --SUBSYSTEM=="usb", ATTR{idVendor}=="feed", ATTR{idProduct}=="1307", TAG+="uaccess", TAG+="udev-acl" -+SUBSYSTEM=="usb", ATTR{idVendor}=="feed", ATTR{idProduct}=="1307", TAG+="uaccess" - # Rule for the Planck EZ Standard / Glow --SUBSYSTEM=="usb", ATTR{idVendor}=="feed", ATTR{idProduct}=="6060", TAG+="uaccess", TAG+="udev-acl" -+SUBSYSTEM=="usb", ATTR{idVendor}=="feed", ATTR{idProduct}=="6060", TAG+="uaccess" - -From f512ffc4374435ccbb12b53693083405784138b9 Mon Sep 17 00:00:00 2001 -From: Sebastian Wiesner <sebastian@swsnr.de> -Date: Sun, 21 Mar 2021 12:01:04 +0100 -Subject: [PATCH 3/3] Update rules in install script - ---- - install.linux.sh | 17 +++-------------- - 1 file changed, 3 insertions(+), 14 deletions(-) - -diff --git a/install.linux.sh b/install.linux.sh -index 5ae646f..c0984a9 100755 ---- a/install.linux.sh -+++ b/install.linux.sh -@@ -35,20 +35,9 @@ for key in ${!packageAA[@]}; do - which $key && sudo $key install -y ${packageAA[$key]} - done - --# WALLY UDEV RULE FOR DEVICE RELATED EVENT --cat <<EOF | sudo tee /etc/udev/rules.d/50-wally.rules --# Teensy rules for the Ergodox EZ --ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", ENV{ID_MM_DEVICE_IGNORE}="1" --ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789A]?", ENV{MTP_NO_PROBE}="1" --SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789ABCD]?", MODE:="0666" --KERNEL=="ttyACM*", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", MODE:="0666" --# STM32 rules for the Moonlander and Planck EZ --SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", MODE:="0666", SYMLINK+="stm32_dfu" --EOF -- --# ADD USER TO PLUGDEV GROUP --sudo groupadd plugdev --sudo usermod -aG plugdev $USER -+# UDEV RULES -+install -m644 -t /etc/udev/rules.d/ \ -+ dist/linux64/50-oryx.rules dist/linux64/50-wally.rules - - # HARDWARE PLATFORM DEPENDENT WALLY - if [[ "$(uname -i)" =~ 'x86' ]]; then |