upd

2 files changed, 23 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8261bfe43cc9..3c1fef9ba93c 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = open-numismat
 	pkgdesc = Coin collecting software to organize and manage your own coin catalogue.
-	pkgver = 1.9.5
+	pkgver = 1.9.6
 	pkgrel = 1
 	url = http://opennumismat.github.io
 	arch = any
@@ -15,17 +15,20 @@ pkgbase = open-numismat
 	depends = python-lxml
 	depends = python-openpyxl
 	depends = python-pillow
+	depends = python-imagehash
 	optdepends = python-pyodbc: import from CoinManage and Numizmatik_Ru
 	conflicts = open-numismat-bin
 	conflicts = open-numismat-git
-	noextract = open-numismat_1.9.5_all.deb
+	noextract = open-numismat_1.9.6_all.deb
 	options = !strip
 	options = !emptydirs
-	source = https://github.com/OpenNumismat/open-numismat/archive/refs/tags/1.9.5.tar.gz
-	source = https://github.com/OpenNumismat/open-numismat/releases/download/1.9.5/open-numismat_1.9.5_all.deb
+	source = https://github.com/OpenNumismat/open-numismat/archive/refs/tags/1.9.6.tar.gz
+	source = https://github.com/OpenNumismat/open-numismat/releases/download/1.9.6/open-numismat_1.9.6_all.deb
 	source = https://github.com/OpenNumismat/YearCalculator/archive/refs/tags/0.2.tar.gz
-	sha512sums = 1080c395f66628dfc02f6d5fcdf09c117d79555eee4aa5b72e00e3d94697bcaa06a1817f99e68f1bdeae55f277953bed954cd0475c0e4158ed292b0afbca96f1
-	sha512sums = 87789bc82e4fc7bf7a0dce372026ff060ea81bbc13e46c55d23c6e88a48d5898cd842bd9e34d8e98812d455d58d38a1d6cd3935200577587eac8648eea8186d4
+	source = https://github.com/OpenNumismat/ImageEditor/archive/refs/tags/0.5.tar.gz
+	sha512sums = 39ccb7373517cd9f3fb37f3313f459791060b9362ecd6d5065f4fb025209360457574ac6606fa1faaf702862adcfc36181a3cbfd165b4bc3c934d6b6f5c8dd97
+	sha512sums = a791c714dc358c6e28be1664e7b90b32be4c5bc919040259a2a72c0f4db123a684ef0cbfdd664c409d173ae92d864f60d4d2fa41f16eb33fff1b12063fe5c61b
 	sha512sums = c0cc3c0f7425ada12f5f3a9cd4815c394fb0007863717ee47f8606e581a3449de74621b88c6e703ae7fc484364a914e536978eff23c649f93a128b044e342d33
+	sha512sums = 272d5bfa4c33596738b1d64251728984a446f5f2f2979e2d8392b41a8d334553d4dc1ddcf1fe5a525b51e9e122e3853f723ef7ed24572950cd140705f79ef6c2
 
 pkgname = open-numismat
diff --git a/PKGBUILD b/PKGBUILD
index 081472f32d18..f1e2b07908c4 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,13 @@
-# Maintainer: Jack R <rubacha dot jack03 at gmail.com>
+# Maintainer: gilcu3 <gilcu3 at gmail dot com>
+# Previous Maintainer: Jack R <rubacha dot jack03 at gmail.com>
 
 pkgname=open-numismat
-pkgver=1.9.5
+pkgver=1.9.6
 # since yearcalculator is tightly ingrained into open-numismat, use thr closest version of it to the one released (as submodules aren't bundled in github releases)
 _yearcalc_pkgname=YearCalculator
 _yearcalc_pkgver=0.2
+_imageeditor_pkgname=ImageEditor
+_imageeditor_pkgver=0.5
 pkgrel=1
 pkgdesc='Coin collecting software to organize and manage your own coin catalogue.'
 arch=('any')
