Updated for version 0.52

3 files changed, 40 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 77cc5cf55297..831f3815df82 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = k40whisperer
 	pkgdesc = Control software for the stock K40 Laser controller
-	pkgver = 0.49
+	pkgver = 0.52
 	pkgrel = 1
 	url = https://www.scorchworks.com/K40whisperer/k40whisperer.html
 	install = k40whisperer.install
@@ -14,14 +14,14 @@ pkgbase = k40whisperer
 	depends = python-pillow
 	depends = tk
 	optdepends = python-pyclipper
-	source = https://www.scorchworks.com/K40whisperer/K40_Whisperer-0.49_src.zip
+	source = https://www.scorchworks.com/K40whisperer/K40_Whisperer-0.52_src.zip
 	source = 97-ctc-lasercutter.rules
 	source = k40whisperer.install
 	source = k40_whisperer.py.patch
-	sha256sums = 8695f33777657bf2a764217538f9da68a05fc9fcec503451e2223b72df042883
+	sha256sums = 8a4a30b618d22ac57912f0919a3282031cf6a06747f4dca46d8aa6b14074bf78
 	sha256sums = 19b490100927a74a4db8c6332b8a995eb1d1dc24c31467c03e3d8ac62759b508
 	sha256sums = 5d32866a044ce3239881eacd01720b95285031a003a79056644d30e728fcee19
-	sha256sums = 185e47d9722e6fbc3a726c00eb2ae7dd0c0a374cdfb79237fa8efa5398d0cee0
+	sha256sums = cbeb40bdee4652c3a700f5aedc5ca6cce40d58c31a1bb5e608ca04d67ee7d007
 
 pkgname = k40whisperer
 
diff --git a/PKGBUILD b/PKGBUILD
index 300ac75b85b9..7e4538506b64 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Nat Lasseter <aur at 4574 dot co dot uk>
 
 pkgname="k40whisperer"
-pkgver="0.49"
+pkgver="0.52"
 pkgrel="1"
 pkgdesc="Control software for the stock K40 Laser controller"
 arch=("any")
@@ -22,10 +22,10 @@ source=(
   "k40_whisperer.py.patch"
 )
 sha256sums=(
-  "8695f33777657bf2a764217538f9da68a05fc9fcec503451e2223b72df042883"
+  "8a4a30b618d22ac57912f0919a3282031cf6a06747f4dca46d8aa6b14074bf78"
   "19b490100927a74a4db8c6332b8a995eb1d1dc24c31467c03e3d8ac62759b508"
   "5d32866a044ce3239881eacd01720b95285031a003a79056644d30e728fcee19"
-  "185e47d9722e6fbc3a726c00eb2ae7dd0c0a374cdfb79237fa8efa5398d0cee0"
+  "cbeb40bdee4652c3a700f5aedc5ca6cce40d58c31a1bb5e608ca04d67ee7d007"
 )
 
 install="${pkgname}.install"
