use a better repo

2 files changed, 42 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ff2f0c612aa5..b0dd1702696f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,15 @@
-# Generated by mksrcinfo v8
-# Mon Dec 24 19:52:21 UTC 2018
 pkgbase = mcomix-gtk3-git
-	pkgdesc = A comic book reader. Ported to GTK3, works well with retina/hidpi
-	pkgver = r1501.708ba0d
+	pkgdesc = A comic book reader. Forked from MComix and ported to GTK3.
+	pkgver = r1853.8f61454
 	pkgrel = 1
-	url = https://sourceforge.net/projects/mcomix/
+	url = https://github.com/multiSnow/mcomix3
 	install = mcomix-gtk3-git.install
 	arch = any
 	license = GPL
 	makedepends = gettext
 	makedepends = intltool
-	depends = pygtk
-	depends = python2-pillow
-	depends = xdg-utils
-	depends = python2
-	depends = desktop-file-utils
-	depends = hicolor-icon-theme
-	depends = python2-setuptools
-	depends = python2-gobject
+	depends = python-pillow
+	depends = python-gobject
 	optdepends = libunrar: for rar compressed comics
 	optdepends = p7zip: for 7z compressed comics
 	optdepends = unrar: for rar compressed comics
@@ -26,7 +18,7 @@ pkgbase = mcomix-gtk3-git
 	provides = mcomix
 	conflicts = mcomix
 	conflicts = mcomix-git
-	source = mcomix-gtk3-git::git+https://git.code.sf.net/u/ilikenwf/mcomix#branch=gtk3
+	source = git+https://github.com/multiSnow/mcomix3
 	sha256sums = SKIP
 
 pkgname = mcomix-gtk3-git
diff --git a/PKGBUILD b/PKGBUILD
index 736e78f2a26f..937a26452a15 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,15 @@
 # Maintainer: Matt Parnell/ilikenwf <parwok@gmail.com>
+# Special thanks to fettouhi for finding the better fork
+# my old fork is at https://sourceforge.net/u/ilikenwf/mcomix/ci/gtk3/tree/
 
 pkgname=mcomix-gtk3-git
-pkgver=r1501.708ba0d
+pkgver=r1853.8f61454
 pkgrel=1
-pkgdesc="A comic book reader. Ported to GTK3, works well with retina/hidpi"
+pkgdesc="A comic book reader. Forked from MComix and ported to GTK3."
 arch=('any')
-url="https://sourceforge.net/projects/mcomix/"
+url="https://github.com/multiSnow/mcomix3"
 license=('GPL')
-depends=('pygtk' 'python2-pillow' 'xdg-utils' 'python2' \
-         'desktop-file-utils' 'hicolor-icon-theme' 'python2-setuptools' 'python2-gobject')
+depends=('python-pillow' 'python-gobject')
 makedepends=('gettext' 'intltool')
 optdepends=('libunrar: for rar compressed comics' \
             'p7zip: for 7z compressed comics' \
@@ -17,25 +18,43 @@ optdepends=('libunrar: for rar compressed comics' \
             'mupdf: for PDF comics')
 provides=("mcomix")
 conflicts=("mcomix" "mcomix-git")
-source=("${pkgname}::git+https://git.code.sf.net/u/ilikenwf/mcomix#branch=gtk3")
+source=("git+https://github.com/multiSnow/mcomix3")
 sha256sums=('SKIP')
 
 install=${pkgname}.install
 
 pkgver() {
-	cd "${pkgname}"
+	cd "mcomix3"
 	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 package() {
-	cd "${srcdir}/${pkgname}"
-
-	python2 setup.py install --prefix=/usr --optimize=1 \
-	--single-version-externally-managed --root=${pkgdir}
-
-	cp -a "${srcdir}/mcomix-gtk3-git/mcomix/images" "${pkgdir}/usr/lib/python2.7/site-packages/mcomix/images"
-
-	install -Dm755 mime/comicthumb ${pkgdir}/usr/bin/comicthumb
-	install -Dm644 mime/comicthumb.1.gz ${pkgdir}/usr/share/man/man1/comicthumb.1.gz
-	install -Dm644 mime/comicthumb.thumbnailer ${pkgdir}/usr/share/thumbnailers/comicthumb.thumbnailer
+  cd "${srcdir}/mcomix3"
+ 
+  # setup.py doesn't work – setting up manually
+ 
+  # their installer
+  python installer.py --srcdir=mcomix --target="${pkgdir}"/usr/lib/python3.7
+ 
+  # but leave out the additional directory, so the module is in the correct directory
+  mv "${pkgdir}"/usr/lib/python3.7/mcomix "${pkgdir}"/usr/lib/python3.7/site-packages
+  mkdir "${pkgdir}"/usr/bin
+  mv "${pkgdir}"/usr/lib/python3.7/site-packages/mcomixstarter.py "${pkgdir}"/usr/bin/mcomix
+  mv "${pkgdir}"/usr/lib/python3.7/site-packages/comicthumb.py "${pkgdir}"/usr/bin/comicthumb
+ 
+  # other files
+  install -Dm644 "${srcdir}/mcomix3"/man/* -t "${pkgdir}"/usr/share/man/man1/
+  install -Dm644 "${srcdir}/mcomix3"/mime/mcomix.appdata.xml -t "${pkgdir}"/usr/share/metainfo/
+  install -Dm644 "${srcdir}/mcomix3"/mime/mcomix.desktop -t "${pkgdir}"/usr/share/applications/
+  install -Dm644 "${srcdir}/mcomix3"/mime/mcomix.xml -t "${pkgdir}"/usr/share/mime/
+  install -Dm644 "${srcdir}/mcomix3"/mime/comicthumb.thumbnailer -t "${pkgdir}"/usr/share/thumbnailers/
+ 
+  for size in 16 22 24 32 48
+  do
+    install -Dm644 "${srcdir}/mcomix3"/mime/icons/${size}x${size}/* -t "${pkgdir}"/usr/share/icons/hicolor/${size}x${size}/mimetypes/
+    mkdir "${pkgdir}"/usr/share/icons/hicolor/${size}x${size}/apps/
+    ln -s /usr/lib/python3.7/site-packages/mcomix/images/${size}x${size}/mcomix.png \
+      "${pkgdir}"/usr/share/icons/hicolor/${size}x${size}/apps/
+  done
+  rm "${pkgdir}"/usr/lib/python3.7/site-packages/mcomix/images/mcomix-large.png
 }