release 2.1.2 > 2.1.3

4 files changed, 18 insertions, 74 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 71ec8ebdfc72..c0a4f9f72708 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = zsa-wally-bin
 	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,21 +11,17 @@ pkgbase = zsa-wally-bin
 	depends = libusb
 	provides = wally
 	conflicts = zsa-wally
-	source = https://github.com/zsa/wally/releases/download/2.1.2-linux/wally
-	source = https://github.com/zsa/wally/raw/2.1.2-linux/appicon.png
-	source = https://github.com/zsa/wally/raw/2.1.2-linux/license.md
-	source = https://github.com/zsa/wally/raw/2.1.2-linux/dist/linux64/50-wally.rules
-	source = https://github.com/zsa/wally/raw/2.1.2-linux/dist/linux64/50-oryx.rules
-	source = https://github.com/zsa/wally/raw/2.1.2-linux/dist/linux64/wally.desktop
-	source = udev-rules.patch
-	source = desktop.patch
-	sha256sums = 2a6301033a29b5ecf1d5a05e7f760358fb554a3a9eec31f94c9e268b02b191db
+	source = https://github.com/zsa/wally/releases/download/2.1.3-linux/wally
+	source = https://github.com/zsa/wally/raw/2.1.3-linux/appicon.png
+	source = https://github.com/zsa/wally/raw/2.1.3-linux/license.md
+	source = https://github.com/zsa/wally/raw/2.1.3-linux/dist/linux64/50-wally.rules
+	source = https://github.com/zsa/wally/raw/2.1.3-linux/dist/linux64/50-oryx.rules
+	source = https://github.com/zsa/wally/raw/2.1.3-linux/dist/linux64/wally.desktop
+	sha256sums = a30c974c2fd544975e48f7f2ac99a21f936fa3e0803afeeb1096826a79afdbde
 	sha256sums = 81df9f24859cfd19ee8128d74a72155fe222e33349c9a647da98922f3f5b7857
 	sha256sums = d2841d63f4e0bdfda102390ab1ca09136230d22f88538863b24b0c7fc68e548e
-	sha256sums = 269c9196bc65b2e62be549e3d34e56768fe702ff099b7780a1661ca4c92a0143
-	sha256sums = 6c7d4d27745080269115c58c4c5d863b23c534635975f3bca581c52687721c52
-	sha256sums = d769c63305a6a4f5aa1d661826d8c475014ef8b456e60074596e940e7901c130
-	sha256sums = 122bd3a43cbdd395e73474979797eb7327364f3bec29f9e869f704e84da55e41
-	sha256sums = a0d79d48c932c4d6c02ce8e8802dff3e888b35cb996e10a981adb839aafc2afd
+	sha256sums = 05d3e9ef60fe6e18f245457a341db9d84b4c8d81b66da1f061405f3b11d9cd58
+	sha256sums = 2d33fa2da9e757ac3b66a3a6d4f11e08b541847c26573d917108a306cc6e3998
+	sha256sums = 6bd731e8b34dac1995ba9a60312be598d70d7322a7021ef93378c9cb47025d1f
 
 pkgname = zsa-wally-bin
diff --git a/PKGBUILD b/PKGBUILD
index d9f26691fdf0..1af4f0e11c1d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: slimb
 
 pkgname=zsa-wally-bin
-pkgver=2.1.2
+pkgver=2.1.3
 pkgrel=1
 pkgdesc='Flash your ZSA Keyboard the EZ way.'
 arch=('i686' 'x86_64')
@@ -15,23 +15,14 @@ source=("https://github.com/zsa/wally/releases/download/${pkgver}-linux/wally"
         "https://github.com/zsa/wally/raw/${pkgver}-linux/license.md"
         "https://github.com/zsa/wally/raw/${pkgver}-linux/dist/linux64/50-wally.rules"
         "https://github.com/zsa/wally/raw/${pkgver}-linux/dist/linux64/50-oryx.rules"
-        "https://github.com/zsa/wally/raw/${pkgver}-linux/dist/linux64/wally.desktop"
-        'udev-rules.patch'
-        'desktop.patch'
-)
-sha256sums=('2a6301033a29b5ecf1d5a05e7f760358fb554a3a9eec31f94c9e268b02b191db'
+        "https://github.com/zsa/wally/raw/${pkgver}-linux/dist/linux64/wally.desktop")
+
+sha256sums=('a30c974c2fd544975e48f7f2ac99a21f936fa3e0803afeeb1096826a79afdbde'
             '81df9f24859cfd19ee8128d74a72155fe222e33349c9a647da98922f3f5b7857'
             'd2841d63f4e0bdfda102390ab1ca09136230d22f88538863b24b0c7fc68e548e'
-            '269c9196bc65b2e62be549e3d34e56768fe702ff099b7780a1661ca4c92a0143'
-            '6c7d4d27745080269115c58c4c5d863b23c534635975f3bca581c52687721c52'
-            'd769c63305a6a4f5aa1d661826d8c475014ef8b456e60074596e940e7901c130'
-            '122bd3a43cbdd395e73474979797eb7327364f3bec29f9e869f704e84da55e41'
-            'a0d79d48c932c4d6c02ce8e8802dff3e888b35cb996e10a981adb839aafc2afd')
-
-prepare() {
-    patch --follow-symlinks --input="$srcdir/udev-rules.patch"
-    patch --follow-symlinks --input="$srcdir/desktop.patch"
-}
+            '05d3e9ef60fe6e18f245457a341db9d84b4c8d81b66da1f061405f3b11d9cd58'
+            '2d33fa2da9e757ac3b66a3a6d4f11e08b541847c26573d917108a306cc6e3998'
+            '6bd731e8b34dac1995ba9a60312be598d70d7322a7021ef93378c9cb47025d1f')
 
 package() {
     install -Dm755 wally "$pkgdir/usr/bin/wally"
diff --git a/desktop.patch b/desktop.patch
deleted file mode 100644
index 7ebe0813be50..000000000000
--- a/desktop.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/wally.desktop
-+++ b/wally.desktop
-@@ -2,9 +2,9 @@
- 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
- Terminal=false
--Categories=Development;
-+Categories=Settings;HardwareSettings;
diff --git a/udev-rules.patch b/udev-rules.patch
deleted file mode 100644
index bdf2c646568b..000000000000
--- a/udev-rules.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/50-wally.rules
-+++ b/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"
-
---- a/50-oryx.rules
-+++ b/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"