Update cinnamon to 2.2.3. Deal with the upower update to 0.99. Introduce

cinnamon-menus and mint-themes. Remove a lot of unused stuff in
misc/cinnamon-translations. Also try to remove deprecated stuff here and
there.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19573 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 19 insertions, 60 deletions

diff --git a/x11/cinnamon-session/Makefile b/x11/cinnamon-session/Makefile
index ab83f648d..c7642de9a 100644
--- a/x11/cinnamon-session/Makefile
+++ b/x11/cinnamon-session/Makefile
@@ -3,7 +3,7 @@
 #   $MCom$
 
 PORTNAME=	cinnamon-session
-PORTVERSION=	2.0.6
+PORTVERSION=	2.2.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/
 DIST_SUBDIR=	gnome3
@@ -15,7 +15,8 @@ BUILD_DEPENDS=	gnome-autogen.sh:${PORTSDIR}/devel/gnome-common
 LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
 		libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
 		libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib \
-		libupower-glib.so:${PORTSDIR}/sysutils/upower
+		libupower-glib.so:${PORTSDIR}/sysutils/upower \
+		libcanberra.so:${PORTSDIR}/audio/libcanberra
 RUN_DEPENDS=	${LOCALBASE}/sbin/console-kit-daemon:${PORTSDIR}/sysutils/consolekit \
 		${LOCALBASE}/bin/xdpyinfo:${PORTSDIR}/x11/xdpyinfo
 
diff --git a/x11/cinnamon-session/distinfo b/x11/cinnamon-session/distinfo
index 67571a0fe..360f0eb3d 100644
--- a/x11/cinnamon-session/distinfo
+++ b/x11/cinnamon-session/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/cinnamon-session-2.0.6.tar.xz) = 831a63f31bd5c0f5dcaee833d3e43e50e8c9d540cbe931e71b8e0f79ede14567
-SIZE (gnome3/cinnamon-session-2.0.6.tar.xz) = 897506
+SHA256 (gnome3/cinnamon-session-2.2.0.tar.xz) = b6ce4672a9b4fcd241c21a6b1921ff461e0c6e9fbeef4d4e9b1185785374ffae
+SIZE (gnome3/cinnamon-session-2.2.0.tar.xz) = 900954
diff --git a/x11/cinnamon-session/files/patch-cinnamon-session_csm-logout-dialog.c b/x11/cinnamon-session/files/patch-cinnamon-session_csm-logout-dialog.c
index 05a0ad9e2..6857daee2 100644
--- a/x11/cinnamon-session/files/patch-cinnamon-session_csm-logout-dialog.c
+++ b/x11/cinnamon-session/files/patch-cinnamon-session_csm-logout-dialog.c
@@ -1,45 +1,20 @@
---- cinnamon-session/csm-logout-dialog.c.orig	2013-11-22 10:57:50.000000000 +0000
-+++ cinnamon-session/csm-logout-dialog.c	2014-04-03 10:33:35.297012436 +0000
-@@ -176,13 +176,21 @@
- static gboolean
- csm_logout_supports_system_suspend (CsmLogoutDialog *logout_dialog)
- {
-+#ifdef HAVE_OLD_UPOWER
-         return ( csm_system_can_suspend (logout_dialog->priv->system) || up_client_get_can_suspend (logout_dialog->priv->up_client) );
+--- cinnamon-session/csm-logout-dialog.c.orig	2014-04-12 10:25:22.000000000 +0000
++++ cinnamon-session/csm-logout-dialog.c	2014-04-24 08:07:46.179191996 +0000
+@@ -188,6 +188,8 @@
+         return csm_system_can_suspend (logout_dialog->priv->system);
+ #elif defined(HAVE_OLD_UPOWER)
+         return up_client_get_can_suspend (logout_dialog->priv->up_client);
 +#else
-+        return ( csm_system_can_suspend (logout_dialog->priv->system) || FALSE );
-+#endif
++	return FALSE;	
+ #endif
  }
  
- static gboolean
- csm_logout_supports_system_hibernate (CsmLogoutDialog *logout_dialog)
- {
-+#ifdef HAVE_OLD_UPOWER
-         return ( csm_system_can_hibernate (logout_dialog->priv->system) || up_client_get_can_hibernate (logout_dialog->priv->up_client) );
+@@ -198,6 +200,8 @@
+         return csm_system_can_hibernate (logout_dialog->priv->system);
+ #elif defined(HAVE_OLD_UPOWER)
+         return up_client_get_can_hibernate (logout_dialog->priv->up_client);
 +#else
-+        return ( csm_system_can_hibernate (logout_dialog->priv->system) || FALSE );
-+#endif	
++	return FALSE;	
+ #endif
  }
  
- static gboolean
-@@ -308,11 +316,20 @@
- 		secondary_text = g_strdup (seconds_warning);
- 	}
- 
-+#ifdef __clang__
-+#pragma clang diagnostic push
-+#pragma clang diagnostic ignored "-Wformat-nonliteral"
-+#endif
-+
-         gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (logout_dialog),
-                                                   secondary_text,
-                                                   seconds_to_show,
-                                                   NULL);
- 
-+#ifdef __clang__
-+#pragma clang diagnostic pop
-+#endif
-+
-         logout_dialog->priv->timeout--;
- 
-         g_free (secondary_text);
diff --git a/x11/cinnamon-session/files/patch-configure.ac b/x11/cinnamon-session/files/patch-configure.ac
deleted file mode 100644
index e4eff67f1..000000000
--- a/x11/cinnamon-session/files/patch-configure.ac
+++ /dev/null
@@ -1,17 +0,0 @@
---- configure.ac.orig	2014-04-03 10:17:42.338695284 +0000
-+++ configure.ac	2014-04-03 10:17:53.064698929 +0000
-@@ -56,6 +56,14 @@
-         json-glib-1.0 >= $JSON_GLIB_REQUIRED
- )
- 
-+dnl We can only support old upower
-+dnl https://bugzilla.gnome.org/show_bug.cgi?id=710383
-+PKG_CHECK_MODULES(UPOWER, upower-glib < 0.99.0, have_old_upower=yes, have_old_upower=no)
-+AS_IF([test x$have_old_upower = xyes], [
-+  AC_DEFINE([HAVE_OLD_UPOWER], [1], [Define if we have an older upower])
-+])
-+AM_CONDITIONAL(HAVE_OLD_UPOWER, test x$have_old_upower = xyes)
-+
- PKG_CHECK_MODULES(SESSION_PROPERTIES,
-         glib-2.0 >= $GLIB_REQUIRED
-         gtk+-3.0 >= $GTK3_REQUIRED