diff options
author | Sebastian Wiesner | 2021-03-25 08:16:58 +0100 |
---|---|---|
committer | Sebastian Wiesner | 2021-03-25 08:16:58 +0100 |
commit | ed795cfc45f2c59e03f898f7b3422d1039d166e0 (patch) | |
tree | b4ee5e7dff7f53bddad4a8643f959a20d48a2bf6 | |
parent | 3446a9c12c68b88332aa1fc9aa9581c96aa0a3ad (diff) | |
download | aur-ed795cfc45f2c59e03f898f7b3422d1039d166e0.tar.gz |
upgpkg: zsa-wally 2.1.0-11
Restore source-based package
-rw-r--r-- | .SRCINFO | 23 | ||||
-rw-r--r-- | PKGBUILD | 68 | ||||
-rw-r--r-- | modernize-udev-rules.patch | 32 |
3 files changed, 92 insertions, 31 deletions
@@ -1,23 +1,24 @@ pkgbase = zsa-wally - pkgdesc = Wally: Flash your ZSA Keyboard the EZ way. + pkgdesc = Flash your ZSA Keyboard the EZ way. pkgver = 2.1.0 - pkgrel = 10 + pkgrel = 11 url = https://github.com/zsa/wally arch = i686 arch = x86_64 license = MIT + makedepends = go + makedepends = npm depends = gtk3 depends = webkit2gtk depends = libusb - provides = wally - source = https://github.com/zsa/wally/releases/download/2.1.0-linux/wally - source = https://github.com/zsa/wally/raw/2.1.0-linux/appicon.png - source = https://github.com/zsa/wally/raw/2.1.0-linux/dist/linux64/50-wally.rules - source = https://github.com/zsa/wally/raw/2.1.0-linux/dist/linux64/wally.desktop - sha256sums = cdb168899d4e3a81eddfcfa7746d1e4e0dab886ea043644e54339b51f396c087 - sha256sums = 81df9f24859cfd19ee8128d74a72155fe222e33349c9a647da98922f3f5b7857 - sha256sums = 269c9196bc65b2e62be549e3d34e56768fe702ff099b7780a1661ca4c92a0143 - sha256sums = d769c63305a6a4f5aa1d661826d8c475014ef8b456e60074596e940e7901c130 + source = zsa-wally-2.1.0.tar.gz::https://github.com/zsa/wally/archive/refs/tags/2.1.0-linux.tar.gz + source = modernize-udev-rules.patch + md5sums = f4a98a0e51d5d0b6d23a95858d230e11 + md5sums = d444c2b74b3c51c265f91020942075bc + sha1sums = deb20d7c9b1a1eb799bb2288540fb7119f1f8ba2 + sha1sums = 62c1903d3723399d209f0642849d850e91feaef8 + sha512sums = d84c469f7d43ba86eb5d0d527a17b588ea12e0272897231392e0572cef0a80f806948a225e263806e5cf7b2fc95eb58e02468ecbe8d12f69ec07919eb364e789 + sha512sums = 923cd4c9795f9828a827e8f5d832ee6f0b74aeb19d948f4e9d8eb7b59d93a570a4bd5e0e0e0b24adfa78644df60425063b37f19ae658e1a3c6200a6c9c126793 pkgname = zsa-wally @@ -1,30 +1,58 @@ -# Maintainer: Christopher Fair <christopherpfair@comcast.net> +# Maintainer: Sebastian Wiesner <sebastian@swsnr.de> pkgname=zsa-wally pkgver=2.1.0 -pkgrel=10 -srcRepo="https://github.com/zsa/wally/raw/${pkgver}-linux" -srcRepoExp="${srcRepo}/dist/linux64" -pkgdesc="Wally: Flash your ZSA Keyboard the EZ way." +pkgrel=11 +pkgdesc="Flash your ZSA Keyboard the EZ way." arch=('i686' 'x86_64') url="https://github.com/zsa/wally" -license=('MIT') -depends=('gtk3' 'webkit2gtk' 'libusb') -provides=('wally') -source=("https://github.com/zsa/wally/releases/download/${pkgver}-linux/wally" - "${srcRepo}/appicon.png" - "${srcRepoExp}/50-wally.rules" - "${srcRepoExp}/wally.desktop" +license=("MIT") +depends=("gtk3" "webkit2gtk" "libusb") +makedepends=("go" "npm") +source=( + "$pkgname-$pkgver.tar.gz::https://github.com/zsa/wally/archive/refs/tags/$pkgver-linux.tar.gz" + "modernize-udev-rules.patch" ) -sha256sums=('cdb168899d4e3a81eddfcfa7746d1e4e0dab886ea043644e54339b51f396c087' - '81df9f24859cfd19ee8128d74a72155fe222e33349c9a647da98922f3f5b7857' - '269c9196bc65b2e62be549e3d34e56768fe702ff099b7780a1661ca4c92a0143' - 'd769c63305a6a4f5aa1d661826d8c475014ef8b456e60074596e940e7901c130' - ) +md5sums=('f4a98a0e51d5d0b6d23a95858d230e11' + 'd444c2b74b3c51c265f91020942075bc') +sha1sums=('deb20d7c9b1a1eb799bb2288540fb7119f1f8ba2' + '62c1903d3723399d209f0642849d850e91feaef8') +sha512sums=('d84c469f7d43ba86eb5d0d527a17b588ea12e0272897231392e0572cef0a80f806948a225e263806e5cf7b2fc95eb58e02468ecbe8d12f69ec07919eb364e789' + '923cd4c9795f9828a827e8f5d832ee6f0b74aeb19d948f4e9d8eb7b59d93a570a4bd5e0e0e0b24adfa78644df60425063b37f19ae658e1a3c6200a6c9c126793') + +prepare() { + cd "wally-$pkgver-linux" + + patch --strip=1 --input="$srcdir/modernize-udev-rules.patch" + + export GOPATH="$srcdir/gopath" + go get -u github.com/wailsapp/wails/cmd/wails +} + +build() { + cd "wally-$pkgver-linux" + + export GOPATH="$srcdir/gopath" + export PATH="$(go env GOPATH)/bin:$PATH" + + export CGO_CPPFLAGS="${CPPFLAGS}" + export CGO_CFLAGS="${CFLAGS}" + export CGO_CXXFLAGS="${CXXFLAGS}" + export CGO_LDFLAGS="${LDFLAGS}" + export GOFLAGS="-buildmode=pie -trimpath" + # Don't know what this does but it's in the install.linux.sh script from upstream + export CGO_ENABLED=1 + + wails build +} package() { + cd "wally-$pkgver-linux" + install -Dm755 build/wally "$pkgdir/usr/bin/wally" + 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" - install -Dm755 wally "$pkgdir/usr/bin/wally" - install -Dm644 50-wally.rules "$pkgdir/etc/udev/rules.d/50-wally.rules" - install -Dm644 wally.desktop "$pkgdir/usr/share/applications/wally.desktop" + # 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" } diff --git a/modernize-udev-rules.patch b/modernize-udev-rules.patch new file mode 100644 index 000000000000..9e078a463f23 --- /dev/null +++ b/modernize-udev-rules.patch @@ -0,0 +1,32 @@ +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 +index bcbd6a2..1353099 100644 +--- c/dist/linux64/50-wally.rules ++++ w/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" |