diff options
-rw-r--r-- | .SRCINFO | 10 | ||||
-rw-r--r-- | PKGBUILD | 11 | ||||
-rw-r--r-- | pillow.patch | 15 |
3 files changed, 7 insertions, 29 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Sat Nov 4 12:43:07 UTC 2017 +# Wed May 9 00:11:36 UTC 2018 pkgbase = nemo-media-columns pkgdesc = Media properties columns in Nemo - pkgver = 3.6.0 + pkgver = 3.8.0 pkgrel = 1 url = https://github.com/linuxmint/nemo-extensions arch = any @@ -14,10 +14,8 @@ pkgbase = nemo-media-columns depends = python2-pypdf depends = python2-pillow options = !emptydirs - source = nemo-extensions-3.6.0.tar.gz::https://github.com/linuxmint/nemo-extensions/archive/3.6.0.tar.gz - source = pillow.patch - sha256sums = 593aaf206ef50a8185e1f71c9018ce6a8b4bcb82b4684494e069f9045ba11fd1 - sha256sums = 0d5e4e950bf7034704c0fc8b477ea916f20bac019951bad254fc74d35ca56467 + source = nemo-extensions-3.8.0.tar.gz::https://github.com/linuxmint/nemo-extensions/archive/3.8.0.tar.gz + sha256sums = 15855cf7880290c8e9956f894d8e3c6fb0bee996783b2af63ae66dc019e739a8 pkgname = nemo-media-columns @@ -1,7 +1,7 @@ # Maintainer: twa022 <twa022 at gmail dot com> pkgname='nemo-media-columns' -pkgver=3.6.0 +pkgver=3.8.0 _mintrel='betsy' pkgrel=1 pkgdesc="Media properties columns in Nemo" @@ -11,10 +11,8 @@ url="https://github.com/linuxmint/nemo-extensions" depends=('nemo-python' 'mutagen' 'python2-exiv2' 'kaa-metadata' 'python2-pypdf' 'python2-pillow') options=('!emptydirs') #source=("${_pkgname}-${pkgver}.tar.gz::http://packages.linuxmint.com/pool/main/${_pkgname:0:1}/${_pkgname}/${_pkgname}_${pkgver}+${_mintrel}.tar.xz" -source=("nemo-extensions-$pkgver.tar.gz::https://github.com/linuxmint/nemo-extensions/archive/$pkgver.tar.gz" - 'pillow.patch') -sha256sums=('593aaf206ef50a8185e1f71c9018ce6a8b4bcb82b4684494e069f9045ba11fd1' - '0d5e4e950bf7034704c0fc8b477ea916f20bac019951bad254fc74d35ca56467') +source=("nemo-extensions-$pkgver.tar.gz::https://github.com/linuxmint/nemo-extensions/archive/$pkgver.tar.gz") +sha256sums=('15855cf7880290c8e9956f894d8e3c6fb0bee996783b2af63ae66dc019e739a8') prepare() { #cd ${pkgname}-${pkgver}+${_mintrel} @@ -22,9 +20,6 @@ prepare() { # Python2 fix find -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' - - # Use pillow library for Image - patch -uNp2 -r- -i ${srcdir}/pillow.patch } package() { diff --git a/pillow.patch b/pillow.patch deleted file mode 100644 index 041a4eefde7a..000000000000 --- a/pillow.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur ./nemo-media-columns-3.2.1+betsy.orig/nemo-media-columns.py ./nemo-media-columns-3.2.1+betsy/nemo-media-columns.py ---- ./nemo-media-columns-3.2.1+betsy.orig/nemo-media-columns.py 2017-02-02 13:16:13.056986227 -0500 -+++ ./nemo-media-columns-3.2.1+betsy/nemo-media-columns.py 2017-02-02 13:16:37.710320043 -0500 -@@ -33,7 +33,10 @@ - # for reading videos. for future improvement, this can also read mp3! - import kaa.metadata - # for reading image dimensions --import Image -+try: -+ from PIL import Image -+except: -+ import Image - # for reading pdf - try: - from pyPdf import PdfFileReader |