Attachment #204680 for bug #238070

Lines 3-9 Link Here

(-)Makefile (-19 / +25 lines)
3		3
4	PORTNAME= cinnamon	4	PORTNAME= cinnamon
5	PORTVERSION= 2.4.6	5	PORTVERSION= 2.4.6
6	PORTREVISION= 11	6	PORTREVISION= 12
7	CATEGORIES= x11 gnome	7	CATEGORIES= x11 gnome
8	DIST_SUBDIR= gnome3	8	DIST_SUBDIR= gnome3
9		9
Lines 10-15 Link Here
10	MAINTAINER= gnome@FreeBSD.org	10	MAINTAINER= gnome@FreeBSD.org
11	COMMENT= Fork of GNOME Shell with layout similar to GNOME 2	11	COMMENT= Fork of GNOME Shell with layout similar to GNOME 2
12		12
		13	LICENSE= GPLv2
		14	LICENSE_FILE= ${WRKSRC}/COPYING
		15
13	BUILD_DEPENDS= ca_root_nss>=0:security/ca_root_nss \	16	BUILD_DEPENDS= ca_root_nss>=0:security/ca_root_nss \
14	gnome-autogen.sh:devel/gnome-common	17	gnome-autogen.sh:devel/gnome-common
15	LIB_DEPENDS= libstartup-notification-1.so:x11/startup-notification \	18	LIB_DEPENDS= libstartup-notification-1.so:x11/startup-notification \
Lines 21-30 Link Here
21	libfolks.so:net-im/folks \	24	libfolks.so:net-im/folks \
22	libpulse.so:audio/pulseaudio \	25	libpulse.so:audio/pulseaudio \
23	libcroco-0.6.so:textproc/libcroco \	26	libcroco-0.6.so:textproc/libcroco \
		27	libsoup-2.4.so:devel/libsoup \
		28	libdbus-1.so:devel/dbus \
24	libdbus-glib-1.so:devel/dbus-glib \	29	libdbus-glib-1.so:devel/dbus-glib \
		30	libcogl.so:graphics/cogl \
		31	libpolkit-agent-1.so:sysutils/polkit \
25	libclutter-glx-1.0.so:graphics/clutter \	32	libclutter-glx-1.0.so:graphics/clutter \
		33	libmozjs-24.so:lang/spidermonkey24 \
26	libcjs.so:lang/cjs \	34	libcjs.so:lang/cjs \
		35	libjson-glib-1.0.so:devel/json-glib \
27	libcinnamon-menu-3.so:x11/cinnamon-menus \	36	libcinnamon-menu-3.so:x11/cinnamon-menus \
		37	libcinnamon-desktop.so:x11/cinnamon-desktop \
28	libaccountsservice.so:sysutils/accountsservice	38	libaccountsservice.so:sysutils/accountsservice
29	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \	39	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \
30	ca_root_nss>=0:security/ca_root_nss \	40	ca_root_nss>=0:security/ca_root_nss \
Lines 36-66 Link Here
36	${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \	46	${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \
37	${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR}	47	${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR}
38		48
39	USES= autoreconf compiler:c11 gettext gmake libtool \	49	USES= autoreconf compiler:c11 gettext gmake gnome gl libtool \
40	pathfix pkgconfig python:2.7 shebangfix	50	localbase:ldflags pathfix pkgconfig python:2.7 shebangfix
41	USE_GNOME= evolutiondataserver3 gconf2 gnomedesktop3 \	51	USE_GITHUB= yes
42	gnomeprefix gtk30 intlhack introspection:build	52	USE_GL= gl egl
		53	USE_GNOME= cairo evolutiondataserver3 gconf2 gnomedesktop3 \
		54	gnomeprefix gtk30 intlhack introspection
		55	USE_GSTREAMER1= yes
		56	USE_LDCONFIG= yes
		57	USE_XORG= x11 xfixes sm xrandr xext xdamage xcomposite xi
43		58
44	USE_GITHUB= yes
45	GH_ACCOUNT= linuxmint	59	GH_ACCOUNT= linuxmint
46	GH_PROJECT= Cinnamon	60	GH_PROJECT= Cinnamon
47		61
48	# this happens before moving the file to ${PREFIX} (which then will be copied to ${STAGEDIR}${PREFIX})	62	# this happens before moving the file to ${PREFIX} (which then will be copied to ${STAGEDIR}${PREFIX})
49	SHEBANG_FILES= files/usr/bin/cinnamon2d	63	SHEBANG_FILES= files/* *.py
50	USE_XORG= x11 xfixes sm	64
51	USE_GSTREAMER= theora vp8 ogg
52	INSTALLS_ICONS= yes	65	INSTALLS_ICONS= yes
53	USE_LDCONFIG= yes	66
54	GNU_CONFIGURE= yes	67	GNU_CONFIGURE= yes
55	CONFIGURE_ARGS+=--enable-compile-warnings=no \	68	CONFIGURE_ARGS+=--enable-compile-warnings=no \
56	--with-ca-certificates=${LOCALBASE}/share/certs/ca-root-nss.crt	69	--with-ca-certificates=${LOCALBASE}/share/certs/ca-root-nss.crt
57	CPPFLAGS+= -I${LOCALASE}/include	70
58	LDFLAGS+= -L${LOCALBASE}/lib
59	INSTALL_TARGET= install-strip	71	INSTALL_TARGET= install-strip
60		72
61	GLIB_SCHEMAS= org.cinnamon.gschema.xml	73	GLIB_SCHEMAS= org.cinnamon.gschema.xml
62		74
63	OPTIONS_DEFINE= NLS	75	OPTIONS_DEFINE= NLS
		76
64	NLS_RUN_DEPENDS= cinnamon-translations>=0:misc/cinnamon-translations	77	NLS_RUN_DEPENDS= cinnamon-translations>=0:misc/cinnamon-translations
65		78
66	post-patch:	79	post-patch:
Lines 139-151 Link Here
139	${WRKSRC}/files${PREFIX}/share/xsessions/cinnamon.desktop \	152	${WRKSRC}/files${PREFIX}/share/xsessions/cinnamon.desktop \
140	${WRKSRC}/files${PREFIX}/share/applications/cinnamon2d.desktop	153	${WRKSRC}/files${PREFIX}/share/applications/cinnamon2d.desktop
141		154
142	# Some python files use #! /usr/bin/python (note the space between the bang and the python interpreter
143	@${FIND} ${WRKSRC} -name \* \| ${XARGS} ${EGREP} -l "#!.*\/usr\/bin\/python" \| \
144	${XARGS} ${REINPLACE_CMD} -e "s\|#!.python.\|#!/usr/bin/env python\|g"
145
146	@${FIND} ${WRKSRC} -name '*.orig' -delete
147	@${FIND} ${WRKSRC} -name '*.bak' -delete
148
149	post-install:	155	post-install:
150	@${PYTHON_CMD} ${WRKSRC}/files/generate_desktop_files	156	@${PYTHON_CMD} ${WRKSRC}/files/generate_desktop_files
151		157




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

--- files/usr/lib/cinnamon-settings/bin/imtools.py.orig	2019-05-23 10:40:29 UTC
+++ files/usr/lib/cinnamon-settings/bin/imtools.py
@@ -618,32 +618,6 @@ def has_transparency(image):
     return (image.mode == 'P' and 'transparency' in image.info) or\
             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.
@@ -654,7 +628,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.

Return to bug 238070

Line 0 Link Here

(-)files/patch-files_usr_lib_cinnamon-settings_bin_imtools.py (+60 lines)
	1	From c843f3664064742e2672e0fea528571a882d84ad Mon Sep 17 00:00:00 2001
	2	From: Eli Schwartz <eschwartz93@gmail.com>
	3	Date: Fri, 5 Apr 2019 11:28:45 -0400
	4	Subject: [PATCH] PIL: remove unnnecessary version check and code fork (#8496)
	5
	6	The Image.VERSION variable was deprecated some time ago and is now gone
	7	entirely. But its only use was to determine whether we were using at
	8	least the latest version of PIL, or any version of its fork, Pillow. And
	9	PIL was last developed in 2009 and does not support python3 at all, so
	10	we are guaranteed to be using Pillow.
	11
	12	Moreover, the check does not really matter, as Pillow is guaranteed to
	13	load any image it opens, without the user doing so manually.
	14
	15	Fixes #8495
	16
	17	--- files/usr/lib/cinnamon-settings/bin/imtools.py.orig 2019-05-23 10:40:29 UTC
	18	+++ files/usr/lib/cinnamon-settings/bin/imtools.py
	19	@@ -618,32 +618,6 @@ def has_transparency(image):
	20	return (image.mode == 'P' and 'transparency' in image.info) or\
	21	has_alpha(image)
	22
	23	-
	24	-if Image.VERSION == '1.1.7':
	25	-
	26	- def split(image):
	27	- """Work around for bug in Pil 1.1.7
	28	-
	29	- :param image: input image
	30	- :type image: PIL image object
	31	- :returns: the different color bands of the image (eg R, G, B)
	32	- :rtype: tuple
	33	- """
	34	- image.load()
	35	- return image.split()
	36	-else:
	37	-
	38	- def split(image):
	39	- """Work around for bug in Pil 1.1.7
	40	-
	41	- :param image: input image
	42	- :type image: PIL image object
	43	- :returns: the different color bands of the image (eg R, G, B)
	44	- :rtype: tuple
	45	- """
	46	- return image.split()
	47	-
	48	-
	49	def get_alpha(image):
	50	"""Gets the image alpha band. Can handles P mode images with transpareny.
	51	Returns a band with all values set to 255 if no alpha band exists.
	52	@@ -654,7 +628,7 @@ def get_alpha(image):
	53	:rtype: single band image object
	54	"""
	55	if has_alpha(image):
	56	- return split(image)[-1]
	57	+ return image.split()[-1]
	58	if image.mode == 'P' and 'transparency' in image.info:
	59	return image.convert('RGBA').split()[-1]
	60	# No alpha layer, create one.