update: dupliseek-git 1:0.0.3.r2.6cc6923-1

properly reference new AUR package `python-opencv-python` as dependency

3 files changed, 13 insertions, 52 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0e279c8ca761..6b9c262018f2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = dupliseek-git
 	pkgdesc = Duplicate image finder written in Python/Qt5
-	pkgver = 0.0.2alpha.r57.3bac8b6
+	pkgver = 0.0.3.r2.6cc6923
 	pkgrel = 1
 	epoch = 1
 	url = https://gitlab.com/dupliseek-group/dupliseek
@@ -8,15 +8,15 @@ pkgbase = dupliseek-git
 	license = MIT
 	makedepends = git
 	makedepends = python-setuptools
+	makedepends = python-pip
 	depends = python-pyqt5
 	depends = python-numpy
 	depends = python-imutils
+	depends = python-opencv-python
 	provides = dupliseek
 	conflicts = dupliseek
-	source = git+https://gitlab.com/dupliseek-group/dupliseek.git#commit=3bac8b69585cb9f0d1cced6cf6f7324bc2426120
-	source = setup.patch
+	source = git+https://gitlab.com/dupliseek-group/dupliseek.git
 	sha256sums = SKIP
-	sha256sums = ba6a53fe0cc67d4a2c3b64836b59d853b34713a566945e79af376a92d5f2a86f
 
 pkgname = dupliseek-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 6607ace44332..2c41c3c79aee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 
 pkgname=dupliseek-git
-pkgver() { git -C "${pkgname%-git}" describe | sed 's/^v//;s/\([^-]*-\)g/r\1/;s/-/./g'; }
-pkgver=0.0.2alpha.r57.3bac8b6
+pkgver() { git -C "${pkgname%-git}" describe --long | sed 's/^v//;s/\([^-]*-\)g/r\1/;s/-/./g'; }
+pkgver=0.0.3.r2.6cc6923
 pkgrel=1
 epoch=1
 
@@ -15,22 +15,16 @@ license=('MIT')
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
 
-depends=('python-pyqt5' 'python-numpy' 'python-imutils')
-makedepends=('git' 'python-setuptools')
+depends=('python-pyqt5' 'python-numpy' 'python-imutils' 'python-opencv-python')
+makedepends=('git' 'python-setuptools' 'python-pip')
 
-source=("git+$url.git#commit=3bac8b69585cb9f0d1cced6cf6f7324bc2426120"
-        'setup.patch')
-sha256sums=('SKIP'
-            'ba6a53fe0cc67d4a2c3b64836b59d853b34713a566945e79af376a92d5f2a86f')
+source=("git+$url.git")
+sha256sums=('SKIP')
 
 prepare() {
   cd "${pkgname%-git}"
   sed -i "s|\(/usr/share/\)icons\(/${pkgname%-git}\)|\1pixmaps\2.png|;
           s|^\(Categories=.*\)|\1\;Utility|" "${pkgname%-git}.desktop"
-  install -dm755 DupliSeek
-  touch DupliSeek/__init__.py
-  mv GUI icons stylesheets main.py DupliSeek/
-  patch -Np1 -i ../setup.patch
 }
 
 build() {
@@ -40,15 +34,13 @@ build() {
 
 package() {
   cd "${pkgname%-git}"
+  pip install --root="$pkgdir" --prefix=/usr --compile --no-deps \
+              --no-warn-script-location opencv-python
   python setup.py install --skip-build --optimize=1 --root="$pkgdir"
-  install -Dm644 DupliSeek/icons/compare.png "$pkgdir/usr/share/pixmaps/${pkgname%-git}.png"
+  install -Dm644 dupliseek_pkg/icons/compare.png "$pkgdir/usr/share/pixmaps/${pkgname%-git}.png"
   install -Dm644 "${pkgname%-git}.desktop" -t"$pkgdir/usr/share/applications/"
   install -Dm644 README.md -t"$pkgdir/usr/share/doc/${pkgname%-git}/"
   install -Dm644 LICENSE -t"$pkgdir/usr/share/licenses/${pkgname%-git}/"
-  install -dm755 "$pkgdir/usr/bin"
-  _py3ver=$(python --version | sed 's/Python \(3\.[0-9]\+\).*/\1/')
-  ln -sf "/usr/lib/python$_py3ver/site-packages/DupliSeek/main.py" "$pkgdir/usr/bin/${pkgname%-git}"
-  chmod 755 "$pkgdir/usr/lib/python$_py3ver/site-packages/DupliSeek/main.py"
 }
 
 
diff --git a/setup.patch b/setup.patch
deleted file mode 100644
index 17b45aca66e6..000000000000
--- a/setup.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -u old/setup.py new/setup.py
---- old/setup.py	2019-09-13 19:37:19.046997147 +0200
-+++ new/setup.py	2019-09-13 20:06:03.516998491 +0200
-@@ -9,21 +9,13 @@
- 	author='Magnus Jørgensen',
- 	author_email='magnusmj@gmail.com',
- 	url='https://gitlab.com/magnusmj/dupliseek',
--	py_modules=["main"],
--	entry_points={
--		'console_scripts': [
--			'dupliseek = main:main',
--		],
--		'gui_scripts': [
--			'dupliseek = main:main',
--		]
--	},
- 	packages=[
--		'GUI', 
--		'GUI.Ribbon', 
--		'GUI.Widgets',
--		'icons',
--		'stylesheets'
-+		'DupliSeek',
-+		'DupliSeek.GUI',
-+		'DupliSeek.GUI.Ribbon',
-+		'DupliSeek.GUI.Widgets',
-+		'DupliSeek.icons',
-+		'DupliSeek.stylesheets'
- 	],
- 	package_data={
- 		'': ['*.png', '*.css'],