Miroirs/csb
1
0
Fork 0
mirror of https://gitlab.com/CinnamonSlackBuilds/csb.git synced 2024-12-25 21:59:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cinnamon: Fix compatibility with Pillow 6.0.0.

Browse source 
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackware-id.org>
This commit is contained in:
Willy Sudiarto Raharjo 2019-05-16 21:20:38 +07:00
parent 010ac32a10
commit 10c1e19bfa
No known key found for this signature in database
GPG key ID: 887B8374D7333381
2 changed files with 66 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cinnamon/cinnamon.SlackBuild
View file

@ -24,7 +24,7 @@
PRGNAM=cinnamon
VERSION=${VERSION:-4.0.10}
BUILD=${BUILD:-1}
BUILD=${BUILD:-2}
TAG=${TAG:-_csb}
if [ -z "$ARCH" ]; then
@ -81,6 +81,7 @@ patch -p1 < $CWD/logo.patch
rm files/etc/xdg/menus/cinnamon-applications-merged
patch -p1 < $CWD/7382.patch
patch -p1 < $CWD/pil.patch
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \

64
cinnamon/pil.patch Normal file
View file

@ -0,0 +1,64 @@
From c843f3664064742e2672e0fea528571a882d84ad Mon Sep 17 00:00:00 2001
From: Eli Schwartz <eschwartz93@gmail.com>
Date: Fri, 5 Apr 2019 11:28:45 -0400
Subject: [PATCH] PIL: remove unnnecessary version check and code fork (#8496)
The Image.VERSION variable was deprecated some time ago and is now gone
entirely. But its only use was to determine whether we were using at
least the latest version of PIL, or any version of its fork, Pillow. And
PIL was last developed in 2009 and does not support python3 at all, so
we are guaranteed to be using Pillow.
Moreover, the check does not really matter, as Pillow is guaranteed to
load any image it opens, without the user doing so manually.
Fixes #8495
---
.../cinnamon/cinnamon-settings/bin/imtools.py | 27 +------------------
1 file changed, 1 insertion(+), 26 deletions(-)
diff --git a/files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py b/files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
index 05605001f7..c386fe3847 100644
--- a/files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
+++ b/files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
@@ -620,31 +620,6 @@ def has_transparency(image):
has_alpha(image)
-if Image.VERSION == '1.1.7':
-
- def split(image):
- """Work around for bug in Pil 1.1.7
-
- :param image: input image
- :type image: PIL image object
- :returns: the different color bands of the image (eg R, G, B)
- :rtype: tuple
- """
- image.load()
- return image.split()
-else:
-
- def split(image):
- """Work around for bug in Pil 1.1.7
-
- :param image: input image
- :type image: PIL image object
- :returns: the different color bands of the image (eg R, G, B)
- :rtype: tuple
- """
- return image.split()
-
-
def get_alpha(image):
"""Gets the image alpha band. Can handles P mode images with transpareny.
Returns a band with all values set to 255 if no alpha band exists.
@@ -655,7 +630,7 @@ def get_alpha(image):
:rtype: single band image object
"""
if has_alpha(image):
- return split(image)[-1]
+ return image.split()[-1]
if image.mode == 'P' and 'transparency' in image.info:
return image.convert('RGBA').split()[-1]
# No alpha layer, create one.