Gentoo Archives: gentoo-commits

From: "Dirkjan Ochtman (djc)" <djc@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-python/imaging/files: imaging-1.1.7-missing-math.patch imaging-1.1.7-giftrans.patch imaging-1.1.7-no-xv.patch imaging-1.1.7-sane.patch
Date: Mon, 30 Nov 2009 09:42:37
Message-Id: E1NF2m9-000187-EA@stork.gentoo.org
1 djc 09/11/30 09:42:33
2
3 Added: imaging-1.1.7-missing-math.patch
4 imaging-1.1.7-giftrans.patch
5 imaging-1.1.7-no-xv.patch imaging-1.1.7-sane.patch
6 Log:
7 Version bump dev-python/imaging-1.1.7.
8 (Portage version: 2.1.6.13/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.1 dev-python/imaging/files/imaging-1.1.7-missing-math.patch
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/imaging/files/imaging-1.1.7-missing-math.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/imaging/files/imaging-1.1.7-missing-math.patch?rev=1.1&content-type=text/plain
15
16 Index: imaging-1.1.7-missing-math.patch
17 ===================================================================
18 --- setup.py.old 2009-07-03 11:34:59.141671252 +0200
19 +++ setup.py 2009-07-03 11:51:54.415666711 +0200
20 @@ -281,6 +281,8 @@ class pil_build_ext(build_ext):
21 if struct.unpack("h", "\0\1")[0] == 1:
22 defs.append(("WORDS_BIGENDIAN", None))
23
24 + libs.append("m")
25 +
26 exts = [(Extension(
27 "_imaging", files, libraries=libs, define_macros=defs
28 ))]
29 @@ -332,7 +334,7 @@ class pil_build_ext(build_ext):
30 ))
31
32 if os.path.isfile("_imagingmath.c"):
33 - exts.append(Extension("_imagingmath", ["_imagingmath.c"]))
34 + exts.append(Extension("_imagingmath", ["_imagingmath.c"], libraries=["m"]))
35
36 self.extensions[:] = exts
37
38
39
40
41 1.1 dev-python/imaging/files/imaging-1.1.7-giftrans.patch
42
43 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/imaging/files/imaging-1.1.7-giftrans.patch?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/imaging/files/imaging-1.1.7-giftrans.patch?rev=1.1&content-type=text/plain
45
46 Index: imaging-1.1.7-giftrans.patch
47 ===================================================================
48 --- Imaging-1.1.6.orig/PIL/GifImagePlugin.py 2006-12-03 11:37:15.000000000 +0000
49 +++ Imaging-1.1.6/PIL/GifImagePlugin.py 2008-10-02 14:51:43.000000000 +0100
50 @@ -352,6 +352,11 @@
51 for i in range(maxcolor):
52 s.append(chr(i) * 3)
53
54 + if im.info.has_key('transparency'):
55 + transparentIndex = im.info['transparency']
56 + s.append('!' + chr(0xf9) + chr(4) + chr(1) + chr(0) + chr(0) +
57 + chr(transparentIndex) + chr(0))
58 +
59 return s
60
61 def getdata(im, offset = (0, 0), **params):
62
63
64
65 1.1 dev-python/imaging/files/imaging-1.1.7-no-xv.patch
66
67 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/imaging/files/imaging-1.1.7-no-xv.patch?rev=1.1&view=markup
68 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/imaging/files/imaging-1.1.7-no-xv.patch?rev=1.1&content-type=text/plain
69
70 Index: imaging-1.1.7-no-xv.patch
71 ===================================================================
72 --- PIL/ImageShow.py.old 2009-11-30 10:28:37.000000000 +0100
73 +++ PIL/ImageShow.py 2009-11-30 10:29:02.000000000 +0100
74 @@ -149,13 +149,10 @@
75 def get_command_ex(self, file, title=None, **options):
76 # note: xv is pretty outdated. most modern systems have
77 # imagemagick's display command instead.
78 - command = executable = "xv"
79 - if title:
80 - # FIXME: do full escaping
81 - command = command + " -name \"%s\"" % title
82 + command = executable = "xdg-open"
83 return command, executable
84
85 - if which("xv"):
86 + if which("xdg-open"):
87 register(XVViewer)
88
89 if __name__ == "__main__":
90
91
92
93 1.1 dev-python/imaging/files/imaging-1.1.7-sane.patch
94
95 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/imaging/files/imaging-1.1.7-sane.patch?rev=1.1&view=markup
96 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/imaging/files/imaging-1.1.7-sane.patch?rev=1.1&content-type=text/plain
97
98 Index: imaging-1.1.7-sane.patch
99 ===================================================================
100 --- Imaging-1.1.6/Sane/_sane.c.orig 2006-12-03 13:12:22.000000000 +0100
101 +++ Imaging-1.1.6/Sane/_sane.c 2009-02-28 11:41:19.000000000 +0200
102 @@ -1152,8 +1152,8 @@
103 static PyObject *
104 PySane_get_devices(PyObject *self, PyObject *args)
105 {
106 - SANE_Device **devlist;
107 - SANE_Device *dev;
108 + const SANE_Device **devlist;
109 + const SANE_Device *dev;
110 SANE_Status st;
111 PyObject *list;
112 int local_only, i;