Updated for version 0.56

Made pyclipper a dependency, I can't find the documentation that used to
say it was optional or why any more.

Replaced the patch file (which needed updating every time) with a
hopefully more generic sed.

3 files changed, 8 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index af3de7441108..81440ac5a20c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = k40whisperer
 	pkgdesc = Control software for the stock K40 Laser controller
-	pkgver = 0.55
+	pkgver = 0.56
 	pkgrel = 1
 	url = https://www.scorchworks.com/K40whisperer/k40whisperer.html
 	install = k40whisperer.install
@@ -12,16 +12,14 @@ pkgbase = k40whisperer
 	depends = python-lxml
 	depends = python-pyusb
 	depends = python-pillow
+	depends = python-pyclipper
 	depends = tk
-	optdepends = python-pyclipper
-	source = https://www.scorchworks.com/K40whisperer/K40_Whisperer-0.55_src.zip
+	source = https://www.scorchworks.com/K40whisperer/K40_Whisperer-0.56_src.zip
 	source = 97-ctc-lasercutter.rules
 	source = k40whisperer.install
-	source = k40_whisperer.py.patch
-	sha256sums = 1ef91a35e52c73ab699e5c9685b47e735bba3a53eef257a9eb4016ae7b77496d
+	sha256sums = 7646a7610e99f2f9cb7e086c6a6813d1a5171cb0ea3e20d1f7c981bd513a3706
 	sha256sums = 19b490100927a74a4db8c6332b8a995eb1d1dc24c31467c03e3d8ac62759b508
 	sha256sums = 5d32866a044ce3239881eacd01720b95285031a003a79056644d30e728fcee19
-	sha256sums = 6f61cbd2d5ee32bd601965f7b56f2b42de5a152ec4a33a5949066220982e30c9
 
 pkgname = k40whisperer
 
diff --git a/PKGBUILD b/PKGBUILD
index 801852865328..258c2749ae7a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,15 +2,14 @@
 # Maintainer: Nat Lasseter <aur at 4574 dot co dot uk>
 
 pkgname="k40whisperer"
-pkgver="0.55"
+pkgver="0.56"
 pkgrel="1"
 pkgdesc="Control software for the stock K40 Laser controller"
 arch=("any")
 url="https://www.scorchworks.com/K40whisperer/k40whisperer.html"
 license=("GPL")
 
-depends=("python" "python-lxml" "python-pyusb" "python-pillow" "tk")
-optdepends=("python-pyclipper")
+depends=("python" "python-lxml" "python-pyusb" "python-pillow" "python-pyclipper" "tk")
 makedepends=("unzip" "dos2unix")
 
 _pkgfile="K40_Whisperer-${pkgver}_src"
@@ -19,13 +18,11 @@ source=(
   "https://www.scorchworks.com/K40whisperer/${_pkgfile}.zip"
   "97-ctc-lasercutter.rules"
   "${pkgname}.install"
-  "k40_whisperer.py.patch"
 )
 sha256sums=(
-  "1ef91a35e52c73ab699e5c9685b47e735bba3a53eef257a9eb4016ae7b77496d"
+  "7646a7610e99f2f9cb7e086c6a6813d1a5171cb0ea3e20d1f7c981bd513a3706"
   "19b490100927a74a4db8c6332b8a995eb1d1dc24c31467c03e3d8ac62759b508"
   "5d32866a044ce3239881eacd01720b95285031a003a79056644d30e728fcee19"
-  "6f61cbd2d5ee32bd601965f7b56f2b42de5a152ec4a33a5949066220982e30c9"
 )
 
 install="${pkgname}.install"
@@ -33,7 +30,7 @@ install="${pkgname}.install"
 build() {
   cd ${_pkgfile}
   dos2unix k40_whisperer.py
-  patch k40_whisperer.py ../k40_whisperer.py.patch
+  sed -ri 's|Image.open\("(.+\.png)"\)|Image.open("/usr/lib/k40whisperer/\1")|' k40_whisperer.py
   chmod +x k40_whisperer.py
 }
 
diff --git a/k40_whisperer.py.patch b/k40_whisperer.py.patch
deleted file mode 100644
index 035510d87788..000000000000
--- a/k40_whisperer.py.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- k40_whisperer.py.orig	2020-12-07 22:39:20.757106315 +0000
-+++ k40_whisperer.py	2020-12-07 22:40:13.300634034 +0000
-@@ -521,21 +521,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)