Update cinnamon to 2.4, this should fix [1] and [2].

Update totem to 3.14 now that we have gstreamer 1.4 and minor gnome updates.
Update evolution suite to 3.12.9.
Make sure gtk30 pulls in adwait-icon-theme, since it now the default theme [3].

PR:		195290 [1], 195289 [2], 195455 [3]
Obtained from:	gnome devel repo

5 files changed, 4 insertions, 56 deletions

diff --git a/x11/cinnamon-screensaver/Makefile b/x11/cinnamon-screensaver/Makefile
index f34d293f4f6d..be32869c514c 100644
--- a/x11/cinnamon-screensaver/Makefile
+++ b/x11/cinnamon-screensaver/Makefile
@@ -1,9 +1,8 @@
 # Created by: Gustau Perez i Querol <gustau.perez@gmail.com>
 # $FreeBSD$
-#   $MCom: ports/trunk/x11/cinnamon-screensaver/Makefile 20008 2014-10-21 15:13:35Z gusi $
 
 PORTNAME=	cinnamon-screensaver
-PORTVERSION=	2.2.4
+PORTVERSION=	2.4.0
 MASTER_SITES=	http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/
 CATEGORIES=	x11 gnome
 DIST_SUBDIR=	gnome3
@@ -26,6 +25,7 @@ USE_GNOME=	gnomedesktop3 gnomeprefix intlhack intlhack libgnomekbd libxml2
 GNU_CONFIGURE=	yes
 PATHFIX_MAKEFILEIN=	Makefile.am
 CPPFLAGS+=	-I${LOCALBASE}/include
+CFLAGS=		-I${LOCALBASE}/include -Wno-error=format-nonliteral
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-pam-prefix=${PREFIX}/etc/pam.d \
 		--without-systemd
diff --git a/x11/cinnamon-screensaver/distinfo b/x11/cinnamon-screensaver/distinfo
index 265db4affd51..7777972fb414 100644
--- a/x11/cinnamon-screensaver/distinfo
+++ b/x11/cinnamon-screensaver/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/cinnamon-screensaver-2.2.4.tar.xz) = 5fed9a7504856dc362390e3f020b5faa5b4e9a2b4dd09b0e87c04ee18bd40bfa
-SIZE (gnome3/cinnamon-screensaver-2.2.4.tar.xz) = 141772
+SHA256 (gnome3/cinnamon-screensaver-2.4.0.tar.xz) = fc3a4a1ea9c15db7c5c9fa0fce5e6cf60215778e19c96a19f202ab2afbb9aad8
+SIZE (gnome3/cinnamon-screensaver-2.4.0.tar.xz) = 142214
diff --git a/x11/cinnamon-screensaver/files/patch-src_gs-debug.c b/x11/cinnamon-screensaver/files/patch-src_gs-debug.c
deleted file mode 100644
index d4d5dcc90048..000000000000
--- a/x11/cinnamon-screensaver/files/patch-src_gs-debug.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/gs-debug.c.orig	2013-11-25 08:35:36.406973707 +0000
-+++ src/gs-debug.c	2013-11-25 08:37:07.941451522 +0000
-@@ -57,8 +57,17 @@
- 
-         va_start (args, format);
- 
-+#ifdef __clang__
-+#pragma clang diagnostic push
-+#pragma clang diagnostic ignored "-Wformat-nonliteral"
-+#endif
-+
-         g_vsnprintf (buffer, 1024, format, args);
- 
-+#ifdef __clang__
-+#pragma clang diagnostic pop
-+#endif
-+
-         va_end (args);
- 
-         time (&the_time);
diff --git a/x11/cinnamon-screensaver/files/patch-src_gs-fade.c b/x11/cinnamon-screensaver/files/patch-src_gs-fade.c
deleted file mode 100644
index bb554c4f274e..000000000000
--- a/x11/cinnamon-screensaver/files/patch-src_gs-fade.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gs-fade.c.orig	2013-11-25 08:42:45.005944760 +0000
-+++ src/gs-fade.c	2013-11-25 08:43:11.449942142 +0000
-@@ -420,7 +420,7 @@
- 
- #ifdef HAVE_XF86VMODE_GAMMA
- 	if (g_getenv("LTSP_CLIENT")) {
--		return FADE_TYPE_NONE;  /* We're on an LTSP Client, bad idea to fade at all */
-+		return;
- 	}
- 
-         res = XF86VidModeQueryExtension (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &event, &error);
diff --git a/x11/cinnamon-screensaver/files/patch-src_gs-listener-dbus.c b/x11/cinnamon-screensaver/files/patch-src_gs-listener-dbus.c
deleted file mode 100644
index e154472a84c7..000000000000
--- a/x11/cinnamon-screensaver/files/patch-src_gs-listener-dbus.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/gs-listener-dbus.c.orig	2013-11-25 08:35:49.853972866 +0000
-+++ src/gs-listener-dbus.c	2013-11-25 08:38:02.592963642 +0000
-@@ -359,7 +359,18 @@
- 
-         va_list args;
-         va_start (args, format);
-+
-+#ifdef __clang__
-+#pragma clang diagnostic push
-+#pragma clang diagnostic ignored "-Wformat-nonliteral"
-+#endif
-+
-         vsnprintf (buf, sizeof (buf), format, args);
-+
-+#ifdef __clang__
-+#pragma clang diagnostic pop
-+#endif
-+
-         va_end (args);
- 
-         gs_debug (buf);