@@ -12,17 +15,19 @@ url="http://opennumismat.github.io"
 license=('GPL3')
 conflicts=('open-numismat-bin' 'open-numismat-git')
 makedepends=('python-setuptools')
-depends=('qt6-webchannel' 'qt6-charts' 'qt6-webengine' 'pyside6' 'python-dateutil' 'python-jinja' 'python-lxml' 'python-openpyxl' 'python-pillow')
+depends=('qt6-webchannel' 'qt6-charts' 'qt6-webengine' 'pyside6' 'python-dateutil' 'python-jinja' 'python-lxml' 'python-openpyxl' 'python-pillow' 'python-imagehash')
 optdepends=(
   'python-pyodbc: import from CoinManage and Numizmatik_Ru')
 options=('!strip' '!emptydirs')
 source=("https://github.com/OpenNumismat/open-numismat/archive/refs/tags/${pkgver}.tar.gz" 
         "https://github.com/OpenNumismat/open-numismat/releases/download/${pkgver}/open-numismat_${pkgver}_all.deb"
-        "https://github.com/OpenNumismat/YearCalculator/archive/refs/tags/${_yearcalc_pkgver}.tar.gz")
+        "https://github.com/OpenNumismat/YearCalculator/archive/refs/tags/${_yearcalc_pkgver}.tar.gz"
+        "https://github.com/OpenNumismat/${_imageeditor_pkgname}/archive/refs/tags/${_imageeditor_pkgver}.tar.gz")
 noextract=("open-numismat_${pkgver}_all.deb")
-sha512sums=('1080c395f66628dfc02f6d5fcdf09c117d79555eee4aa5b72e00e3d94697bcaa06a1817f99e68f1bdeae55f277953bed954cd0475c0e4158ed292b0afbca96f1'
-            '87789bc82e4fc7bf7a0dce372026ff060ea81bbc13e46c55d23c6e88a48d5898cd842bd9e34d8e98812d455d58d38a1d6cd3935200577587eac8648eea8186d4'
-            'c0cc3c0f7425ada12f5f3a9cd4815c394fb0007863717ee47f8606e581a3449de74621b88c6e703ae7fc484364a914e536978eff23c649f93a128b044e342d33')
+sha512sums=('39ccb7373517cd9f3fb37f3313f459791060b9362ecd6d5065f4fb025209360457574ac6606fa1faaf702862adcfc36181a3cbfd165b4bc3c934d6b6f5c8dd97'
+            'a791c714dc358c6e28be1664e7b90b32be4c5bc919040259a2a72c0f4db123a684ef0cbfdd664c409d173ae92d864f60d4d2fa41f16eb33fff1b12063fe5c61b'
+            'c0cc3c0f7425ada12f5f3a9cd4815c394fb0007863717ee47f8606e581a3449de74621b88c6e703ae7fc484364a914e536978eff23c649f93a128b044e342d33'
+            '272d5bfa4c33596738b1d64251728984a446f5f2f2979e2d8392b41a8d334553d4dc1ddcf1fe5a525b51e9e122e3853f723ef7ed24572950cd140705f79ef6c2')
 
 build() {
   #extract private_keys.py from .deb package to $${srcdir}
@@ -31,7 +36,8 @@ build() {
   mv './opt/venvs/open-numismat/lib/python3.10/site-packages/OpenNumismat/private_keys.py' './'
   
   cp -Tr "${_yearcalc_pkgname}-${_yearcalc_pkgver}" "./${pkgname}-${pkgver}/OpenNumismat/EditCoinDialog/YearCalculator"
-
+  cp -Tr "${_imageeditor_pkgname}-${_imageeditor_pkgver}" "./${pkgname}-${pkgver}/OpenNumismat/ImageEditor"
+  
   cd ${pkgname}-${pkgver}
   #python3 tools/build_resources.py
   python setup.py build