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

[Jakob Gruber]

    Date: Thursday, June 6, 2019 @ 13:50:03
  Author: schuay
Revision: 477455

upgpkg: mcomix 1.2.1-5

1.2.1-5

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

--------------+
 486f02.patch |   15 +++++++++++++++
 PKGBUILD     |   16 ++++++++++------
 2 files changed, 25 insertions(+), 6 deletions(-)

Added: 486f02.patch
===================================================================
--- 486f02.patch	                        (rev 0)
+++ 486f02.patch	2019-06-06 13:50:03 UTC (rev 477455)
@@ -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=' ')

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-06-06 13:44:57 UTC (rev 477454)
+++ PKGBUILD	2019-06-06 13:50:03 UTC (rev 477455)
@@ -3,7 +3,7 @@
 
 pkgname=mcomix
 pkgver=1.2.1
-pkgrel=4
+pkgrel=5
 pkgdesc="A user-friendly, customizable image viewer specifically designed to handle comic books"
 arch=('any')
 url="https://sourceforge.net/projects/mcomix/"
@@ -14,10 +14,16 @@
 optdepends=('libunrar: for rar compressed comics'
             'mupdf-tools: for pdf comics'
             'p7zip: for 7zip compressed comics')
-conflicts=('comix')
-replaces=('comix')
-source=("https://downloads.sourceforge.net/project/mcomix/MComix-${pkgver}/mcomix-${pkgver}.tar.bz2")
+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}
 
@@ -31,5 +37,3 @@
   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')