summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO18
-rw-r--r--PKGBUILD23
-rw-r--r--modernize-udev-rules.patch91
3 files changed, 94 insertions, 38 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c6fffe0ddbf0..e22b37ef3a58 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = zsa-wally
pkgdesc = Flash your ZSA Keyboard the EZ way.
- pkgver = 2.1.0
- pkgrel = 13
+ pkgver = 2.1.1
+ pkgrel = 1
url = https://github.com/zsa/wally
arch = i686
arch = x86_64
@@ -11,17 +11,17 @@ pkgbase = zsa-wally
depends = gtk3
depends = webkit2gtk
depends = libusb
- source = zsa-wally-2.1.0.tar.gz::https://github.com/zsa/wally/archive/refs/tags/2.1.0-linux.tar.gz
+ source = zsa-wally-2.1.1.tar.gz::https://github.com/zsa/wally/archive/refs/tags/2.1.1-linux.tar.gz
source = modernize-udev-rules.patch
source = desktop-file.patch
- md5sums = f4a98a0e51d5d0b6d23a95858d230e11
- md5sums = d444c2b74b3c51c265f91020942075bc
+ md5sums = 7eaa2f3830036028ae50badfdffb1e5e
+ md5sums = 08e3b0ae2f4fef743f7b7304fcc20ebd
md5sums = e1800d7066a392864619db15145fe735
- sha1sums = deb20d7c9b1a1eb799bb2288540fb7119f1f8ba2
- sha1sums = 62c1903d3723399d209f0642849d850e91feaef8
+ sha1sums = 765bb9e39dc5589ddd078a51ca743d4ece5c806d
+ sha1sums = c2a11854e3d34d676c3ac6859a35e950bfc6b5a2
sha1sums = 3e1bd7e97924712381860ae3264b6600f5e9c23c
- sha512sums = d84c469f7d43ba86eb5d0d527a17b588ea12e0272897231392e0572cef0a80f806948a225e263806e5cf7b2fc95eb58e02468ecbe8d12f69ec07919eb364e789
- sha512sums = 923cd4c9795f9828a827e8f5d832ee6f0b74aeb19d948f4e9d8eb7b59d93a570a4bd5e0e0e0b24adfa78644df60425063b37f19ae658e1a3c6200a6c9c126793
+ sha512sums = 2168c92e31053d78ce6914db023cae49781a2d47a97d173602cabca9d19cbbda95c3774b18f6a73de2aa65550d329af1b5458e82a3aff43714e9f29fc1060782
+ sha512sums = 5c1015f5e480241e71a2dffd3c5d92d2934e7b8ec2fe5b50e0bbe3e94c049bbc67d5cdadb1941de4a99e0033c9ee568141f368ca52d4ab2913afb7bfa67f6141
sha512sums = 1f967e5ec80760b9a0cf0345d5227caf679398b3b78e0f05ddd5a5c1909039c15a8547aee9174e76beac84395a2b63b31c74396a66bce2193517f494b92216b4
pkgname = zsa-wally
diff --git a/PKGBUILD b/PKGBUILD
index 6fe2b95ee86f..fd2f9fe56c03 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
# Maintainer: Sebastian Wiesner <sebastian@swsnr.de>
pkgname=zsa-wally
-pkgver=2.1.0
-pkgrel=13
+pkgver=2.1.1
+pkgrel=1
pkgdesc="Flash your ZSA Keyboard the EZ way."
arch=('i686' 'x86_64')
url="https://github.com/zsa/wally"
@@ -14,14 +14,14 @@ source=(
"modernize-udev-rules.patch"
"desktop-file.patch"
)
-md5sums=('f4a98a0e51d5d0b6d23a95858d230e11'
- 'd444c2b74b3c51c265f91020942075bc'
+md5sums=('7eaa2f3830036028ae50badfdffb1e5e'
+ '08e3b0ae2f4fef743f7b7304fcc20ebd'
'e1800d7066a392864619db15145fe735')
-sha1sums=('deb20d7c9b1a1eb799bb2288540fb7119f1f8ba2'
- '62c1903d3723399d209f0642849d850e91feaef8'
+sha1sums=('765bb9e39dc5589ddd078a51ca743d4ece5c806d'
+ 'c2a11854e3d34d676c3ac6859a35e950bfc6b5a2'
'3e1bd7e97924712381860ae3264b6600f5e9c23c')
-sha512sums=('d84c469f7d43ba86eb5d0d527a17b588ea12e0272897231392e0572cef0a80f806948a225e263806e5cf7b2fc95eb58e02468ecbe8d12f69ec07919eb364e789'
- '923cd4c9795f9828a827e8f5d832ee6f0b74aeb19d948f4e9d8eb7b59d93a570a4bd5e0e0e0b24adfa78644df60425063b37f19ae658e1a3c6200a6c9c126793'
+sha512sums=('2168c92e31053d78ce6914db023cae49781a2d47a97d173602cabca9d19cbbda95c3774b18f6a73de2aa65550d329af1b5458e82a3aff43714e9f29fc1060782'
+ '5c1015f5e480241e71a2dffd3c5d92d2934e7b8ec2fe5b50e0bbe3e94c049bbc67d5cdadb1941de4a99e0033c9ee568141f368ca52d4ab2913afb7bfa67f6141'
'1f967e5ec80760b9a0cf0345d5227caf679398b3b78e0f05ddd5a5c1909039c15a8547aee9174e76beac84395a2b63b31c74396a66bce2193517f494b92216b4')
prepare() {
@@ -31,7 +31,8 @@ prepare() {
patch --strip=1 --input="$srcdir/desktop-file.patch"
export GOPATH="$srcdir/gopath"
- go get -modcacherw -u github.com/wailsapp/wails/cmd/wails@v1.8.0
+ # 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
}
build() {
@@ -57,7 +58,5 @@ package() {
install -Dm644 -t "$pkgdir/usr/lib/udev/rules.d/" dist/linux64/50-oryx.rules dist/linux64/50-wally.rules
install -Dm644 dist/linux64/wally.desktop "$pkgdir/usr/share/applications/wally.desktop"
install -Dm644 appicon.png "$pkgdir/usr/share/pixmaps/wally.png"
- # This file is only on master; meanwhile use the license from the Debian package copyright file
- install -Dm644 dist/ppa/wally/template/debian/copyright "$pkgdir/usr/share/licenses/$pkgname/copyright"
- #install -Dm644 license.md "$pkgdir/usr/share/licenses/$pkgname/license.md"
+ install -Dm644 license.md "$pkgdir/usr/share/licenses/$pkgname/license.md"
}
diff --git a/modernize-udev-rules.patch b/modernize-udev-rules.patch
index 9e078a463f23..ff8d0adcaac5 100644
--- a/modernize-udev-rules.patch
+++ b/modernize-udev-rules.patch
@@ -1,21 +1,16 @@
-diff --git c/dist/linux64/50-oryx.rules w/dist/linux64/50-oryx.rules
-index c0b37e6..d1f641e 100644
---- c/dist/linux64/50-oryx.rules
-+++ w/dist/linux64/50-oryx.rules
-@@ -1,6 +1,6 @@
- # Rule for the Moonlander
--SUBSYSTEM=="usb", ATTR{idVendor}=="3297", ATTR{idProduct}=="1969", GROUP="plugdev"
-+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", GROUP="plugdev"
-+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", GROUP="plugdev"
-+SUBSYSTEM=="usb", ATTR{idVendor}=="feed", ATTR{idProduct}=="6060", TAG+="uaccess"
-diff --git c/dist/linux64/50-wally.rules w/dist/linux64/50-wally.rules
+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
---- c/dist/linux64/50-wally.rules
-+++ w/dist/linux64/50-wally.rules
+--- 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"
@@ -30,3 +25,65 @@ index bcbd6a2..1353099 100644
- 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