summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
Diffstat (limited to 'libre')
-rw-r--r--libre/mcomix/486f02.patch15
-rw-r--r--libre/mcomix/PKGBUILD18
2 files changed, 27 insertions, 6 deletions
diff --git a/libre/mcomix/486f02.patch b/libre/mcomix/486f02.patch
new file mode 100644
index 000000000..055884047
--- /dev/null
+++ b/libre/mcomix/486f02.patch
@@ -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=' ')
diff --git a/libre/mcomix/PKGBUILD b/libre/mcomix/PKGBUILD
index cb64ec179..1cf844b11 100644
--- a/libre/mcomix/PKGBUILD
+++ b/libre/mcomix/PKGBUILD
@@ -5,8 +5,8 @@
pkgname=mcomix
pkgver=1.2.1
-pkgrel=4
-pkgrel+=.par1
+pkgrel=5
+pkgrel+=.parabola1
pkgdesc="A user-friendly, customizable image viewer specifically designed to handle comic books"
pkgdesc+=", without nonfree libunrar support"
arch=('any')
@@ -17,13 +17,21 @@ depends=('pygtk' 'python2-pillow' 'xdg-utils' 'python2' \
makedepends=('gettext' 'intltool')
optdepends=('mupdf-tools: for pdf comics'
'p7zip: for 7zip compressed comics')
-conflicts=('comix' 'mcomix-libre')
-replaces=('comix' 'mcomix-libre')
+conflicts=('mcomix-libre')
+replaces=('mcomix-libre')
source=("https://downloads.sourceforge.net/project/mcomix/MComix-${pkgver}/mcomix-${pkgver}.tar.bz2"
+ "486f02.patch"
'libre.patch')
+md5sums=('1d05ed7596bd670e5b3a97896e6d4d47'
+ 'e033a538925e6119a540bf084f1de878'
+ '2fc7a69a673fbc4be5d1567489dd9b6e')
+sha256sums=('7e43159dc585bc9bc31970a44bd2b4e42c303660c4c8cf7f0eda413a6f72fa3b'
+ 'be0f41404b079931bd899642fa256ac757bb3adc95f36b8cb38dec61781d87fc'
+ '9037996a36782b970c736a55a315c421956bbd08511e4881d780f7c41d8945a6')
prepare() {
cd ${srcdir}/${pkgname}-${pkgver}
+ patch -Np1 < ${srcdir}/486f02.patch
# Remove nonfree unRAR support
rm -v mcomix/archive/rar{,_external}.py
@@ -45,5 +53,3 @@ package() {
install -Dm644 mime/comicthumb.thumbnailer ${pkgdir}/usr/share/thumbnailers/comicthumb.thumbnailer
}
-md5sums=('1d05ed7596bd670e5b3a97896e6d4d47'
- '2fc7a69a673fbc4be5d1567489dd9b6e')