1 |
commit: 51fe8cc459dd14cc6928a71995a40fbcce637cc5 |
2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Wed Aug 16 08:42:47 2017 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Aug 29 20:18:14 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51fe8cc4 |
7 |
|
8 |
dev-python/pillow: remove unused patches. |
9 |
|
10 |
.../pillow/files/pillow-2.8.1-ico-backport.patch | 36 ------------- |
11 |
.../pillow-3.0.0-backport-tiff-color-fix.patch | 39 -------------- |
12 |
dev-python/pillow/files/pillow-3.0.0-tests.patch | 63 ---------------------- |
13 |
3 files changed, 138 deletions(-) |
14 |
|
15 |
diff --git a/dev-python/pillow/files/pillow-2.8.1-ico-backport.patch b/dev-python/pillow/files/pillow-2.8.1-ico-backport.patch |
16 |
deleted file mode 100644 |
17 |
index a4214f332ee..00000000000 |
18 |
--- a/dev-python/pillow/files/pillow-2.8.1-ico-backport.patch |
19 |
+++ /dev/null |
20 |
@@ -1,36 +0,0 @@ |
21 |
- PIL/IcoImagePlugin.py | 8 ++++---- |
22 |
- 1 file changed, 4 insertions(+), 4 deletions(-) |
23 |
- |
24 |
-diff --git a/PIL/IcoImagePlugin.py b/PIL/IcoImagePlugin.py |
25 |
-index b4817db..dff4efc 100644 |
26 |
---- a/PIL/IcoImagePlugin.py |
27 |
-+++ b/PIL/IcoImagePlugin.py |
28 |
-@@ -49,7 +49,7 @@ def _save(im, fp, filename): |
29 |
- filter(lambda x: False if (x[0] > width or x[1] > height or |
30 |
- x[0] > 255 or x[1] > 255) else True, sizes) |
31 |
- sizes = sorted(sizes, key=lambda x: x[0]) |
32 |
-- fp.write(struct.pack("H", len(sizes))) # idCount(2) |
33 |
-+ fp.write(struct.pack("<H", len(sizes))) # idCount(2) |
34 |
- offset = fp.tell() + len(sizes)*16 |
35 |
- for size in sizes: |
36 |
- width, height = size |
37 |
-@@ -58,7 +58,7 @@ def _save(im, fp, filename): |
38 |
- fp.write(b"\0") # bColorCount(1) |
39 |
- fp.write(b"\0") # bReserved(1) |
40 |
- fp.write(b"\0\0") # wPlanes(2) |
41 |
-- fp.write(struct.pack("H", 32)) # wBitCount(2) |
42 |
-+ fp.write(struct.pack("<H", 32)) # wBitCount(2) |
43 |
- |
44 |
- image_io = BytesIO() |
45 |
- tmp = im.copy() |
46 |
-@@ -67,8 +67,8 @@ def _save(im, fp, filename): |
47 |
- image_io.seek(0) |
48 |
- image_bytes = image_io.read() |
49 |
- bytes_len = len(image_bytes) |
50 |
-- fp.write(struct.pack("I", bytes_len)) # dwBytesInRes(4) |
51 |
-- fp.write(struct.pack("I", offset)) # dwImageOffset(4) |
52 |
-+ fp.write(struct.pack("<I", bytes_len)) # dwBytesInRes(4) |
53 |
-+ fp.write(struct.pack("<I", offset)) # dwImageOffset(4) |
54 |
- current = fp.tell() |
55 |
- fp.seek(offset) |
56 |
- fp.write(image_bytes) |
57 |
|
58 |
diff --git a/dev-python/pillow/files/pillow-3.0.0-backport-tiff-color-fix.patch b/dev-python/pillow/files/pillow-3.0.0-backport-tiff-color-fix.patch |
59 |
deleted file mode 100644 |
60 |
index b5b5201c279..00000000000 |
61 |
--- a/dev-python/pillow/files/pillow-3.0.0-backport-tiff-color-fix.patch |
62 |
+++ /dev/null |
63 |
@@ -1,39 +0,0 @@ |
64 |
-From e0cb8f945e22d4f714f1c1de3aa04b3db39c5679 Mon Sep 17 00:00:00 2001 |
65 |
-From: wiredfool <eric-github@××××××.net> |
66 |
-Date: Sat, 3 Oct 2015 22:46:01 +0100 |
67 |
-Subject: [PATCH] Flatten sampleformat to initial value, fixes #1466 |
68 |
- |
69 |
---- |
70 |
- PIL/TiffImagePlugin.py | 9 +++++++-- |
71 |
- Tests/images/copyleft.tiff | Bin 0 -> 7926 bytes |
72 |
- Tests/test_file_tiff.py | 5 +++++ |
73 |
- 3 files changed, 12 insertions(+), 2 deletions(-) |
74 |
- create mode 100644 Tests/images/copyleft.tiff |
75 |
- |
76 |
-diff --git a/PIL/TiffImagePlugin.py b/PIL/TiffImagePlugin.py |
77 |
-index 1f97422..a84d017 100644 |
78 |
---- a/PIL/TiffImagePlugin.py |
79 |
-+++ b/PIL/TiffImagePlugin.py |
80 |
-@@ -180,8 +180,6 @@ |
81 |
- (MM, 2, (1,), 1, (8, 8, 8, 8), (2,)): ("RGBA", "RGBA"), |
82 |
- (II, 2, (1,), 1, (8, 8, 8, 8), (999,)): ("RGBA", "RGBA"), # Corel Draw 10 |
83 |
- (MM, 2, (1,), 1, (8, 8, 8, 8), (999,)): ("RGBA", "RGBA"), # Corel Draw 10 |
84 |
-- (II, 2, (1, 1, 1, 1), 1, (8, 8, 8, 8), (1,)): ("RGBA", "RGBA"), # OSX Grab |
85 |
-- (MM, 2, (1, 1, 1, 1), 1, (8, 8, 8, 8), (1,)): ("RGBA", "RGBA"), # OSX Grab |
86 |
- (II, 3, (1,), 1, (1,), ()): ("P", "P;1"), |
87 |
- (MM, 3, (1,), 1, (1,), ()): ("P", "P;1"), |
88 |
- (II, 3, (1,), 2, (1,), ()): ("P", "P;1R"), |
89 |
-@@ -967,6 +965,13 @@ def _setup(self): |
90 |
- print("- size:", self.size) |
91 |
- |
92 |
- format = self.tag_v2.get(SAMPLEFORMAT, (1,)) |
93 |
-+ if len(format) > 1 and max(format) == min(format) == 1: |
94 |
-+ # SAMPLEFORMAT is properly per band, so an RGB image will |
95 |
-+ # be (1,1,1). But, we don't support per band pixel types, |
96 |
-+ # and anything more than one band is a uint8. So, just |
97 |
-+ # take the first element. Revisit this if adding support |
98 |
-+ # for more exotic images. |
99 |
-+ format = (1,) |
100 |
- |
101 |
- # mode: check photometric interpretation and bits per pixel |
102 |
- key = ( |
103 |
|
104 |
diff --git a/dev-python/pillow/files/pillow-3.0.0-tests.patch b/dev-python/pillow/files/pillow-3.0.0-tests.patch |
105 |
deleted file mode 100644 |
106 |
index b2228eaf112..00000000000 |
107 |
--- a/dev-python/pillow/files/pillow-3.0.0-tests.patch |
108 |
+++ /dev/null |
109 |
@@ -1,63 +0,0 @@ |
110 |
- Tests/test_imagefont.py | 7 +++++++ |
111 |
- 1 file changed, 7 insertions(+) |
112 |
- |
113 |
-diff --git a/Tests/test_imagefont.py b/Tests/test_imagefont.py |
114 |
-index dd22344..d0a0826 100644 |
115 |
---- a/Tests/test_imagefont.py |
116 |
-+++ b/Tests/test_imagefont.py |
117 |
-@@ -112,6 +112,7 @@ try: |
118 |
- self.assert_image_equal(img_path, img_filelike) |
119 |
- self._clean() |
120 |
- |
121 |
-+ @unittest.skip("https://github.com/python-pillow/Pillow/issues/1259") |
122 |
- def test_textsize_equal(self): |
123 |
- im = Image.new(mode='RGB', size=(300, 100)) |
124 |
- draw = ImageDraw.Draw(im) |
125 |
-@@ -126,6 +127,7 @@ try: |
126 |
- target_img = Image.open(target) |
127 |
- self.assert_image_similar(im, target_img, .5) |
128 |
- |
129 |
-+ @unittest.skip("https://github.com/python-pillow/Pillow/issues/1259") |
130 |
- def test_render_multiline(self): |
131 |
- im = Image.new(mode='RGB', size=(300, 100)) |
132 |
- draw = ImageDraw.Draw(im) |
133 |
-@@ -145,6 +147,7 @@ try: |
134 |
- # at epsilon = ~38. |
135 |
- self.assert_image_similar(im, target_img, .5) |
136 |
- |
137 |
-+ @unittest.skip("https://github.com/python-pillow/Pillow/issues/1259") |
138 |
- def test_render_multiline_text(self): |
139 |
- ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE) |
140 |
- |
141 |
-@@ -200,6 +203,7 @@ try: |
142 |
- draw.multiline_textsize("longest line\nline", |
143 |
- font=ttf)[0]) |
144 |
- |
145 |
-+ @unittest.skip("https://github.com/python-pillow/Pillow/issues/1259") |
146 |
- def test_multiline_spacing(self): |
147 |
- ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE) |
148 |
- |
149 |
-@@ -255,6 +259,7 @@ try: |
150 |
- # Check boxes a and b are same size |
151 |
- self.assertEqual(box_size_a, box_size_b) |
152 |
- |
153 |
-+ @unittest.skip("https://github.com/python-pillow/Pillow/issues/1456") |
154 |
- def test_rotated_transposed_font_get_mask(self): |
155 |
- # Arrange |
156 |
- text = "mask this" |
157 |
-@@ -269,6 +274,7 @@ try: |
158 |
- # Assert |
159 |
- self.assertEqual(mask.size, (13, 108)) |
160 |
- |
161 |
-+ @unittest.skip("https://github.com/python-pillow/Pillow/issues/1456") |
162 |
- def test_unrotated_transposed_font_get_mask(self): |
163 |
- # Arrange |
164 |
- text = "mask this" |
165 |
-@@ -316,6 +322,7 @@ try: |
166 |
- # Assert |
167 |
- self.assertEqual(offset, (0, 3)) |
168 |
- |
169 |
-+ @unittest.skip("https://github.com/python-pillow/Pillow/issues/1456") |
170 |
- def test_free_type_font_get_mask(self): |
171 |
- # Arrange |
172 |
- font = ImageFont.truetype(FONT_PATH, FONT_SIZE) |