update: dupliseek-git 0.0.2alpha.r56.eee4fd7-2

Adjust `setup.py`  to make `GUI`, `icons` and `stylesheets`  submodules
of DupliSeek rather than seperate Python site-packages.
Also remove `entry_points` and symlink `main.py` into `/usr/bin` as the
launcher.

TODO: PR -> upstream

3 files changed, 51 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bcb407ada480..2bc714ee3ba8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = dupliseek-git
 	pkgdesc = Duplicate image finder written in Python/Qt5
-	pkgver = 0.0.2alpha.r55.3ce09f8
-	pkgrel = 4
+	pkgver = 0.0.2alpha.r56.eee4fd7
+	pkgrel = 2
 	url = https://gitlab.com/magnusmj/dupliseek
 	arch = x86_64
 	license = MIT
@@ -13,7 +13,9 @@ pkgbase = dupliseek-git
 	provides = dupliseek
 	conflicts = dupliseek
 	source = git+https://gitlab.com/magnusmj/dupliseek.git
+	source = setup.patch
 	sha256sums = SKIP
+	sha256sums = ba6a53fe0cc67d4a2c3b64836b59d853b34713a566945e79af376a92d5f2a86f
 
 pkgname = dupliseek-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 13fda5e42fa9..01c841ea5816 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,10 @@
 # Maintainer :  Kr1ss $(echo \<kr1ss+x-yandex+com\>|sed s/\+/./g\;s/\-/@/)
 
+
 pkgname=dupliseek-git
 pkgver() { git -C "${pkgname%-git}" describe | sed 's/^v//;s/\([^-]*-\)g/r\1/;s/-/./g'; }
-pkgver=0.0.2alpha.r55.3ce09f8
-pkgrel=4
+pkgver=0.0.2alpha.r56.eee4fd7
+pkgrel=2
 
 pkgdesc='Duplicate image finder written in Python/Qt5'
 arch=('x86_64')
@@ -16,33 +17,36 @@ conflicts=("${pkgname%-git}")
 depends=('python-pyqt5' 'python-numpy' 'python-imutils')
 makedepends=('git' 'python-setuptools')
 
-source=("git+$url.git")
-sha256sums=('SKIP')
+source=("git+$url.git"
+        'setup.patch')
+sha256sums=('SKIP'
+            'ba6a53fe0cc67d4a2c3b64836b59d853b34713a566945e79af376a92d5f2a86f')
 
 prepare() {
   cd "${pkgname%-git}"
-
   sed -i "s|\(/usr/share/\)icons\(/${pkgname%-git}\)|\1pixmaps\2.png|;
           s|^\(Categories=.*\)|\1\;Utility|" "${pkgname%-git}.desktop"
-  sed -i 's|\(main:main\)|DupliSeek.\1|g' setup.py
+  install -dm755 DupliSeek
+  touch DupliSeek/__init__.py
+  mv GUI icons stylesheets main.py DupliSeek/
+  patch -Np1 -i ../setup.patch
 }
 
 build() {
   cd "${pkgname%-git}"
-
   python setup.py build
-  install -dm755 build/lib/DupliSeek
-  mv build/lib/{GUI,icons,stylesheets,main.py} build/lib/DupliSeek/
 }
 
 package() {
   cd "${pkgname%-git}"
-
-  python setup.py install --optimize=1 --root="$pkgdir"
-  install -Dm644 icons/compare.png "$pkgdir/usr/share/pixmaps/${pkgname%-git}.png"
+  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 "${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"
+  ln -sf "/usr/lib/python3.7/site-packages/DupliSeek/main.py" "$pkgdir/usr/bin/${pkgname%-git}"
+  chmod 755 "$pkgdir/usr/lib/python3.7/site-packages/DupliSeek/main.py"
 }
 
 # vim: ts=2 sw=2 et ft=PKGBUILD:
diff --git a/setup.patch b/setup.patch
new file mode 100644
index 000000000000..17b45aca66e6
--- /dev/null
+++ b/setup.patch
@@ -0,0 +1,31 @@
+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'],