gnome-session 3.6.2
authorYaakov Selkowitz <yselkowitz@users.sourceforge.net>
Thu, 20 Dec 2012 01:52:28 +0000 (19:52 -0600)
committerYaakov Selkowitz <yselkowitz@users.sourceforge.net>
Thu, 20 Dec 2012 01:52:28 +0000 (19:52 -0600)
3.6.2-upower.patch [moved from 3.0.1-upower.patch with 55% similarity]
README [deleted file]
gnome-session-3.4.2-1.cygport [deleted file]
gnome-session.cygport [new file with mode: 0644]
setup.hint [deleted file]

similarity index 55%
rename from 3.0.1-upower.patch
rename to 3.6.2-upower.patch
index 8c97da8ae4b93eaebffb6eafd366245f26c09c94..46a430ac788161abc47b66b340ebe3f8622ca0df 100644 (file)
  }
  
  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 @@
+--- origsrc/gnome-session-3.6.2/gnome-session/gsm-consolekit.c 2012-11-12 17:32:21.000000000 -0600
++++ src/gnome-session-3.6.2/gnome-session/gsm-consolekit.c     2012-12-19 19:48:14.730872800 -0600
+@@ -31,7 +31,9 @@
+ #include <dbus/dbus-glib.h>
  #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;
+ #include "gsm-system.h"
+ #include "gsm-consolekit.h"
+@@ -55,7 +57,9 @@ struct _GsmConsolekitPrivate
+         DBusGConnection *dbus_connection;
+         DBusGProxy      *bus_proxy;
+         DBusGProxy      *ck_proxy;
 +#ifdef WITH_UPOWER
-         /* Interface with other parts of the system */
-         UpClient               *up_client;
+         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)
+ static void     gsm_consolekit_class_init   (GsmConsolekitClass *klass);
+@@ -214,6 +218,7 @@ gsm_consolekit_on_name_owner_changed (DB
+                                       const char    *new_owner,
+                                       GsmConsolekit *manager)
  {
 +#ifdef WITH_UPOWER
-         gboolean  can_hibernate;
-         GError   *error;
-         gboolean  ret;
-@@ -1114,11 +1119,13 @@ manager_attempt_hibernate (GsmManager *m
-                         g_error_free (error);
-                 }
+         if (name != NULL && strcmp (name, "org.freedesktop.ConsoleKit") != 0) {
+                 return;
          }
+@@ -223,7 +228,7 @@ gsm_consolekit_on_name_owner_changed (DB
+         gsm_consolekit_ensure_ck_connection (manager, NULL);
+         manager->priv->up_client = up_client_new ();
+-
 +#endif
  }
  
  static void
- manager_attempt_suspend (GsmManager *manager)
+@@ -247,7 +252,9 @@ gsm_consolekit_free_dbus (GsmConsolekit
  {
+         g_clear_object (&manager->priv->bus_proxy);
+         g_clear_object (&manager->priv->ck_proxy);
 +#ifdef WITH_UPOWER
-         gboolean  can_suspend;
-         GError   *error;
-         gboolean  ret;
-@@ -1137,6 +1144,7 @@ manager_attempt_suspend (GsmManager *man
-                         g_error_free (error);
-                 }
-         }
+         g_clear_object (&manager->priv->up_client);
 +#endif
- }
- static void
-@@ -2519,10 +2527,12 @@ gsm_manager_dispose (GObject *object)
-                 manager->priv->lockdown_settings = NULL;
-         }
  
