Revert "gnome-session 3.0.2"
authorYaakov Selkowitz <yselkowitz@users.sourceforge.net>
Mon, 30 May 2011 01:16:46 +0000 (20:16 -0500)
committerYaakov Selkowitz <yselkowitz@users.sourceforge.net>
Mon, 30 May 2011 01:16:46 +0000 (20:16 -0500)
This reverts commit ce384f49d34e1f745cc4b2126e65ad0c50d39599.

3.0.1-upower.patch [new file with mode: 0644]
gnome-session-3.0.1-1.cygport [moved from gnome-session-3.0.2-1.cygport with 78% similarity]
setup.hint

diff --git a/3.0.1-upower.patch b/3.0.1-upower.patch
new file mode 100644 (file)
index 0000000..4758c5f
--- /dev/null
@@ -0,0 +1,184 @@
+--- origsrc/gnome-session-3.0.1/configure.ac   2011-04-04 16:15:41.000000000 -0500
++++ src/gnome-session-3.0.1/configure.ac       2011-05-13 16:46:12.842482800 -0500
+@@ -56,10 +56,19 @@ PKG_CHECK_MODULES(GNOME_SESSION,
+         gio-2.0 >= $GLIB_REQUIRED
+         gtk+-3.0 >= $GTK3_REQUIRED
+         dbus-glib-1 >= $DBUS_GLIB_REQUIRED
+-        upower-glib >= $UPOWER_REQUIRED
+         librsvg-2.0
+ )
++PKG_CHECK_MODULES(UPOWER,
++        upower-glib >= $UPOWER_REQUIRED,
++        have_upower=true,
++        have_upower=false
++)
++
++if test "$have_upower" = true; then
++  AC_DEFINE(WITH_UPOWER, 1, [Set to 1 if upower-glib is available.])
++fi
++
+ PKG_CHECK_MODULES(SESSION_PROPERTIES,
+         glib-2.0 >= $GLIB_REQUIRED
+         gtk+-3.0 >= $GTK3_REQUIRED
+--- origsrc/gnome-session-3.0.1/gnome-session/gsm-logout-dialog.c      2011-03-22 15:31:43.000000000 -0500
++++ src/gnome-session-3.0.1/gnome-session/gsm-logout-dialog.c  2011-05-13 16:48:12.608396400 -0500
+@@ -27,7 +27,9 @@
+ #include <glib/gi18n.h>
+ #include <gtk/gtk.h>
++#ifdef WITH_UPOWER
+ #include <upower.h>
++#endif
+ #include "gsm-logout-dialog.h"
+ #include "gsm-consolekit.h"
+@@ -52,7 +54,9 @@ struct _GsmLogoutDialogPrivate
+ {
+         GsmDialogLogoutType  type;
++#ifdef WITH_UPOWER
+         UpClient            *up_client;
++#endif
+         GsmConsolekit       *consolekit;
+         int                  timeout;
+@@ -144,7 +148,9 @@ gsm_logout_dialog_init (GsmLogoutDialog
+         gtk_window_set_keep_above (GTK_WINDOW (logout_dialog), TRUE);
+         gtk_window_stick (GTK_WINDOW (logout_dialog));
++#ifdef WITH_UPOWER
+         logout_dialog->priv->up_client = up_client_new ();
++#endif
+         logout_dialog->priv->consolekit = gsm_get_consolekit ();
+@@ -168,10 +174,12 @@ gsm_logout_dialog_destroy (GsmLogoutDial
+                 logout_dialog->priv->timeout_id = 0;
+         }
++#ifdef WITH_UPOWER
+         if (logout_dialog->priv->up_client) {
+                 g_object_unref (logout_dialog->priv->up_client);
+                 logout_dialog->priv->up_client = NULL;
+         }
++#endif
+         if (logout_dialog->priv->consolekit) {
+                 g_object_unref (logout_dialog->priv->consolekit);
+@@ -184,13 +192,21 @@ gsm_logout_dialog_destroy (GsmLogoutDial
+ static gboolean
+ gsm_logout_supports_system_suspend (GsmLogoutDialog *logout_dialog)
+ {
++#ifdef WITH_UPOWER
+         return up_client_get_can_suspend (logout_dialog->priv->up_client);
++#else
++        return FALSE;
++#endif
+ }
+ static gboolean
+ gsm_logout_supports_system_hibernate (GsmLogoutDialog *logout_dialog)
+ {
++#ifdef WITH_UPOWER
+         return up_client_get_can_hibernate (logout_dialog->priv->up_client);
++#else
++        return FALSE;
++#endif
+ }
+ static gboolean
+--- origsrc/gnome-session-3.0.1/gnome-session/gsm-manager.c    2011-03-30 02:47:33.000000000 -0500
++++ src/gnome-session-3.0.1/gnome-session/gsm-manager.c        2011-05-13 16:53:38.163147400 -0500
+@@ -39,7 +39,9 @@
+ #include <dbus/dbus-glib-lowlevel.h>
+ #include <librsvg/rsvg.h>
++#ifdef WITH_UPOWER
+ #include <upower.h>
++#endif
+ #include <gtk/gtk.h> /* for logout dialog */
+@@ -153,8 +155,10 @@ struct GsmManagerPrivate
+         DBusGProxy             *bus_proxy;
+         DBusGConnection        *connection;
++#ifdef WITH_UPOWER
+         /* Interface with other parts of the system */
+         UpClient               *up_client;
++#endif
+         GsmShell               *shell;
+         guint                   shell_end_session_dialog_canceled_id;
+@@ -1096,6 +1100,7 @@ manager_perhaps_lock (GsmManager *manage
+ static void
+ manager_attempt_hibernate (GsmManager *manager)
+ {
++#ifdef WITH_UPOWER
+         gboolean  can_hibernate;
+         GError   *error;
+         gboolean  ret;
+@@ -1114,11 +1119,13 @@ manager_attempt_hibernate (GsmManager *m
+                         g_error_free (error);
+                 }
+         }
++#endif
+ }
+ static void
+ manager_attempt_suspend (GsmManager *manager)
+ {
++#ifdef WITH_UPOWER
+         gboolean  can_suspend;
+         GError   *error;
+         gboolean  ret;
+@@ -1137,6 +1144,7 @@ manager_attempt_suspend (GsmManager *man
+                         g_error_free (error);
+                 }
+         }
++#endif
+ }
+ static void
+@@ -2519,10 +2527,12 @@ gsm_manager_dispose (GObject *object)
+                 manager->priv->lockdown_settings = NULL;
+         }
++#ifdef WITH_UPOWER
+         if (manager->priv->up_client != NULL) {
+                 g_object_unref (manager->priv->up_client);
+                 manager->priv->up_client = NULL;
+         }
++#endif
+         if (manager->priv->shell != NULL) {
+                 g_object_unref (manager->priv->shell);
+@@ -2728,7 +2738,9 @@ gsm_manager_init (GsmManager *manager)
+                                       NULL,
+                                       NULL, NULL);
++#ifdef WITH_UPOWER
+         manager->priv->up_client = up_client_new ();
++#endif
+         manager->priv->shell = gsm_get_shell ();
+ }
+@@ -3329,13 +3341,15 @@ gsm_manager_can_shutdown (GsmManager *ma
+                           GError    **error)
+ {
+         GsmConsolekit *consolekit;
+-        gboolean can_suspend;
+-        gboolean can_hibernate;
++        gboolean can_suspend = FALSE;
++        gboolean can_hibernate = FALSE;
++#ifdef WITH_UPOWER
+         g_object_get (manager->priv->up_client,
+                       "can-suspend", &can_suspend,
+                       "can-hibernate", &can_hibernate,
+                       NULL);
++#endif
+         g_debug ("GsmManager: CanShutdown called");
similarity index 78%
rename from gnome-session-3.0.2-1.cygport
rename to gnome-session-3.0.1-1.cygport
index bb805b00a69f90e293ed77f70a03b72fa9a8c324..d2d56e3672aeeda219b5bec74b0d4b3ca4cc62d1 100644 (file)
@@ -2,6 +2,8 @@ inherit gnome2
 
 DESCRIPTION="GNOME session manager"
 
+PATCH_URI="3.0.1-upower.patch"
+
 DIFF_EXCLUDES="man"
 
 CYGCONF_ARGS="--libexecdir=/usr/lib/${PN}"
index 9958ec89c6d5ebf6bd57643b29639e2a3d84f54e..4a8ab183ac2642ed8cc7eb8292348cbc478eacf7 100644 (file)
@@ -1,5 +1,5 @@
 category: Gnome X11
-requires: GConf2 at-spi2-core libcairo2 libdbus-glib_1_2 libdbus1_3 libgconf2_4 libgdk_pixbuf2.0_0 libglib2.0_0 libGL1 libgtk3_0 libICE6 libintl8 libSM6 libupower-glib1 libX11_6 libXau6 libXcomposite1 libXext6 libXrender1 libXtst6 gnome-control-center gnome-desktop gnome-icon-theme gnome-panel gnome-settings-daemon metacity nautilus notification-daemon
+requires: GConf2 at-spi2-core libcairo2 libdbus-glib_1_2 libdbus1_3 libgconf2_4 libgdk_pixbuf2.0_0 libglib2.0_0 libGL1 libgtk3_0 libICE6 libintl8 libSM6 libX11_6 libXau6 libXcomposite1 libXext6 libXrender1 libXtst6 gnome-control-center gnome-desktop gnome-icon-theme gnome-panel gnome-settings-daemon metacity nautilus notification-daemon
 sdesc: "GNOME session manager"
 ldesc: "Contained here are--
    * the GNOME session manager
This page took 0.028106 seconds and 5 git commands to generate.