Bump to 5.6.1

4 files changed, 13 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fb3a9ce9725c..23b0f1b29b44 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,30 +1,25 @@
 pkgbase = kcc
 	pkgdesc = Kindle Comic Converter converts comic files or folders to ePub or Panel View MOBI
-	pkgver = 5.5.2
-	pkgrel = 6
+	pkgver = 5.6.1
+	pkgrel = 1
 	url = https://github.com/ciromattia/kcc
 	arch = any
 	license = ISC
 	makedepends = python-setuptools
 	depends = python>=3.10
+	depends = python-mozjpeg-lossless-optimization
 	depends = python-pillow>=9.0.0
 	depends = python-psutil>=5.0.0
 	depends = python-pyqt5>=5.6.0
 	depends = python-raven>=6.0.0
-	depends = python-slugify>=6.0.0
+	depends = python-slugify<8.0.0
 	optdepends = kindlegen>=2.9: for .mobi generation
 	optdepends = p7zip: for zip/CBZ, rar/CBZ, 7z/CB7 support
 	source = kindlecomicconverter.desktop
-	source = kcc-py310.patch
-	source = kcc-slugify6.patch
-	source = https://github.com/ciromattia/kcc/archive/5.5.2.tar.gz
+	source = https://github.com/ciromattia/kcc/archive/refs/tags/v5.6.1.tar.gz
 	md5sums = f25b30fbc1bc1db491173215fe411789
-	md5sums = 4f12019d3efda060bf45bd516831a346
-	md5sums = 9701c427a46aa9d9a2e34062ee0891b1
-	md5sums = 483f06333bbae8e0f4c28252487b9d97
+	md5sums = e670d4cbfc56b4d086dba16d834adff8
 	sha256sums = 3502c38d756f5a812ac06f63fe25e062d8720f620ffd7d25641e6accef9fdd9f
-	sha256sums = 72b22f6fea6a7727ef8671e0386291c7d6946f4e8046dc037d46bfd8c3621138
-	sha256sums = 43236d6351d95db1405e0f9f2b32e531248886afc3b4c110511d32b7ec1241dd
-	sha256sums = 7b45fcdf0149bea36e8c738e76031790c8c235c777047001279698a526be892b
+	sha256sums = 9cad85fa8d35ade0d3cff18f5df163eebcf3c6d11443efe881066f365222d547
 
 pkgname = kcc
diff --git a/PKGBUILD b/PKGBUILD
index d61f65cc6d7c..cc7b5be09313 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,26 @@
 # Maintainer: Thomas Jost <schnouki@schnouki.net>
 pkgname=kcc
-pkgver=5.5.2
-pkgrel=6
+pkgver=5.6.1
+pkgrel=1
 pkgdesc="Kindle Comic Converter converts comic files or folders to ePub or Panel View MOBI"
 arch=(any)
 url="https://github.com/ciromattia/kcc"
 license=('ISC')
-depends=('python>=3.10' 'python-pillow>=9.0.0' 'python-psutil>=5.0.0' 'python-pyqt5>=5.6.0' 'python-raven>=6.0.0' 'python-slugify>=6.0.0')
+depends=('python>=3.10' 'python-mozjpeg-lossless-optimization' 'python-pillow>=9.0.0' 'python-psutil>=5.0.0' 'python-pyqt5>=5.6.0' 'python-raven>=6.0.0' 'python-slugify<8.0.0')
 optdepends=(
   'kindlegen>=2.9: for .mobi generation'
   'p7zip: for zip/CBZ, rar/CBZ, 7z/CB7 support'
 )
 makedepends=('python-setuptools')
 source=(kindlecomicconverter.desktop
-        kcc-py310.patch
-        kcc-slugify6.patch
-        https://github.com/ciromattia/$pkgname/archive/$pkgver.tar.gz)
+        https://github.com/ciromattia/$pkgname/archive/refs/tags/v$pkgver.tar.gz)
 md5sums=('f25b30fbc1bc1db491173215fe411789'
-         '4f12019d3efda060bf45bd516831a346'
-         '9701c427a46aa9d9a2e34062ee0891b1'
-         '483f06333bbae8e0f4c28252487b9d97')
+         'e670d4cbfc56b4d086dba16d834adff8')
 sha256sums=('3502c38d756f5a812ac06f63fe25e062d8720f620ffd7d25641e6accef9fdd9f'
-            '72b22f6fea6a7727ef8671e0386291c7d6946f4e8046dc037d46bfd8c3621138'
-            '43236d6351d95db1405e0f9f2b32e531248886afc3b4c110511d32b7ec1241dd'
-            '7b45fcdf0149bea36e8c738e76031790c8c235c777047001279698a526be892b')
+            '9cad85fa8d35ade0d3cff18f5df163eebcf3c6d11443efe881066f365222d547')
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
-  patch -p0 < "$srcdir"/kcc-py310.patch
-  patch -p0 < "$srcdir"/kcc-slugify6.patch
 }
 
 build() {
diff --git a/kcc-py310.patch b/kcc-py310.patch
deleted file mode 100644
index 84ff2c3fc908..000000000000
--- a/kcc-py310.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kindlecomicconverter/image.py	2022-01-24 22:43:36.220691413 +0100
-+++ ../kcc-5.5.2-orig/kindlecomicconverter/image.py	2019-10-21 17:27:38.000000000 +0200
-@@ -255,7 +255,7 @@
-         if gamma == 1.0:
-             self.image = ImageOps.autocontrast(self.image)
-         else:
--            self.image = ImageOps.autocontrast(Image.eval(self.image, lambda a: 255 * (a / 255.) ** gamma))
-+            self.image = ImageOps.autocontrast(Image.eval(self.image, lambda a: int(255 * (a / 255.) ** gamma)))
-
-     def quantizeImage(self):
-         colors = len(self.palette) // 3
diff --git a/kcc-slugify6.patch b/kcc-slugify6.patch
deleted file mode 100644
index ade8d3df787c..000000000000
--- a/kcc-slugify6.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kindlecomicconverter/shared.py.orig	2022-06-09 14:31:52.779848604 +0200
-+++ kindlecomicconverter/shared.py	2022-06-09 14:31:56.995860466 +0200
-@@ -117,7 +117,7 @@
-         except ImportError:
-             missing.append('psutil 5.0.0+')
-         try:
--            from slugify import __version__ as slugifyVersion
-+            from slugify.__version__ import __version__ as slugifyVersion
-             if StrictVersion('1.2.1') > StrictVersion(slugifyVersion):
-                 missing.append('python-slugify 1.2.1+')
-         except ImportError: