Index: branches/2019Q2/x11/cinnamon/Makefile =================================================================== --- branches/2019Q2/x11/cinnamon/Makefile (revision 505537) +++ branches/2019Q2/x11/cinnamon/Makefile (revision 505538) @@ -1,152 +1,157 @@ # Created by: Gustau Perez i Querol # $FreeBSD$ PORTNAME= cinnamon PORTVERSION= 2.4.6 -PORTREVISION= 10 +PORTREVISION= 12 CATEGORIES= x11 gnome DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= Fork of GNOME Shell with layout similar to GNOME 2 +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + BUILD_DEPENDS= ca_root_nss>=0:security/ca_root_nss \ gnome-autogen.sh:devel/gnome-common LIB_DEPENDS= libstartup-notification-1.so:x11/startup-notification \ libcaribou.so:accessibility/caribou \ libgnome-keyring.so:security/libgnome-keyring \ libmuffin.so:x11-wm/muffin \ libtelepathy-glib.so:net-im/telepathy-glib \ libtelepathy-logger.so:net-im/telepathy-logger \ libfolks.so:net-im/folks \ libpulse.so:audio/pulseaudio \ libcroco-0.6.so:textproc/libcroco \ + libsoup-2.4.so:devel/libsoup \ + libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib \ + libcogl.so:graphics/cogl \ + libpolkit-agent-1.so:sysutils/polkit \ libclutter-glx-1.0.so:graphics/clutter \ + libmozjs-24.so:lang/spidermonkey24 \ libcjs.so:lang/cjs \ + libjson-glib-1.0.so:devel/json-glib \ libcinnamon-menu-3.so:x11/cinnamon-menus \ + libcinnamon-desktop.so:x11/cinnamon-desktop \ libaccountsservice.so:sysutils/accountsservice RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \ ca_root_nss>=0:security/ca_root_nss \ gnome-themes-extra>=3.0.0:x11-themes/gnome-themes-extra \ cinnamon-control-center:sysutils/cinnamon-control-center \ cinnamon-translations>=0:misc/cinnamon-translations \ cinnamon-screensaver:x11/cinnamon-screensaver \ nemo:x11-fm/nemo \ ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} -USES= autoreconf compiler:c11 gettext gmake libtool \ - pathfix pkgconfig python:2.7 shebangfix -USE_GNOME= evolutiondataserver3 gconf2 gnomedesktop3 \ - gnomeprefix gtk30 intlhack introspection:build - +USES= autoreconf compiler:c11 gettext gmake gnome gl libtool \ + localbase:ldflags pathfix pkgconfig python:2.7 shebangfix USE_GITHUB= yes +USE_GL= gl egl +USE_GNOME= cairo evolutiondataserver3 gconf2 gnomedesktop3 \ + gnomeprefix gtk30 intlhack introspection +USE_GSTREAMER1= yes +USE_LDCONFIG= yes +USE_XORG= x11 xfixes sm xrandr xext xdamage xcomposite xi + GH_ACCOUNT= linuxmint -GH_PROJECT= Cinnamon # this happens before moving the file to ${PREFIX} (which then will be copied to ${STAGEDIR}${PREFIX}) -SHEBANG_FILES= files/usr/bin/cinnamon2d -USE_XORG= x11 xfixes sm -USE_GSTREAMER= theora vp8 ogg +SHEBANG_FILES= files/* *.py + INSTALLS_ICONS= yes -USE_LDCONFIG= yes + GNU_CONFIGURE= yes CONFIGURE_ARGS+=--enable-compile-warnings=no \ --with-ca-certificates=${LOCALBASE}/share/certs/ca-root-nss.crt -CPPFLAGS+= -I${LOCALASE}/include -LDFLAGS+= -L${LOCALBASE}/lib + INSTALL_TARGET= install-strip GLIB_SCHEMAS= org.cinnamon.gschema.xml OPTIONS_DEFINE= NLS + NLS_RUN_DEPENDS= cinnamon-translations>=0:misc/cinnamon-translations post-patch: # we need this for intltoolize otherwise it can't copy the m4 file ... @${MKDIR} ${WRKSRC}/m4 @${MKDIR} ${WRKSRC}/files${PREFIX} .for d in bin lib share @${MV} ${WRKSRC}/files/usr/${d} ${WRKSRC}/files${PREFIX} .endfor @${REINPLACE_CMD} -e 's|--warn-error||g' ${WRKSRC}/src/Makefile.am @${REINPLACE_CMD} -e 's|/usr/share/cinnamon|${STAGEDIR}${PREFIX}/share/|g ;\ s|/usr/lib|${STAGEDIR}${PREFIX}/share/|g' \ ${WRKSRC}/files/generate_desktop_files @${REINPLACE_CMD} -e 's|"usr/lib|"${STAGEDIR}${PREFIX}/share/|g ;\ s|"usr/share|"${STAGEDIR}${PREFIX}/share/|g' \ ${WRKSRC}/files/generate_desktop_files @${MV} ${WRKSRC}/files/etc ${WRKSRC}/files${PREFIX} @${RM} ${WRKSRC}/files/${PREFIX}/lib/cinnamon-settings/modules/cs_user.py # Remove a broken link (is applications-merge used anywhere?) @${RM} ${WRKSRC}/files/${PREFIX}/etc/xdg/menus/cinnamon-applications-merged @${REINPLACE_CMD} -e 's|AM_GNU_GETTEXT_VERSION(\[0.17\])||g ;\ s|AM_GNU_GETTEXT(\[external\])||g' \ ${WRKSRC}/configure.ac @${REINPLACE_CMD} -e 's|find|find ${WRKSRC}/files|g' \ ${WRKSRC}/files/Makefile.in # is this really needed? @${REINPLACE_CMD} -e 's|const NetworkManager = imports.gi.NetworkManager;||g ;\ s|const NMClient = imports.gi.NMClient;||g' \ ${WRKSRC}/files${PREFIX}/share/cinnamon/applets/network\@cinnamon.org/applet.js @${REINPLACE_CMD} -e 's|nm-applet;||g' \ ${WRKSRC}/files${PREFIX}/share/cinnamon-session/sessions/cinnamon.session \ ${WRKSRC}/files${PREFIX}/share/cinnamon-session/sessions/cinnamon2d.session @${REINPLACE_CMD} -e '/prefix/s|/usr|${PREFIX}|g ; \ /datadir/s|/usr|${PREFIX}|g' \ ${WRKSRC}/files${PREFIX}/lib/cinnamon-menu-editor/cme/config.py @${FIND} ${WRKSRC} -name \* | ${XARGS} ${EGREP} -l "/usr/share/cinnamon/locale" | \ ${XARGS} ${REINPLACE_CMD} -e "s|/usr/share/cinnamon/locale|${PREFIX}/share/locale|g" @${FIND} ${WRKSRC} -name \* | ${XARGS} ${EGREP} -l "/usr/share" | \ ${XARGS} ${REINPLACE_CMD} -e "s|/usr/share|${PREFIX}/share|g" @${FIND} ${WRKSRC} -name \* | ${XARGS} ${EGREP} -l "/usr/lib" | \ ${XARGS} ${REINPLACE_CMD} -e "s|/usr/lib|${PREFIX}/lib|g" # The cs_user.py is not patched until we have the python-pam module @${REINPLACE_CMD} -e 's|"/usr/bin|"${PREFIX}/bin|g' \ ${WRKSRC}/files${PREFIX}/share/cinnamon/applets/menu@cinnamon.org/applet.js \ ${WRKSRC}/files${PREFIX}/share/cinnamon/applets/user@cinnamon.org/applet.js \ ${WRKSRC}/files${PREFIX}/lib/cinnamon-settings/bin/Spices.py \ # ${WRKSRC}/files${PREFIX}/lib/cinnamon-settings/modules/cs_user.py \ ${WRKSRC}/files${PREFIX}/lib/cinnamon-settings/modules/cs_screensaver.py \ ${WRKSRC}/files${PREFIX}/bin/cinnamon-settings \ ${WRKSRC}/files${PREFIX}/bin/cinnamon-launcher @${REINPLACE_CMD} -e '/cs-tablet/d; /cs-bluetooth/d; /cs-network/d' \ ${WRKSRC}/files${PREFIX}/lib/cinnamon-settings/cinnamon-settings.py @${REINPLACE_CMD} -e '/increase-opacity/d; /decrease-opacity/d' \ ${WRKSRC}/files${PREFIX}/lib/cinnamon-settings/modules/cs_keyboard.py #@${REINPLACE_CMD} -e 's/SIZE\/$$$$CONTEXT/CONTEXT\/$$$$SIZE/g' \ # ${WRKSRC}/data/icons/Makefile.am @${REINPLACE_CMD} -e 's|=/usr/bin/|=${PREFIX}/bin/|g' \ ${WRKSRC}/files${PREFIX}/share/xsessions/cinnamon2d.desktop \ ${WRKSRC}/files${PREFIX}/share/xsessions/cinnamon.desktop \ ${WRKSRC}/files${PREFIX}/share/applications/cinnamon2d.desktop - -# Some python files use #! /usr/bin/python (note the space between the bang and the python interpreter - @${FIND} ${WRKSRC} -name \* | ${XARGS} ${EGREP} -l "#!.*\/usr\/bin\/python" | \ - ${XARGS} ${REINPLACE_CMD} -e "s|#!.*python.*|#!/usr/bin/env python|g" - - @${FIND} ${WRKSRC} -name '*.orig' -delete - @${FIND} ${WRKSRC} -name '*.bak' -delete post-install: @${PYTHON_CMD} ${WRKSRC}/files/generate_desktop_files .include Index: branches/2019Q2/x11/cinnamon/distinfo =================================================================== --- branches/2019Q2/x11/cinnamon/distinfo (revision 505537) +++ branches/2019Q2/x11/cinnamon/distinfo (revision 505538) @@ -1,3 +1,3 @@ -TIMESTAMP = 1483466871 -SHA256 (gnome3/linuxmint-Cinnamon-2.4.6_GH0.tar.gz) = f0f8b0c56e8c6ee53daa06bea28c04967960eefed601db2f0ae745ca2abe78e1 -SIZE (gnome3/linuxmint-Cinnamon-2.4.6_GH0.tar.gz) = 2813177 +TIMESTAMP = 1559109478 +SHA256 (gnome3/linuxmint-cinnamon-2.4.6_GH0.tar.gz) = f265afa5546f16ba27a6715a5eca90336c0c7339f049eeeaf81238af03a5b338 +SIZE (gnome3/linuxmint-cinnamon-2.4.6_GH0.tar.gz) = 2813103 Index: branches/2019Q2/x11/cinnamon/files/patch-files_usr_lib_cinnamon-settings_bin_imtools.py =================================================================== --- branches/2019Q2/x11/cinnamon/files/patch-files_usr_lib_cinnamon-settings_bin_imtools.py (nonexistent) +++ branches/2019Q2/x11/cinnamon/files/patch-files_usr_lib_cinnamon-settings_bin_imtools.py (revision 505538) @@ -0,0 +1,60 @@ +From c843f3664064742e2672e0fea528571a882d84ad Mon Sep 17 00:00:00 2001 +From: Eli Schwartz +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. Property changes on: branches/2019Q2/x11/cinnamon/files/patch-files_usr_lib_cinnamon-settings_bin_imtools.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2019Q2 =================================================================== --- branches/2019Q2 (revision 505537) +++ branches/2019Q2 (revision 505538) Property changes on: branches/2019Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r502951