Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-office/scribus/files: scribus-1.4.2-imaging.patch
Date: Wed, 29 May 2013 08:18:15
Message-Id: 20130529081810.629B520081@flycatcher.gentoo.org
1 jlec 13/05/29 08:18:10
2
3 Added: scribus-1.4.2-imaging.patch
4 Log:
5 app-office/scribus: Backport upstream fix for deprecated dev-python/imaging usage, #471498
6
7 (Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)
8
9 Revision Changes Path
10 1.1 app-office/scribus/files/scribus-1.4.2-imaging.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/files/scribus-1.4.2-imaging.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/files/scribus-1.4.2-imaging.patch?rev=1.1&content-type=text/plain
14
15 Index: scribus-1.4.2-imaging.patch
16 ===================================================================
17 scribus/plugins/scriptplugin/scripts/FontSample.py | 4 ++--
18 1 file changed, 2 insertions(+), 2 deletions(-)
19
20 diff --git a/scribus/plugins/scriptplugin/scripts/FontSample.py b/scribus/plugins/scriptplugin/scripts/FontSample.py
21 index 0219a32..1e9be38 100644
22 --- a/scribus/plugins/scriptplugin/scripts/FontSample.py
23 +++ b/scribus/plugins/scriptplugin/scripts/FontSample.py
24 @@ -154,7 +154,7 @@ if not os.path.exists(CONFIG_PATH):
25
26
27 try:
28 - import Image
29 + from PIL import Image
30 except ImportError,err:
31 print 'You need to install Python Imaging Library (PIL).'
32 print 'If using gentoo then you need to emerge /dev-python/imaging'
33 @@ -164,7 +164,7 @@ except ImportError,err:
34
35
36 try:
37 - import ImageTk
38 + from PIL import ImageTk
39 except ImportError,err:
40 print 'Module ImageTk not found, font preview disabled'
41 showPreviewPanel = 0