[arch-commits] Commit in mcomix/trunk (486f02.patch PKGBUILD)

[Balló György]

    Date: Monday, March 16, 2020 @ 13:56:59
  Author: bgyorgy
Revision: 599724

upgpkg: mcomix 1.3.0.dev0-1: Update to python3 fork

Modified:
  mcomix/trunk/PKGBUILD
Deleted:
  mcomix/trunk/486f02.patch

--------------+
 486f02.patch |   15 ---------------
 PKGBUILD     |   53 ++++++++++++++++++++++++++++++-----------------------
 2 files changed, 30 insertions(+), 38 deletions(-)

Deleted: 486f02.patch
===================================================================
--- 486f02.patch	2020-03-16 13:56:55 UTC (rev 599723)
+++ 486f02.patch	2020-03-16 13:56:59 UTC (rev 599724)
@@ -1,15 +0,0 @@
---- a/mcomix/run.py
-+++ b/mcomix/run.py
-@@ -203,7 +203,11 @@
- 
-     try:
-         import PIL.Image
--        assert PIL.Image.VERSION >= '1.1.5'
-+        try:
-+            assert PIL.Image.VERSION >= '1.1.5'
-+        except AttributeError:
-+            # Field VERSION deprecated in Pillow 5.2.0 and dropped in 6.0.0
-+            assert PIL.__version__ >= '5.2.0'
- 
-     except AssertionError:
-         log.error( _("You don't have the required version of the Python Imaging"), end=' ')

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-16 13:56:55 UTC (rev 599723)
+++ PKGBUILD	2020-03-16 13:56:59 UTC (rev 599724)
@@ -2,38 +2,45 @@
 # Contributor: Ray Powell <ray_al at xphoniexx.net>
 
 pkgname=mcomix
-pkgver=1.2.1
-pkgrel=5
+pkgver=1.3.0.dev0
+pkgrel=1
 pkgdesc="A user-friendly, customizable image viewer specifically designed to handle comic books"
 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')
-makedepends=('gettext' 'intltool')
+depends=('gtk3' 'python-cairo' 'python-gobject' 'python-pillow')
+makedepends=('git')
 optdepends=('libunrar: for rar compressed comics'
             'mupdf-tools: for pdf comics'
             'p7zip: for 7zip compressed comics')
-source=("https://downloads.sourceforge.net/project/mcomix/MComix-${pkgver}/mcomix-${pkgver}.tar.bz2"
-        "486f02.patch")
-md5sums=('1d05ed7596bd670e5b3a97896e6d4d47'
-         'e033a538925e6119a540bf084f1de878')
+_commit=b80f3485b6ec324aec1dc20f28296a8891ad70dd  # gtk3
+source=("git+https://github.com/multiSnow/mcomix3.git#commit=$_commit")
+md5sums=('SKIP')
 
-prepare() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 < ${srcdir}/486f02.patch
-}
-
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd mcomix3
 
-  export PYTHONPATH=${pkgdir}/usr/lib/python2.7/site-packages/
-  mkdir -p $PYTHONPATH
+  python installer.py --srcdir=mcomix --target="${pkgdir}"/usr/share
 
-  python2 setup.py install --prefix=/usr --optimize=1 \
-    --single-version-externally-managed --root=${pkgdir}
+  install -dm755 "$pkgdir"/usr/bin
+  ln -s /usr/share/mcomix/mcomixstarter.py "$pkgdir"/usr/bin/mcomix
+  ln -s /usr/share/mcomix/comicthumb.py "$pkgdir"/usr/bin/comicthumb
 
-  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
+  install -Dm644 mime/mcomix.desktop "$pkgdir"/usr/share/applications/mcomix.desktop
+  install -Dm644 mime/mcomix.appdata.xml "$pkgdir"/usr/share/metainfo/mcomix.appdata.xml
+  install -Dm644 mime/mcomix.xml "$pkgdir"/usr/share/mime/packages/mcomix.xml
+  install -Dm644 mime/comicthumb.thumbnailer "$pkgdir"/usr/share/thumbnailers/comicthumb.thumbnailer
+
+  for size in 16x16 22x22 24x24 32x32 48x48
+  do
+    install -dm755 "$pkgdir"/usr/share/icons/hicolor/$size/apps/
+    install -Dm644 mcomix/mcomix/images/$size/mcomix.png "$pkgdir"/usr/share/icons/hicolor/$size/apps/mcomix.png
+    install -Dm644 mime/icons/$size/application-x-cb7.png "$pkgdir"/usr/share/icons/hicolor/$size/mimetypes/application-x-cb7.png
+    install -Dm644 mime/icons/$size/application-x-cbr.png "$pkgdir"/usr/share/icons/hicolor/$size/mimetypes/application-x-cbr.png
+    install -Dm644 mime/icons/$size/application-x-cbt.png "$pkgdir"/usr/share/icons/hicolor/$size/mimetypes/application-x-cbt.png
+    install -Dm644 mime/icons/$size/application-x-cbz.png "$pkgdir"/usr/share/icons/hicolor/$size/mimetypes/application-x-cbz.png
+  done
+
+  install -Dm644 man/mcomix.1 "$pkgdir"/usr/share/man/man1/mcomix.1
+  install -Dm644 man/comicthumb.1 "$pkgdir"/usr/share/man/man1/comicthumb.1
 }