Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=f22d01b0a5283d3f04ba31c8c788dbe0763a088f
commit f22d01b0a5283d3f04ba31c8c788dbe0763a088f Author: bouleetbil <bouleet...@frogdev.info> Date: Sat Sep 10 15:31:41 2011 +0200 gdm-3.1.91-1-x86_64 *Version bump diff --git a/source/gnome/gdm/FrugalBuild b/source/gnome/gdm/FrugalBuild index d809f91..a87ea18 100644 --- a/source/gnome/gdm/FrugalBuild +++ b/source/gnome/gdm/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: bouleetbil <bouleet...@frogdev.info> pkgname=gdm -pkgver=3.1.90 -pkgrel=8 +pkgver=3.1.91 +pkgrel=1 pkgdesc="GNOME Display Manager" url="http://www.gnome.org/"; backup=(etc/gdm/custom.conf etc/pam.d/gdm etc/pam.d/gdm-autologin) @@ -18,13 +18,9 @@ archs=('i686' 'x86_64' 'ppc') _F_gnome_git="n" Finclude gnome source=(${source[@]} \ - a11y.diff \ - upower.diff \ - consolekit.diff) -sha1sums=('7ee6ef98de85c5cda3947ecac2f8e6f2b6ff0b6f' \ - '3b31fb6239a3551e0f367d1ae24af3fdf624d171' \ - 'c1026c3410767105cc5b81673f11e11f31b19fe2' \ - '9327677787098a2ce38e8294f984b5e5f2584e12') + a11y.diff) +sha1sums=('b0038d68255d36506479819ccc011cd033d4f79d' \ + '3b31fb6239a3551e0f367d1ae24af3fdf624d171') if [ "$_F_gnome_git" != "n" ]; then unset sha1sums fi diff --git a/source/gnome/gdm/consolekit.diff b/source/gnome/gdm/consolekit.diff deleted file mode 100644 index 646aa8e..0000000 --- a/source/gnome/gdm/consolekit.diff +++ /dev/null @@ -1,99 +0,0 @@ -From 984038d2df357750f49658ad0c5bfe0d2e812ffd Mon Sep 17 00:00:00 2001 -From: Ray Strode <rstr...@redhat.com> -Date: Tue, 06 Sep 2011 15:41:07 +0000 -Subject: daemon: fix consolekit registration - -ioni pointed out on IRC, that since commit -647cad5bf59a4ff3776ba1ae5cda6b1aaaa1cfb2 - -the greeter session isn't getting fully registered -with consolekit and so udev acls weren't being -properly applied. - -This commit passes the tty to the worker process -so that it can be used for registration. - -It also passes hostname, merely for completeness. ---- -diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c -index 1d5c16a..c25bc9b 100644 ---- a/daemon/gdm-session-direct.c -+++ b/daemon/gdm-session-direct.c -@@ -1401,6 +1401,8 @@ do_introspect (DBusConnection *connection, - " <signal name=\"SetupForProgram\">\n" - " <arg name=\"service_name\" type=\"s\"/>\n" - " <arg name=\"x11_display_name\" type=\"s\"/>\n" -+ " <arg name=\"display_device\" type=\"s\"/>\n" -+ " <arg name=\"hostname\" type=\"s\"/>\n" - " <arg name=\"x11_authority_file\" type=\"s\"/>\n" - " <arg name=\"log_file\" type=\"s\"/>\n" - " </signal>\n" -@@ -2052,6 +2054,8 @@ send_setup_for_program (GdmSessionDirect *session, - DBusMessage *message; - DBusMessageIter iter; - const char *display_name; -+ const char *display_device; -+ const char *display_hostname; - const char *display_x11_authority_file; - GdmSessionConversation *conversation; - -@@ -2062,6 +2066,16 @@ send_setup_for_program (GdmSessionDirect *session, - } else { - display_name = ""; - } -+ if (session->priv->display_hostname != NULL) { -+ display_hostname = session->priv->display_hostname; -+ } else { -+ display_hostname = ""; -+ } -+ if (session->priv->display_device != NULL) { -+ display_device = session->priv->display_device; -+ } else { -+ display_device = ""; -+ } - if (session->priv->display_x11_authority_file != NULL) { - display_x11_authority_file = session->priv->display_x11_authority_file; - } else { -@@ -2077,6 +2091,8 @@ send_setup_for_program (GdmSessionDirect *session, - dbus_message_iter_init_append (message, &iter); - dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &service_name); - dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &display_name); -+ dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &display_device); -+ dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &display_hostname); - dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &display_x11_authority_file); - dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &log_file); - -diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c -index 2b46ca8..c402e6c 100644 ---- a/daemon/gdm-session-worker.c -+++ b/daemon/gdm-session-worker.c -@@ -2597,6 +2597,8 @@ on_setup_for_program (GdmSessionWorker *worker, - DBusError error; - char *service; - char *x11_display_name; -+ char *console; -+ char *hostname; - char *x11_authority_file; - char *log_file; - dbus_bool_t res; -@@ -2611,6 +2613,8 @@ on_setup_for_program (GdmSessionWorker *worker, - &error, - DBUS_TYPE_STRING, &service, - DBUS_TYPE_STRING, &x11_display_name, -+ DBUS_TYPE_STRING, &console, -+ DBUS_TYPE_STRING, &hostname, - DBUS_TYPE_STRING, &x11_authority_file, - DBUS_TYPE_STRING, &log_file, - DBUS_TYPE_INVALID); -@@ -2621,6 +2625,8 @@ on_setup_for_program (GdmSessionWorker *worker, - worker->priv->service = g_strdup (service); - worker->priv->username = g_strdup (GDM_USERNAME); - worker->priv->x11_display_name = g_strdup (x11_display_name); -+ worker->priv->hostname = g_strdup (hostname); -+ worker->priv->display_device = g_strdup (console); - worker->priv->x11_authority_file = g_strdup (x11_authority_file); - worker->priv->log_file = g_strdup (log_file); - worker->priv->is_program_session = TRUE; --- -cgit v0.9.0.2 - diff --git a/source/gnome/gdm/upower.diff b/source/gnome/gdm/upower.diff deleted file mode 100644 index cc970f7..0000000 --- a/source/gnome/gdm/upower.diff +++ /dev/null @@ -1,27 +0,0 @@ -From 419836c1a411bd541594363ffce7f508fa7c02f7 Mon Sep 17 00:00:00 2001 -From: Rodrigo Moya <rodr...@gnome-db.org> -Date: Wed, 27 Jul 2011 09:14:29 +0000 -Subject: greeter: Use the new power DBus interface in g-s-d - -https://bugzilla.gnome.org/show_bug.cgi?id=655399 ---- -diff --git a/gui/simple-greeter/gdm-greeter-panel.c b/gui/simple-greeter/gdm-greeter-panel.c -index f3f192a..598aadf 100644 ---- a/gui/simple-greeter/gdm-greeter-panel.c -+++ b/gui/simple-greeter/gdm-greeter-panel.c -@@ -57,9 +57,9 @@ - #define CK_MANAGER_PATH "/org/freedesktop/ConsoleKit/Manager" - #define CK_MANAGER_INTERFACE "org.freedesktop.ConsoleKit.Manager" - --#define GPM_DBUS_NAME "org.gnome.PowerManager" --#define GPM_DBUS_PATH "/org/gnome/PowerManager" --#define GPM_DBUS_INTERFACE "org.gnome.PowerManager" -+#define GPM_DBUS_NAME "org.gnome.SettingsDaemon" -+#define GPM_DBUS_PATH "/org/gnome/SettingsDaemon/Power" -+#define GPM_DBUS_INTERFACE "org.gnome.SettingsDaemon.Power" - - #define KEY_DISABLE_RESTART_BUTTONS "/apps/gdm/simple-greeter/disable_restart_buttons" - #define KEY_NOTIFICATION_AREA_PADDING "/apps/notification_area_applet/prefs/padding" --- -cgit v0.9.0.2 - _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
