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

[Jakob Gruber]

    Date: Thursday, June 6, 2019 @ 13:50:09
  Author: schuay
Revision: 477456

archrelease: copy trunk to community-any

Added:
  mcomix/repos/community-any/486f02.patch
    (from rev 477455, mcomix/trunk/486f02.patch)
  mcomix/repos/community-any/PKGBUILD
    (from rev 477455, mcomix/trunk/PKGBUILD)
Deleted:
  mcomix/repos/community-any/PKGBUILD

--------------+
 486f02.patch |   15 +++++++++++
 PKGBUILD     |   74 ++++++++++++++++++++++++++++++---------------------------
 2 files changed, 54 insertions(+), 35 deletions(-)

Copied: mcomix/repos/community-any/486f02.patch (from rev 477455, mcomix/trunk/486f02.patch)
===================================================================
--- 486f02.patch	                        (rev 0)
+++ 486f02.patch	2019-06-06 13:50:09 UTC (rev 477456)
@@ -0,0 +1,15 @@
+--- 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=' ')

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-06-06 13:50:03 UTC (rev 477455)
+++ PKGBUILD	2019-06-06 13:50:09 UTC (rev 477456)
@@ -1,35 +0,0 @@
-# Maintainer: schuay <jakob.gruber at gmail.com>
-# Contributor: Ray Powell <ray_al at xphoniexx.net>
-
-pkgname=mcomix
-pkgver=1.2.1
-pkgrel=4
-pkgdesc="A user-friendly, customizable image viewer specifically designed to handle comic books"
-arch=('any')
-url="http://sourceforge.net/projects/mcomix/"
-license=('GPL')
-depends=('pygtk' 'python2-pillow' 'xdg-utils' 'python2' \
-         'desktop-file-utils' 'hicolor-icon-theme' 'python2-setuptools')
-makedepends=('gettext' 'intltool')
-optdepends=('libunrar: for rar compressed comics'
-            'mupdf-tools: for pdf comics'
-            'p7zip: for 7zip compressed comics')
-conflicts=('comix')
-replaces=('comix')
-source=("http://downloads.sourceforge.net/project/mcomix/MComix-${pkgver}/mcomix-${pkgver}.tar.bz2")
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  export PYTHONPATH=${pkgdir}/usr/lib/python2.7/site-packages/
-  mkdir -p $PYTHONPATH
-
-  python2 setup.py install --prefix=/usr --optimize=1 \
-    --single-version-externally-managed --root=${pkgdir}
-
-  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
-}
-
-md5sums=('1d05ed7596bd670e5b3a97896e6d4d47')

Copied: mcomix/repos/community-any/PKGBUILD (from rev 477455, mcomix/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-06-06 13:50:09 UTC (rev 477456)
@@ -0,0 +1,39 @@
+# Maintainer: schuay <jakob.gruber at gmail.com>
+# Contributor: Ray Powell <ray_al at xphoniexx.net>
+
+pkgname=mcomix
+pkgver=1.2.1
+pkgrel=5
+pkgdesc="A user-friendly, customizable image viewer specifically designed to handle comic books"
+arch=('any')
+url="https://sourceforge.net/projects/mcomix/"
+license=('GPL')
+depends=('pygtk' 'python2-pillow' 'xdg-utils' 'python2' \
+         'desktop-file-utils' 'hicolor-icon-theme' 'python2-setuptools')
+makedepends=('gettext' 'intltool')
+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')
+
+prepare() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 < ${srcdir}/486f02.patch
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  export PYTHONPATH=${pkgdir}/usr/lib/python2.7/site-packages/
+  mkdir -p $PYTHONPATH
+
+  python2 setup.py install --prefix=/usr --optimize=1 \
+    --single-version-externally-managed --root=${pkgdir}
+
+  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
+}