gnome-session 3.8.4
authorYaakov Selkowitz <yselkowitz@users.sourceforge.net>
Fri, 9 Aug 2013 07:50:24 +0000 (02:50 -0500)
committerYaakov Selkowitz <yselkowitz@users.sourceforge.net>
Fri, 9 Aug 2013 07:50:24 +0000 (02:50 -0500)
3.4.1-llvmpipe.patch [deleted file]
3.8.4-gnome-fallback.patch [new file with mode: 0644]
3.8.4-without-upower.patch [moved from 3.6.2-upower.patch with 62% similarity]
gnome-session.cygport

diff --git a/3.4.1-llvmpipe.patch b/3.4.1-llvmpipe.patch
deleted file mode 100644 (file)
index 522653b..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
---- origsrc/gnome-session-3.4.1/data/hardware-compatibility    2011-12-19 03:47:16.000000000 -0600
-+++ src/gnome-session-3.4.1/data/hardware-compatibility        2012-05-08 00:45:35.923865100 -0500
-@@ -24,4 +24,3 @@
- # Gallium has softpipe and llvmpipe
- -softpipe
---llvmpipe
diff --git a/3.8.4-gnome-fallback.patch b/3.8.4-gnome-fallback.patch
new file mode 100644 (file)
index 0000000..5eaeefb
--- /dev/null
@@ -0,0 +1,40 @@
+--- origsrc/gnome-session-3.8.4/data/Makefile.am       2013-07-30 14:01:01.000000000 -0500
++++ src/gnome-session-3.8.4/data/Makefile.am   2013-08-09 01:53:32.159920000 -0500
+@@ -26,7 +26,7 @@ desktop_in_files = session-properties.de
+ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ sessiondir = $(datadir)/gnome-session/sessions
+-session_in_in_files = gnome.session.desktop.in.in gnome-dummy.session.desktop.in.in
++session_in_in_files = gnome.session.desktop.in.in gnome-dummy.session.desktop.in.in gnome-fallback.session.desktop.in.in
+ session_in_files = $(session_in_in_files:.session.desktop.in.in=.session.desktop.in)
+ session_DATA = $(session_in_files:.session.desktop.in=.session)
+--- origsrc/gnome-session-3.8.4/data/gnome-fallback.session.desktop.in.in      1969-12-31 18:00:00.000000000 -0600
++++ src/gnome-session-3.8.4/data/gnome-fallback.session.desktop.in.in  2013-08-09 01:54:32.080347300 -0500
+@@ -0,0 +1,3 @@
++[GNOME Session]
++_Name=GNOME fallback
++RequiredComponents=gnome-panel;gnome-settings-daemon;metacity;notification-daemon;
+--- origsrc/gnome-session-3.8.4/data/gnome.session.desktop.in.in       2013-03-05 21:32:29.000000000 -0600
++++ src/gnome-session-3.8.4/data/gnome.session.desktop.in.in   2013-08-09 01:52:24.316039600 -0500
+@@ -1,3 +1,4 @@
+ [GNOME Session]
+ _Name=GNOME
+ RequiredComponents=gnome-shell;gnome-settings-daemon;
++FallbackSession=gnome-fallback
+--- origsrc/gnome-session-3.8.4/gnome-session/main.c   2013-07-30 14:11:51.000000000 -0500
++++ src/gnome-session-3.8.4/gnome-session/main.c       2013-08-09 02:06:54.800828500 -0500
+@@ -350,11 +350,13 @@ main (int argc, char **argv)
+         }
+ #endif
++#ifndef __CYGWIN__
+         if (gl_failed) {
+                 gsm_fail_whale_dialog_we_failed (FALSE, TRUE, NULL);
+                 gtk_main ();
+                 exit (1);
+         }
++#endif
+         if (please_fail) {
+                 gsm_fail_whale_dialog_we_failed (TRUE, TRUE, NULL);
similarity index 62%
rename from 3.6.2-upower.patch
rename to 3.8.4-without-upower.patch
index 46a430ac788161abc47b66b340ebe3f8622ca0df..c8700018f0e91c951d355aca68b62d07d0499e5a 100644 (file)
@@ -1,11 +1,12 @@
---- 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,
+--- origsrc/gnome-session-3.8.4/configure.ac   2013-07-30 14:11:51.000000000 -0500
++++ src/gnome-session-3.8.4/configure.ac       2013-08-09 01:32:25.776487100 -0500
+@@ -65,11 +65,21 @@ 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
          json-glib-1.0 >= $JSON_GLIB_REQUIRED
+         gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED
  )
  
 +PKG_CHECK_MODULES(UPOWER,
 +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
-         GsmSystem           *system;
-         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.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 @@
+--- origsrc/gnome-session-3.8.4/gnome-session/gsm-consolekit.c 2013-07-30 14:11:51.000000000 -0500
++++ src/gnome-session-3.8.4/gnome-session/gsm-consolekit.c     2013-08-09 01:36:19.047829400 -0500
+@@ -31,8 +31,10 @@
  #include <dbus/dbus-glib.h>
  #include <dbus/dbus-glib-lowlevel.h>
  
 +#ifdef WITH_UPOWER
+ #define UPOWER_ENABLE_DEPRECATED 1
  #include <upower.h>
 +#endif
  
  #include "gsm-system.h"
  #include "gsm-consolekit.h"
-@@ -55,7 +57,9 @@ struct _GsmConsolekitPrivate
-         DBusGConnection *dbus_connection;
+@@ -56,7 +58,9 @@ struct _GsmConsolekitPrivate
          DBusGProxy      *bus_proxy;
          DBusGProxy      *ck_proxy;
+         DBusGProxy      *session_proxy;
 +#ifdef WITH_UPOWER
          UpClient        *up_client;
 +#endif
- };
  
