Revert "gentoo resync : 13.09.2019"

This reverts commit a1392efe64137262023d92492396ca9156d22396.

1 files changed, 35 insertions, 0 deletions

diff --git a/media-video/photofilmstrip/files/photofilmstrip-2.1.0-PIL_tostring_fix.patch b/media-video/photofilmstrip/files/photofilmstrip-2.1.0-PIL_tostring_fix.patch
new file mode 100644
index 000000000000..dc29c9c8e14f
--- /dev/null
+++ b/media-video/photofilmstrip/files/photofilmstrip-2.1.0-PIL_tostring_fix.patch
@@ -0,0 +1,35 @@
+Gentoo-Bug: https://bugs.gentoo.org/584128
+
+--- a/photofilmstrip/core/ProjectFile.py
++++ b/photofilmstrip/core/ProjectFile.py
+@@ -196,7 +196,7 @@
+     def __ThumbToQuery(self, picId, pic):
+         pilThumb = PILBackend.GetThumbnail(pic, height=120)
+         thumbWidth, thumbHeight = pilThumb.size
+-        thumbData = buffer(pilThumb.tostring())
++        thumbData = buffer(pilThumb.tobytes())
+         
+         query = "INSERT INTO `thumbnail` (" \
+                     "picture_id, width, height, data" \
+--- a/photofilmstrip/core/renderer/CairoRenderer.py
++++ b/photofilmstrip/core/renderer/CairoRenderer.py
+@@ -121,7 +121,7 @@
+     def _PilToCairo(self, pilImg):
+         pilImg = pilImg.copy()
+         w, h = pilImg.size  
+-        data = pilImg.convert('RGBA').tostring()
++        data = pilImg.convert('RGBA').tobytes()
+         buff = array.array('B', data)
+         cairoImage = cairo.ImageSurface.create_for_data(buff, cairo.FORMAT_ARGB32, w, h)
+ #        cairoImage = cairo.ImageSurface.create_for_data(buff, cairo.FORMAT_RGB24, w, h)
+--- a/photofilmstrip/core/renderer/PyGameRenderer.py
++++ b/photofilmstrip/core/renderer/PyGameRenderer.py
+@@ -100,7 +100,7 @@
+     def _PilToPyGame(self, pilImg):
+         mode = pilImg.mode
+         assert mode in "RGB", "RGBA"
+-        return pygame.image.fromstring(pilImg.tostring(), pilImg.size, mode)
++        return pygame.image.frombytes(pilImg.tobytes(), pilImg.size, mode)
+ 
+ 
+ #    def CropAndResize(self, ctx, rect):