Date: Friday, September 20, 2013 @ 12:08:24 Author: jelle Revision: 97446
upgpkg: impressive 0.10.3-7 Replace PIL with Pillow Added: impressive/trunk/replace-python-imaging.patch Modified: impressive/trunk/PKGBUILD ------------------------------+ PKGBUILD | 13 +++++++++---- replace-python-imaging.patch | 12 ++++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-09-20 09:17:57 UTC (rev 97445) +++ PKGBUILD 2013-09-20 10:08:24 UTC (rev 97446) @@ -6,23 +6,28 @@ pkgname=impressive pkgver=0.10.3 -pkgrel=6 +pkgrel=7 pkgdesc='A fancy PDF presentation program (previously known as KeyJNote).' arch=('any') url='http://impressive.sourceforge.net' license=('GPL2') -depends=('python2-pygame' 'python2-opengl' 'python2-imaging' 'ghostscript') +depends=('python2-pygame' 'python2-opengl' 'python2-pillow' 'ghostscript') optdepends=('xdg-utils: for starting web or e-mail hyperlinks from PDF documents' 'mplayer: for sound and video playback') provides=('keyjnote=0.10.3') conflicts=('keyjnote') replaces=('keyjnote') -source=(http://downloads.sourceforge.net/${pkgname}/Impressive-${pkgver}.tar.gz) -sha256sums=('bb4865376db0df3fe307b5f60bddc2bbaf18d2ccb099b2d51bf1723dd94af95e') +source=(http://downloads.sourceforge.net/${pkgname}/Impressive-${pkgver}.tar.gz + replace-python-imaging.patch) +md5sums=('1fefb25db71ee322a59353de85ae00b4' + '73c6d0125ab5532b1b2892844a805e06') build() { cd "${srcdir}/Impressive-${pkgver}" + # replace Import Image with from PIL import Image + patch -Np1 -i ${srcdir}/replace-python-imaging.patch + # python2 fix for file in $(find . -name '*.py' -print); do sed -i 's_#!.*/usr/bin/python_#!/usr/bin/python2_' $file Added: replace-python-imaging.patch =================================================================== --- replace-python-imaging.patch (rev 0) +++ replace-python-imaging.patch 2013-09-20 10:08:24 UTC (rev 97446) @@ -0,0 +1,12 @@ +diff -aur Impressive-0.10.3/impressive.py Impressive-0.10.3.new/impressive.py +--- Impressive-0.10.3/impressive.py 2013-09-20 09:34:16.477993905 +0000 ++++ Impressive-0.10.3.new/impressive.py 2013-09-20 09:33:59.468099703 +0000 +@@ -182,7 +182,7 @@ + from OpenGL.GL import * + import pygame + from pygame.locals import * +- import Image, ImageDraw, ImageFont, ImageFilter ++ from PIL import Image, ImageDraw, ImageFont, ImageFilter + import TiffImagePlugin, BmpImagePlugin, JpegImagePlugin, PngImagePlugin, PpmImagePlugin + except (ValueError, ImportError), err: + print >>sys.stderr, "Oops! Cannot load necessary modules:", err