- 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
-         if (name != NULL && strcmp (name, "org.freedesktop.ConsoleKit") != 0) {
-                 return;
+         gboolean         is_active;
+         gboolean         restarting;
+@@ -306,8 +310,10 @@ gsm_consolekit_ensure_ck_connection (Gsm
+                                              G_CALLBACK (on_active_changed), manager, NULL);
          }
-@@ -223,7 +228,7 @@ gsm_consolekit_on_name_owner_changed (DB
  
-         gsm_consolekit_ensure_ck_connection (manager, NULL);
++#ifdef WITH_UPOWER
+         g_clear_object (&manager->priv->up_client);
          manager->priv->up_client = up_client_new ();
--
 +#endif
- }
  
- static void
-@@ -247,7 +252,9 @@ gsm_consolekit_free_dbus (GsmConsolekit
- {
-         g_clear_object (&manager->priv->bus_proxy);
+         is_connected = TRUE;
+@@ -381,7 +387,9 @@ gsm_consolekit_free_dbus (GsmConsolekit
          g_clear_object (&manager->priv->ck_proxy);
+         g_clear_object (&manager->priv->session_proxy);
+         g_clear_object (&manager->priv->session_id);
 +#ifdef WITH_UPOWER
          g_clear_object (&manager->priv->up_client);
 +#endif
  
          if (manager->priv->dbus_connection != NULL) {
                  DBusConnection *connection;
-@@ -814,22 +821,31 @@ gsm_consolekit_is_login_session (GsmSyst
+@@ -948,22 +956,31 @@ gsm_consolekit_is_login_session (GsmSyst
  static gboolean
  gsm_consolekit_can_suspend (GsmSystem *system)
  {
          GsmConsolekit *consolekit = GSM_CONSOLEKIT (system);
          GError *error = NULL;
          gboolean ret;
-@@ -839,11 +855,13 @@ gsm_consolekit_suspend (GsmSystem *syste
+@@ -973,11 +990,13 @@ gsm_consolekit_suspend (GsmSystem *syste
                  g_warning ("Unexpected suspend failure: %s", error->message);
                  g_error_free (error);
          }
          GsmConsolekit *consolekit = GSM_CONSOLEKIT (system);
          GError *error = NULL;
          gboolean ret;
-@@ -853,6 +871,7 @@ gsm_consolekit_hibernate (GsmSystem *sys
+@@ -987,6 +1006,7 @@ gsm_consolekit_hibernate (GsmSystem *sys
                  g_warning ("Unexpected hibernate failure: %s", error->message);
                  g_error_free (error);
          }
  }
  
  static void
+--- origsrc/gnome-session-3.8.4/gnome-session/gsm-logout-dialog.c      2013-02-19 12:33:13.000000000 -0600
++++ src/gnome-session-3.8.4/gnome-session/gsm-logout-dialog.c  2013-08-09 01:37:32.977057900 -0500
+@@ -27,8 +27,10 @@
+ #include <glib/gi18n.h>
+ #include <gtk/gtk.h>
++#ifdef WITH_UPOWER
+ #define UPOWER_ENABLE_DEPRECATED 1
+ #include <upower.h>
++#endif
+ #include "gsm-logout-dialog.h"
+ #include "gsm-system.h"
+@@ -48,7 +50,9 @@ struct _GsmLogoutDialogPrivate
+ {
+         GsmDialogLogoutType  type;
++#ifdef WITH_UPOWER
+         UpClient            *up_client;
++#endif
+         GsmSystem           *system;
+         int                  timeout;
+@@ -140,7 +144,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->system = gsm_get_system ();
+@@ -164,7 +170,9 @@ gsm_logout_dialog_destroy (GsmLogoutDial
+                 logout_dialog->priv->timeout_id = 0;
+         }
++#ifdef WITH_UPOWER
+         g_clear_object (&logout_dialog->priv->up_client);
++#endif
+         g_clear_object (&logout_dialog->priv->system);
+         current_dialog = NULL;
+@@ -173,13 +181,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
index e365aba1c581c68dd85b6d912295ca797421a416..5c232f3807a40fc02f2bc5ec0a4cda451c8e0ac5 100644 (file)
@@ -1,21 +1,18 @@
 inherit gnome2
 
 NAME="gnome-session"
-VERSION=3.6.2
-RELEASE=2
+VERSION=3.8.4
+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"
+REQUIRES="at-spi2-core 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="
-       http://pkgs.fedoraproject.org/cgit/gnome-session.git/plain/0001-main-Set-XDG_MENU_PREFIX.patch?h=f18
-       3.6.2-upower.patch
-       3.4.1-llvmpipe.patch
+       3.8.4-without-upower.patch
+       3.8.4-gnome-fallback.patch
 "
 
 DIFF_EXCLUDES="man"
-
-CYGCONF_ARGS="--libexecdir=/usr/lib/${PN}"
This page took 0.0327 seconds and 5 git commands to generate.