From 9c281a0d13e11f3a43378df5cc65b7e85ab49a0f Mon Sep 17 00:00:00 2001 From: kwm Date: Tue, 22 Sep 2009 09:18:36 +0000 Subject: Update to 2.28.0. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@12964 df743ca5-7f9a-e211-a948-0013205c9059 --- x11/gnome-session/Makefile | 4 +- x11/gnome-session/distinfo | 6 +-- .../files/patch-gnome-session_gsm-manager.c | 52 +++++++++++++--------- x11/gnome-session/pkg-plist | 3 ++ 4 files changed, 39 insertions(+), 26 deletions(-) (limited to 'x11/gnome-session') diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile index 50b2e7292..fc4290c8d 100644 --- a/x11/gnome-session/Makefile +++ b/x11/gnome-session/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/x11/gnome-session/Makefile,v 1.173 2009/08/26 19:02:27 marcus Exp $ +# $MCom: ports/x11/gnome-session/Makefile,v 1.174 2009/09/09 05:39:02 marcus Exp $ # PORTNAME= gnome-session -PORTVERSION= 2.27.92 +PORTVERSION= 2.28.0 CATEGORIES= x11 gnome MASTER_SITES= GNOME \ http://www.marcuscom.com/downloads/:local diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo index e24de5535..7870703d6 100644 --- a/x11/gnome-session/distinfo +++ b/x11/gnome-session/distinfo @@ -1,6 +1,6 @@ -MD5 (gnome2/gnome-session-2.27.92.tar.bz2) = 605bc85419577ffda87170f79bc850d4 -SHA256 (gnome2/gnome-session-2.27.92.tar.bz2) = 10c119de4c2f95885252a357f457386eff3ebb72df98cc52ab0235f10d5e9898 -SIZE (gnome2/gnome-session-2.27.92.tar.bz2) = 822389 +MD5 (gnome2/gnome-session-2.28.0.tar.bz2) = b1a2307b02e833010d6c5312b9ff9048 +SHA256 (gnome2/gnome-session-2.28.0.tar.bz2) = 83e89a04fb090f1a1f6b609bdc39f1e69390269b885b7da6b32e980f4e765c0c +SIZE (gnome2/gnome-session-2.28.0.tar.bz2) = 822009 MD5 (gnome2/freebsd-splashes-gnome-2.18_1.tar) = 80eb8c52fcf9fe977e0bf8ed48b85fe5 SHA256 (gnome2/freebsd-splashes-gnome-2.18_1.tar) = fcca0f6eb759a4ef0211ecd61340f84ce8ad4d7493f725ac8613724faadbb508 SIZE (gnome2/freebsd-splashes-gnome-2.18_1.tar) = 1630720 diff --git a/x11/gnome-session/files/patch-gnome-session_gsm-manager.c b/x11/gnome-session/files/patch-gnome-session_gsm-manager.c index c55565aeb..befa415d9 100644 --- a/x11/gnome-session/files/patch-gnome-session_gsm-manager.c +++ b/x11/gnome-session/files/patch-gnome-session_gsm-manager.c @@ -1,5 +1,5 @@ ---- gnome-session/gsm-manager.c.orig 2009-07-28 21:51:22.000000000 -0400 -+++ gnome-session/gsm-manager.c 2009-08-26 14:54:08.000000000 -0400 +--- gnome-session/gsm-manager.c.orig 2009-09-18 18:36:04.000000000 +0200 ++++ gnome-session/gsm-manager.c 2009-09-22 11:12:05.000000000 +0200 @@ -38,8 +38,6 @@ #include #include @@ -17,7 +17,7 @@ #include "gsm-session-save.h" #define GSM_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_MANAGER, GsmManagerPrivate)) -@@ -131,9 +130,6 @@ struct GsmManagerPrivate +@@ -133,9 +132,6 @@ struct GsmManagerPrivate DBusGProxy *bus_proxy; DBusGConnection *connection; @@ -27,34 +27,39 @@ }; enum { -@@ -927,47 +923,29 @@ manager_switch_user (GsmManager *manager +@@ -971,53 +967,29 @@ manager_perhaps_lock (GsmManager *manage static void manager_attempt_hibernate (GsmManager *manager) { - gboolean can_hibernate; - GError *error; - gboolean ret; -+ GsmPowerManager *power_manager; ++ GsmPowerManager *power_manager; - g_object_get (manager->priv->dkp_client, - "can-hibernate", &can_hibernate, - NULL); - - if (can_hibernate) { +- +- /* lock the screen before we suspend */ +- manager_perhaps_lock (manager); +- - error = NULL; - ret = dkp_client_hibernate (manager->priv->dkp_client, &error); -+ power_manager = gsm_get_power_manager (); - - if (!ret) { - g_warning ("Unexpected hibernate failure: %s", - error->message); - g_error_free (error); - } -+ if (gsm_power_manager_can_hibernate (power_manager)) { -+ gsm_power_manager_attempt_hibernate (power_manager); - } +- } ++ power_manager = gsm_get_power_manager (); + -+ g_object_unref (power_manager); ++ if (gsm_power_manager_can_hibernate (power_manager)) { ++ gsm_power_manager_attempt_hibernate (power_manager); ++ } ++ ++ g_object_unref (power_manager); } static void @@ -63,31 +68,36 @@ - gboolean can_suspend; - GError *error; - gboolean ret; -+ GsmPowerManager *power_manager; ++ GsmPowerManager *power_manager; - g_object_get (manager->priv->dkp_client, - "can-suspend", &can_suspend, - NULL); - - if (can_suspend) { +- +- /* lock the screen before we suspend */ +- manager_perhaps_lock (manager); +- - error = NULL; - ret = dkp_client_suspend (manager->priv->dkp_client, &error); -+ power_manager = gsm_get_power_manager (); - - if (!ret) { - g_warning ("Unexpected suspend failure: %s", - error->message); - g_error_free (error); - } -+ if (gsm_power_manager_can_suspend (power_manager)) { -+ gsm_power_manager_attempt_suspend (power_manager); - } +- } ++ power_manager = gsm_get_power_manager (); + -+ g_object_unref (power_manager); ++ if (gsm_power_manager_can_suspend (power_manager)) { ++ gsm_power_manager_attempt_suspend (power_manager); ++ } ++ ++ g_object_unref (power_manager); } static void -@@ -2140,11 +2118,6 @@ gsm_manager_dispose (GObject *object) +@@ -2190,11 +2162,6 @@ gsm_manager_dispose (GObject *object) manager->priv->gconf_client = NULL; } @@ -99,7 +109,7 @@ G_OBJECT_CLASS (gsm_manager_parent_class)->dispose (object); } -@@ -2373,8 +2346,6 @@ gsm_manager_init (GsmManager *manager) +@@ -2423,8 +2390,6 @@ gsm_manager_init (GsmManager *manager) G_CALLBACK (on_presence_status_changed), manager); @@ -108,7 +118,7 @@ /* GConf setup */ gconf_client_add_dir (manager->priv->gconf_client, KEY_DESKTOP_DIR, -@@ -2894,24 +2865,20 @@ gsm_manager_can_shutdown (GsmManager *ma +@@ -2944,24 +2909,20 @@ gsm_manager_can_shutdown (GsmManager *ma GError **error) { GsmConsolekit *consolekit; diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist index 6245d7b18..306533fcb 100644 --- a/x11/gnome-session/pkg-plist +++ b/x11/gnome-session/pkg-plist @@ -67,6 +67,7 @@ share/locale/ko/LC_MESSAGES/gnome-session-2.0.mo share/locale/ku/LC_MESSAGES/gnome-session-2.0.mo share/locale/lt/LC_MESSAGES/gnome-session-2.0.mo share/locale/lv/LC_MESSAGES/gnome-session-2.0.mo +share/locale/mai/LC_MESSAGES/gnome-session-2.0.mo share/locale/mg/LC_MESSAGES/gnome-session-2.0.mo share/locale/mi/LC_MESSAGES/gnome-session-2.0.mo share/locale/mk/LC_MESSAGES/gnome-session-2.0.mo @@ -169,6 +170,8 @@ share/xsessions/gnome.desktop @dirrmtry share/locale/mi @dirrmtry share/locale/mg/LC_MESSAGES @dirrmtry share/locale/mg +@dirrmtry share/locale/mai/LC_MESSAGES +@dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku @dirrmtry share/locale/ig/LC_MESSAGES -- cgit v1.2.3