Date: Monday, October 7, 2013 @ 03:43:50 Author: bgyorgy Revision: 98173
archrelease: copy trunk to community-any Added: impressive/repos/community-any/PKGBUILD (from rev 98172, impressive/trunk/PKGBUILD) impressive/repos/community-any/impressive-0.10.3-pillow-compat.patch (from rev 98172, impressive/trunk/impressive-0.10.3-pillow-compat.patch) Deleted: impressive/repos/community-any/PKGBUILD impressive/repos/community-any/replace-python-imaging.patch ---------------------------------------+ PKGBUILD | 92 ++++++++++++++++---------------- impressive-0.10.3-pillow-compat.patch | 13 ++++ replace-python-imaging.patch | 12 ---- 3 files changed, 59 insertions(+), 58 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2013-10-07 01:43:45 UTC (rev 98172) +++ PKGBUILD 2013-10-07 01:43:50 UTC (rev 98173) @@ -1,46 +0,0 @@ -# $Id$ -# Maintainer: Jaroslav Lichtblau <dragonl...@aur.archlinux.org> -# Contributor: Geoffroy Carrier <gcarr...@aur.archlinux.org> -# Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de> -# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> - -pkgname=impressive -pkgver=0.10.3 -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-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 - 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 - sed -i 's_#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file - done -} - -package() { - cd "${srcdir}/Impressive-${pkgver}" - - install -d -m755 "${pkgdir}"/usr/{bin,share/{doc/${pkgname},man/man1}} - install -m755 ${pkgname}.py "${pkgdir}/usr/bin/${pkgname}" - ln -s ${pkgname} "${pkgdir}/usr/bin/keyjnote" - install -m644 ${pkgname}.html demo.pdf changelog.txt "${pkgdir}/usr/share/doc/${pkgname}/" - install -m644 ${pkgname}.1 "${pkgdir}/usr/share/man/man1/" -} Copied: impressive/repos/community-any/PKGBUILD (from rev 98172, impressive/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2013-10-07 01:43:50 UTC (rev 98173) @@ -0,0 +1,46 @@ +# $Id$ +# Maintainer: Jaroslav Lichtblau <dragonl...@aur.archlinux.org> +# Contributor: Geoffroy Carrier <gcarr...@aur.archlinux.org> +# Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de> +# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> + +pkgname=impressive +pkgver=0.10.3 +pkgrel=8 +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-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 + impressive-0.10.3-pillow-compat.patch) +md5sums=('1fefb25db71ee322a59353de85ae00b4' + '7f112309f3faebca123ff576c9d28c1c') + +prepare() { + cd "${srcdir}/Impressive-${pkgver}" + + # replace Import Image with from PIL import Image + patch -Np1 -i ${srcdir}/impressive-0.10.3-pillow-compat.patch + +# python2 fix + for file in $(find . -name '*.py' -print); do + sed -i 's_#!.*/usr/bin/python_#!/usr/bin/python2_' $file + sed -i 's_#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file + done +} + +package() { + cd "${srcdir}/Impressive-${pkgver}" + + install -d -m755 "${pkgdir}"/usr/{bin,share/{doc/${pkgname},man/man1}} + install -m755 ${pkgname}.py "${pkgdir}/usr/bin/${pkgname}" + ln -s ${pkgname} "${pkgdir}/usr/bin/keyjnote" + install -m644 ${pkgname}.html demo.pdf changelog.txt "${pkgdir}/usr/share/doc/${pkgname}/" + install -m644 ${pkgname}.1 "${pkgdir}/usr/share/man/man1/" +} Copied: impressive/repos/community-any/impressive-0.10.3-pillow-compat.patch (from rev 98172, impressive/trunk/impressive-0.10.3-pillow-compat.patch) =================================================================== --- impressive-0.10.3-pillow-compat.patch (rev 0) +++ impressive-0.10.3-pillow-compat.patch 2013-10-07 01:43:50 UTC (rev 98173) @@ -0,0 +1,13 @@ +--- Impressive-0.10.3.orig/impressive.py ++++ Impressive-0.10.3/impressive.py +@@ -182,8 +182,8 @@ try: + from OpenGL.GL import * + import pygame + from pygame.locals import * +- import Image, ImageDraw, ImageFont, ImageFilter +- import TiffImagePlugin, BmpImagePlugin, JpegImagePlugin, PngImagePlugin, PpmImagePlugin ++ from PIL import Image, ImageDraw, ImageFont, ImageFilter ++ from PIL import TiffImagePlugin, BmpImagePlugin, JpegImagePlugin, PngImagePlugin, PpmImagePlugin + except (ValueError, ImportError), err: + print >>sys.stderr, "Oops! Cannot load necessary modules:", err + print >>sys.stderr, """To use Impressive, you need to install the following Python modules: Deleted: replace-python-imaging.patch =================================================================== --- replace-python-imaging.patch 2013-10-07 01:43:45 UTC (rev 98172) +++ replace-python-imaging.patch 2013-10-07 01:43:50 UTC (rev 98173) @@ -1,12 +0,0 @@ -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