diff --git a/k40_whisperer.py.patch b/k40_whisperer.py.patch
index 329b5ac6d9d6..3270dd84be83 100644
--- a/k40_whisperer.py.patch
+++ b/k40_whisperer.py.patch
@@ -1,22 +1,33 @@
-512,515c512,515
-<             self.left_image  = self.Imaging_Free(Image.open("left.png"),bg=None)
-<             self.right_image = self.Imaging_Free(Image.open("right.png"),bg=None)
-<             self.up_image    = self.Imaging_Free(Image.open("up.png"),bg=None)
-<             self.down_image  = self.Imaging_Free(Image.open("down.png"),bg=None)
----
->             self.left_image  = self.Imaging_Free(Image.open("/usr/lib/k40whisperer/left.png"),bg=None)
->             self.right_image = self.Imaging_Free(Image.open("/usr/lib/k40whisperer/right.png"),bg=None)
->             self.up_image    = self.Imaging_Free(Image.open("/usr/lib/k40whisperer/up.png"),bg=None)
->             self.down_image  = self.Imaging_Free(Image.open("/usr/lib/k40whisperer/down.png"),bg=None)
-522,526c522,526
-<             self.UL_image  = self.Imaging_Free(Image.open("UL.png"),bg=None)
-<             self.UR_image  = self.Imaging_Free(Image.open("UR.png"),bg=None)
-<             self.LR_image  = self.Imaging_Free(Image.open("LR.png"),bg=None)
-<             self.LL_image  = self.Imaging_Free(Image.open("LL.png"),bg=None)
-<             self.CC_image  = self.Imaging_Free(Image.open("CC.png"),bg=None)
----
->             self.UL_image  = self.Imaging_Free(Image.open("/usr/lib/k40whisperer/UL.png"),bg=None)
->             self.UR_image  = self.Imaging_Free(Image.open("/usr/lib/k40whisperer/UR.png"),bg=None)
->             self.LR_image  = self.Imaging_Free(Image.open("/usr/lib/k40whisperer/LR.png"),bg=None)
->             self.LL_image  = self.Imaging_Free(Image.open("/usr/lib/k40whisperer/LL.png"),bg=None)
->             self.CC_image  = self.Imaging_Free(Image.open("/usr/lib/k40whisperer/CC.png"),bg=None)
+--- k40_whisperer.py	2020-07-05 17:55:14.289666498 +0100
++++ k40_whisperer.py.patched	2020-07-05 17:55:31.979666539 +0100
+@@ -510,21 +510,21 @@
+         self.Stop_Button       = Button(self.master,text="Pause/Stop",      command=self.Stop)
+ 
+         try:
+-            self.left_image  = self.Imaging_Free(Image.open("left.png"),bg=None)
+-            self.right_image = self.Imaging_Free(Image.open("right.png"),bg=None)
+-            self.up_image    = self.Imaging_Free(Image.open("up.png"),bg=None)
+-            self.down_image  = self.Imaging_Free(Image.open("down.png"),bg=None)
++            self.left_image  = self.Imaging_Free(Image.open("/usr/lib/k40whisperer/left.png"),bg=None)
++            self.right_image = self.Imaging_Free(Image.open("/usr/lib/k40whisperer/right.png"),bg=None)
++            self.up_image    = self.Imaging_Free(Image.open("/usr/lib/k40whisperer/up.png"),bg=None)
++            self.down_image  = self.Imaging_Free(Image.open("/usr/lib/k40whisperer/down.png"),bg=None)
+             
+             self.Right_Button   = Button(self.master,image=self.right_image, command=self.Move_Right)
+             self.Left_Button    = Button(self.master,image=self.left_image,  command=self.Move_Left)
+             self.Up_Button      = Button(self.master,image=self.up_image,    command=self.Move_Up)
+             self.Down_Button    = Button(self.master,image=self.down_image,  command=self.Move_Down)
+ 
+-            self.UL_image  = self.Imaging_Free(Image.open("UL.png"),bg=None)
+-            self.UR_image  = self.Imaging_Free(Image.open("UR.png"),bg=None)
+-            self.LR_image  = self.Imaging_Free(Image.open("LR.png"),bg=None)
+-            self.LL_image  = self.Imaging_Free(Image.open("LL.png"),bg=None)
+-            self.CC_image  = self.Imaging_Free(Image.open("CC.png"),bg=None)
++            self.UL_image  = self.Imaging_Free(Image.open("/usr/lib/k40whisperer/UL.png"),bg=None)
++            self.UR_image  = self.Imaging_Free(Image.open("/usr/lib/k40whisperer/UR.png"),bg=None)
++            self.LR_image  = self.Imaging_Free(Image.open("/usr/lib/k40whisperer/LR.png"),bg=None)
++            self.LL_image  = self.Imaging_Free(Image.open("/usr/lib/k40whisperer/LL.png"),bg=None)
++            self.CC_image  = self.Imaging_Free(Image.open("/usr/lib/k40whisperer/CC.png"),bg=None)
+             
+             self.UL_Button = Button(self.master,image=self.UL_image, command=self.Move_UL)
+             self.UR_Button = Button(self.master,image=self.UR_image, command=self.Move_UR)