Date: Monday, October 7, 2013 @ 03:43:45
Author: bgyorgy
Revision: 98172
upgpkg: impressive 0.10.3-8
Fix compatibility patch from Fedora (FS#37213)
Added:
impressive/trunk/impressive-0.10.3-pillow-compat.patch
Modified:
impressive/trunk/PKGBUILD
Deleted:
impressive/trunk/replace-python-imaging.patch
---------------------------------------+
PKGBUILD | 10 +++++-----
impressive-0.10.3-pillow-compat.patch | 13 +++++++++++++
replace-python-imaging.patch | 12 ------------
3 files changed, 18 insertions(+), 17 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-10-07 00:58:38 UTC (rev 98171)
+++ PKGBUILD 2013-10-07 01:43:45 UTC (rev 98172)
@@ -6,7 +6,7 @@
pkgname=impressive
pkgver=0.10.3
-pkgrel=7
+pkgrel=8
pkgdesc='A fancy PDF presentation program (previously known as KeyJNote).'
arch=('any')
url='http://impressive.sourceforge.net'
@@ -18,15 +18,15 @@
conflicts=('keyjnote')
replaces=('keyjnote')
source=(http://downloads.sourceforge.net/${pkgname}/Impressive-${pkgver}.tar.gz
- replace-python-imaging.patch)
+ impressive-0.10.3-pillow-compat.patch)
md5sums=('1fefb25db71ee322a59353de85ae00b4'
- '73c6d0125ab5532b1b2892844a805e06')
+ '7f112309f3faebca123ff576c9d28c1c')
-build() {
+prepare() {
cd "${srcdir}/Impressive-${pkgver}"
# replace Import Image with from PIL import Image
- patch -Np1 -i ${srcdir}/replace-python-imaging.patch
+ patch -Np1 -i ${srcdir}/impressive-0.10.3-pillow-compat.patch
# python2 fix
for file in $(find . -name '*.py' -print); do
Added: 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:45 UTC (rev
98172)
@@ -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 00:58:38 UTC (rev 98171)
+++ replace-python-imaging.patch 2013-10-07 01:43:45 UTC (rev 98172)
@@ -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