+         if (manager->priv->dbus_connection != NULL) {
+                 DBusConnection *connection;
+@@ -814,22 +821,31 @@ gsm_consolekit_is_login_session (GsmSyst
+ static gboolean
+ gsm_consolekit_can_suspend (GsmSystem *system)
+ {
 +#ifdef WITH_UPOWER
-         if (manager->priv->up_client != NULL) {
-                 g_object_unref (manager->priv->up_client);
-                 manager->priv->up_client = NULL;
-         }
-+#endif
+         GsmConsolekit *consolekit = GSM_CONSOLEKIT (system);
  
-         if (manager->priv->shell != NULL) {
-                 g_object_unref (manager->priv->shell);
-@@ -2728,7 +2738,9 @@ gsm_manager_init (GsmManager *manager)
-                                       NULL,
-                                       NULL, NULL);
+         return up_client_get_can_suspend (consolekit->priv->up_client);
++#else
++        return FALSE;
++#endif
+ }
  
+ static gboolean
+ gsm_consolekit_can_hibernate (GsmSystem *system)
+ {
 +#ifdef WITH_UPOWER
-         manager->priv->up_client = up_client_new ();
-+#endif
+         GsmConsolekit *consolekit = GSM_CONSOLEKIT (system);
  
-         manager->priv->shell = gsm_get_shell ();
+         return up_client_get_can_hibernate (consolekit->priv->up_client);
++#else
++        return FALSE;
++#endif
  }
-@@ -3329,13 +3341,15 @@ gsm_manager_can_shutdown (GsmManager *ma
-                           GError    **error)
- {
-         GsmSystem *system;
--        gboolean can_suspend;
--        gboolean can_hibernate;
-+        gboolean can_suspend = FALSE;
-+        gboolean can_hibernate = FALSE;
  
+ static void
+ gsm_consolekit_suspend (GsmSystem *system)
+ {
 +#ifdef WITH_UPOWER
-         g_object_get (manager->priv->up_client,
-                       "can-suspend", &can_suspend,
-                       "can-hibernate", &can_hibernate,
-                       NULL);
+         GsmConsolekit *consolekit = GSM_CONSOLEKIT (system);
+         GError *error = NULL;
+         gboolean ret;
+@@ -839,11 +855,13 @@ gsm_consolekit_suspend (GsmSystem *syste
+                 g_warning ("Unexpected suspend failure: %s", error->message);
+                 g_error_free (error);
+         }
 +#endif
+ }
  
-         g_debug ("GsmManager: CanShutdown called");
+ static void
+ gsm_consolekit_hibernate (GsmSystem *system)
+ {
++#ifdef WITH_UPOWER
+         GsmConsolekit *consolekit = GSM_CONSOLEKIT (system);
+         GError *error = NULL;
+         gboolean ret;
+@@ -853,6 +871,7 @@ gsm_consolekit_hibernate (GsmSystem *sys
+                 g_warning ("Unexpected hibernate failure: %s", error->message);
+                 g_error_free (error);
+         }
++#endif
+ }
  
+ static void
diff --git a/README b/README
deleted file mode 100644 (file)
index 851c474..0000000
--- a/README
+++ /dev/null
@@ -1,94 +0,0 @@
-gnome-session
--------------------------------------------
-Contained here are:
-   * the GNOME session manager
-   * the GNOME session manager configuration program
-     and several other session management related
-     utilities.
-
-In order to start the GNOME desktop, you'll need at a minimum:
-  esound
-  gnome-control-center
-  gnome-desktop
-  gnome-panel
-  gnome-settings-daemon
-  metacity
-  nautilus
-  xscreensaver
-
-Then run /usr/bin/startgnome to start the X server and GNOME Desktop.
-Any arguments to startgnome will be passed to xinit, for example:
-
-       startgnome -clipboard -nodecoration -unixkill
-
-Runtime requirements:
-  cygwin-1.7.0-62
-  libdbus-glib_1_2-0.80-10
-  libdbus1_3-1.2.16-1
-  libgcc1-4.3.4-1
-  libgconf2_4-2.28.0-1
-  libgdk_pixbuf2.0_0-2.18.3-1
-  libglib2.0_0-2.22.2-1
-  libgtk2.0_0-2.18.3-1
-  libICE6-1.0.6-1
-  libintl8-0.17-11
-  libpango1.0_0-1.26.0-1
-  libSM6-1.1.1-1
-  libstartup-notification1_0-0.10-1
-  libX11_6-1.3.2-1
-  libXau6-1.0.5-1
-  libXext6-1.1.1-1
-  libXrender1-0.9.5-1
-  libXtst6-1.1.0-1
-
-Build requirements:
-(besides corresponding -devel packages)
-  autoconf2.5-2.63-10
-  automake1.11-1.11-10
-  binutils-2.19.51-1
-  cygport-0.9.10-1
-  gawk-3.1.7-1
-  gcc4-core-4.3.4-1
-  gettext-devel-0.17-11
-  gnome-common-2.28.0-1
-  intltool-0.40.6-1
-  libtool-2.2.7a-14
-  make-3.81-2
-  pkg-config-0.23b-10
-  sed-4.1.5-2
-
-Canonical homepage:
-  http://www.gnome.org/
-
-Canonical download:
-  ftp://ftp.gnome.org/pub/GNOME/sources/gnome-session/
-
--------------------------------------------
-
-Build instructions:
-  unpack gnome-session-2.28.0-1-src.tar.bz2
-    if you use setup to install this src package, it will be
-        unpacked under /usr/src automatically
-  cd /usr/src
-  cygport ./gnome-session-2.28.0-1.cygport all
-
-This will create:
-  /usr/src/gnome-session-2.28.0-1-src.tar.bz2
-  /usr/src/gnome-session-2.28.0-1.tar.bz2
-
--------------------------------------------
-
-Port Notes:
-
------ version 2.28.0-1 -----
-Version bump for GNOME 2.28.
-
------ version 2.26.2-1 -----
-Version bump.
-
------ version 2.26.1-1 -----
-Initial release of GNOME 2.26 for Cygwin 1.7.
-
-
-Cygwin port maintained by:
-http://sourceware.org/cygwinports/
diff --git a/gnome-session-3.4.2-1.cygport b/gnome-session-3.4.2-1.cygport
deleted file mode 100644 (file)
index 3a6ae18..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-inherit gnome2
-
-DESCRIPTION="GNOME session manager"
-
-PATCH_URI="3.0.1-upower.patch
-           3.4.1-llvmpipe.patch"
-
-DIFF_EXCLUDES="man"
-
-CYGCONF_ARGS="--libexecdir=/usr/lib/${PN}"
diff --git a/gnome-session.cygport b/gnome-session.cygport
new file mode 100644 (file)
index 0000000..800d70d
--- /dev/null
@@ -0,0 +1,18 @@
+inherit gnome2
+
+NAME="gnome-session"
+VERSION=3.6.2
+RELEASE=1
+CATEGORY="GNOME"
+SUMMARY="GNOME session manager"
+DESCRIPTION="Contained here are the GNOME session manager, the GNOME session
+manager configuration program, and several other session management related
+utilities."
+REQUIRES="at-spi2-core eog evince file-roller gcalctool gedit gnome-applets gnome-control-center gnome-desktop gnome-keyring gnome-panel gnome-settings-daemon gnome-terminal metacity nautilus notification-daemon run xdg-user-dirs-gtk xinit"
+
+PATCH_URI="3.6.2-upower.patch
+           3.4.1-llvmpipe.patch"
+
+DIFF_EXCLUDES="man"
+
+CYGCONF_ARGS="--libexecdir=/usr/lib/${PN}"
diff --git a/setup.hint b/setup.hint
deleted file mode 100644 (file)
index 4eaf0e4..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-category: Gnome X11
-requires: cygutils dbus 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 libjson-glib1.0_0 libSM6 libX11_6 libXau6 libXcomposite1 libXext6 libXrender1 libXtst6 eog evince file-roller gcalctool gedit gnome-applets gnome-control-center gnome-desktop gnome-keyring gnome-panel gnome-settings-daemon gnome-terminal metacity nautilus notification-daemon run xdg-user-dirs-gtk xinit
-sdesc: "GNOME session manager"
-ldesc: "Contained here are--
-   * the GNOME session manager
-   * the GNOME session manager configuration program
-     and several other session management related
-     utilities."
This page took 0.030019 seconds and 5 git commands to generate.