From 7510a8ca1baea871a2bf115fc8b286cc2218ea68c4869972ce543b5d87e869d0 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Mon, 28 Sep 2009 12:55:52 +0000 Subject: [PATCH 01/10] Accepting request 21200 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/gdm via accept of submit request 21200 revision 52. Request was accepted with message: Forwarding to openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/21200 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=95 --- gdm.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gdm.spec b/gdm.spec index 19a5f35..784d9a0 100644 --- a/gdm.spec +++ b/gdm.spec @@ -42,7 +42,7 @@ BuildRequires: zenity License: GPL v2 or later Group: System/GUI/GNOME Version: 2.27.90 -Release: 2 +Release: 1 Summary: The GNOME 2.x Display Manager Source: %{name}-%{version}.tar.bz2 Source1: gdm.pamd @@ -79,9 +79,9 @@ Patch32: gdm-keyboard-from-hal.patch # PATCH-FIX-OPENSUSE gdm-keyboard-from-sysconfig.patch bnc432360 bnc478083 hpj@novell.com -- Read keyboard options from sysconfig (for openSUSE <= 11.1, since keyboard layout wasn't in hal) Patch33: gdm-keyboard-from-sysconfig.patch # PATCH-FIX-OPENSUSE gdm-default-wm.patch vuntz@novell.com -- Use sysconfig to know to which desktop to use by default -Patch34: gdm-default-wm.patch +Patch34: gdm-default-wm.patch # PATCH-FIX-OPENSUSE gdm-xauthlocalhostname.patch vuntz@novell.com -- Set XAUTHLOCALHOSTNAME to localhost for local logins to avoid issues in the session in case the hostname changes -Patch35: gdm-xauthlocalhostname.patch +Patch35: gdm-xauthlocalhostname.patch # PATCH-FIX-OPENSUSE gdm-selinux.patch -- Small changes to make it compile fine with SELinux Patch60: gdm-selinux.patch Url: http://www.gnome.org/ From 1c2ed57c5be49ab2900eed22ccd06d702e11786b067548c081c8bbb47e497c96 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 28 Sep 2009 14:41:28 +0000 Subject: [PATCH 02/10] Accepting request 21202 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/gdm via accept of submit request 21202 revision 2. Request was accepted with message: Thanks for the submission. OBS-URL: https://build.opensuse.org/request/show/21202 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=96 --- gdm-2.27.90.tar.bz2 | 3 --- gdm-2.28.0.tar.bz2 | 3 +++ gdm-build-fixes.patch | 13 +++++++++++ gdm-keyboard-from-hal.patch | 31 ++++++++++++++----------- gdm-selecting-desktop-environment.patch | 21 +++++++++-------- gdm.changes | 26 +++++++++++++++++++++ gdm.spec | 13 +++++++---- 7 files changed, 78 insertions(+), 32 deletions(-) delete mode 100644 gdm-2.27.90.tar.bz2 create mode 100644 gdm-2.28.0.tar.bz2 create mode 100644 gdm-build-fixes.patch diff --git a/gdm-2.27.90.tar.bz2 b/gdm-2.27.90.tar.bz2 deleted file mode 100644 index 1d2c2d2..0000000 --- a/gdm-2.27.90.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4e842a59285a456d9a9cc03e5519f027319fc254d98f818c275a7e90882ab6f9 -size 2392706 diff --git a/gdm-2.28.0.tar.bz2 b/gdm-2.28.0.tar.bz2 new file mode 100644 index 0000000..1a16303 --- /dev/null +++ b/gdm-2.28.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b83db2613192df8a8865ca59877de5181df6247cd17be42418cc5a39d314d5a4 +size 2314347 diff --git a/gdm-build-fixes.patch b/gdm-build-fixes.patch new file mode 100644 index 0000000..dbfd5b3 --- /dev/null +++ b/gdm-build-fixes.patch @@ -0,0 +1,13 @@ +Index: gdm-2.28.0/daemon/gdm-slave.c +=================================================================== +--- gdm-2.28.0.orig/daemon/gdm-slave.c ++++ gdm-2.28.0/daemon/gdm-slave.c +@@ -836,6 +836,8 @@ gdm_slave_parse_enriched_login (GdmSlave + } else { + return (g_strdup (username)); + } ++ ++ return NULL; + } + + gboolean diff --git a/gdm-keyboard-from-hal.patch b/gdm-keyboard-from-hal.patch index fdf0a6b..32c8cc6 100644 --- a/gdm-keyboard-from-hal.patch +++ b/gdm-keyboard-from-hal.patch @@ -1,17 +1,19 @@ -diff -ur gdm-2.27.4/configure.ac gdm-2.27.4.patched//configure.ac ---- gdm-2.27.4/configure.ac 2009-07-20 04:17:17.000000000 +0200 -+++ gdm-2.27.4.patched//configure.ac 2009-07-20 17:50:13.000000000 +0200 -@@ -68,6 +68,7 @@ - PKG_CHECK_MODULES(DAEMON, +Index: gdm-2.28.0/configure.ac +=================================================================== +--- gdm-2.28.0.orig/configure.ac ++++ gdm-2.28.0/configure.ac +@@ -70,6 +70,7 @@ PKG_CHECK_MODULES(DAEMON, dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION gobject-2.0 >= $GLIB_REQUIRED_VERSION + gio-2.0 >= $GLIB_REQUIRED_VERSION + hal ) AC_SUBST(DAEMON_CFLAGS) AC_SUBST(DAEMON_LIBS) -diff -ur gdm-2.27.4/daemon/gdm-session-direct.c gdm-2.27.4.patched//daemon/gdm-session-direct.c ---- gdm-2.27.4/daemon/gdm-session-direct.c 2009-07-20 03:09:09.000000000 +0200 -+++ gdm-2.27.4.patched//daemon/gdm-session-direct.c 2009-07-20 17:53:04.000000000 +0200 +Index: gdm-2.28.0/daemon/gdm-session-direct.c +=================================================================== +--- gdm-2.28.0.orig/daemon/gdm-session-direct.c ++++ gdm-2.28.0/daemon/gdm-session-direct.c @@ -45,6 +45,8 @@ #include #include @@ -21,7 +23,7 @@ diff -ur gdm-2.27.4/daemon/gdm-session-direct.c gdm-2.27.4.patched//daemon/gdm-s #include "gdm-session-direct.h" #include "gdm-session.h" #include "gdm-session-private.h" -@@ -597,14 +599,66 @@ +@@ -600,14 +602,66 @@ get_default_language_name (GdmSessionDir return setlocale (LC_MESSAGES, NULL); } @@ -91,7 +93,7 @@ diff -ur gdm-2.27.4/daemon/gdm-session-direct.c gdm-2.27.4.patched//daemon/gdm-s } static char * -@@ -1955,9 +2009,10 @@ +@@ -1970,9 +2024,10 @@ setup_session_environment (GdmSessionDir if (strcmp (get_layout_name (session), get_default_layout_name (session)) == 0) { @@ -105,10 +107,11 @@ diff -ur gdm-2.27.4/daemon/gdm-session-direct.c gdm-2.27.4.patched//daemon/gdm-s } gdm_session_direct_set_environment_variable (session, -diff -ur gdm-2.27.4/daemon/gdm-session-settings.c gdm-2.27.4.patched//daemon/gdm-session-settings.c ---- gdm-2.27.4/daemon/gdm-session-settings.c 2009-05-19 17:18:12.000000000 +0200 -+++ gdm-2.27.4.patched//daemon/gdm-session-settings.c 2009-07-20 17:50:13.000000000 +0200 -@@ -149,8 +149,7 @@ +Index: gdm-2.28.0/daemon/gdm-session-settings.c +=================================================================== +--- gdm-2.28.0.orig/daemon/gdm-session-settings.c ++++ gdm-2.28.0/daemon/gdm-session-settings.c +@@ -149,8 +149,7 @@ gdm_session_settings_set_layout_name (Gd { g_return_if_fail (GDM_IS_SESSION_SETTINGS (settings)); diff --git a/gdm-selecting-desktop-environment.patch b/gdm-selecting-desktop-environment.patch index ede8749..224af89 100644 --- a/gdm-selecting-desktop-environment.patch +++ b/gdm-selecting-desktop-environment.patch @@ -1,8 +1,8 @@ -diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c -index c1ac7cf..a5de412 100644 ---- a/daemon/gdm-session-worker.c -+++ b/daemon/gdm-session-worker.c -@@ -149,6 +149,9 @@ typedef int (* GdmSessionWorkerPamNewMessagesFunc) (int, +Index: gdm-2.28.0/daemon/gdm-session-worker.c +=================================================================== +--- gdm-2.28.0.orig/daemon/gdm-session-worker.c ++++ gdm-2.28.0/daemon/gdm-session-worker.c +@@ -157,6 +157,9 @@ typedef int (* GdmSessionWorkerPamNewMes const struct pam_message **, struct pam_response **, gpointer); @@ -12,10 +12,11 @@ index c1ac7cf..a5de412 100644 G_DEFINE_TYPE (GdmSessionWorker, gdm_session_worker, G_TYPE_OBJECT) -@@ -617,6 +620,21 @@ attempt_to_load_user_settings (GdmSessionWorker *worker, - passwd_entry->pw_dir, +@@ -597,6 +600,22 @@ attempt_to_load_user_settings (GdmSessio + gdm_session_settings_load (worker->priv->user_settings, + username, NULL); - ++ + /* These singal handlers should be disconnected after the loading, + * so that gdm_session_settings_set_* APIs don't cause the emitting + * of Saved*NameRead D-Bus signals any more. @@ -31,6 +32,6 @@ index c1ac7cf..a5de412 100644 + g_signal_handlers_disconnect_by_func (worker->priv->user_settings, + G_CALLBACK (on_saved_layout_name_read), + worker); - seteuid (old_uid); - setegid (old_gid); } + + static void diff --git a/gdm.changes b/gdm.changes index fa59d98..aafd25a 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Mon Sep 28 14:59:45 CEST 2009 - vuntz@opensuse.org + +- Update to version 2.28.0: + + GDM supports the ability to specify the automatic/timed login + user via a script via the same interface that the old GDM + supported. + + The user's dmrc and face image files are stored in + /var/cache/gdm, so that the login process does not need to + access the user's $HOME directory before authentication. Refer + to bgo#565151. + + Fix the login GUI options widget so the language/session/layout + choices are not reset after a failed login. + + Fix language dialog so it does not crash if the user click's + the "OK" button when no language is selected. + + Fix to ensure that the login dialog regains focus after the + language or layout dialogs are used. + + The language dialog has improved logic to sort the language + names more correctly. + + Make sure to check error variable is not NULL before + referencing it in the gdm-user-manager code. + + Make sure to not print NULL strings since this causes crashes + on some platforms. + + Improve documentation. +- Add gdm-build-fixes.patch to fix build. + ------------------------------------------------------------------- Mon Sep 28 14:25:50 CEST 2009 - vuntz@opensuse.org diff --git a/gdm.spec b/gdm.spec index 784d9a0..087f31e 100644 --- a/gdm.spec +++ b/gdm.spec @@ -1,5 +1,5 @@ # -# spec file for package gdm (Version 2.27.90) +# spec file for package gdm (Version 2.28.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -41,7 +41,7 @@ BuildRequires: xorg-x11-server-extra BuildRequires: zenity License: GPL v2 or later Group: System/GUI/GNOME -Version: 2.27.90 +Version: 2.28.0 Release: 1 Summary: The GNOME 2.x Display Manager Source: %{name}-%{version}.tar.bz2 @@ -79,9 +79,11 @@ Patch32: gdm-keyboard-from-hal.patch # PATCH-FIX-OPENSUSE gdm-keyboard-from-sysconfig.patch bnc432360 bnc478083 hpj@novell.com -- Read keyboard options from sysconfig (for openSUSE <= 11.1, since keyboard layout wasn't in hal) Patch33: gdm-keyboard-from-sysconfig.patch # PATCH-FIX-OPENSUSE gdm-default-wm.patch vuntz@novell.com -- Use sysconfig to know to which desktop to use by default -Patch34: gdm-default-wm.patch -# PATCH-FIX-OPENSUSE gdm-xauthlocalhostname.patch vuntz@novell.com -- Set XAUTHLOCALHOSTNAME to localhost for local logins to avoid issues in the session in case the hostname changes -Patch35: gdm-xauthlocalhostname.patch +Patch34: gdm-default-wm.patch +# PATCH-FIX-OPENSUSE gdm-xauthlocalhostname.patch bgo555464 vuntz@novell.com -- Set XAUTHLOCALHOSTNAME to localhost for local logins to avoid issues in the session in case the hostname changes +Patch35: gdm-xauthlocalhostname.patch +# PATCH-FIX-UPSTREAM gdm-build-fixes.patch bgo596605 vuntz@novell.com -- Add missing return value +Patch36: gdm-build-fixes.patch # PATCH-FIX-OPENSUSE gdm-selinux.patch -- Small changes to make it compile fine with SELinux Patch60: gdm-selinux.patch Url: http://www.gnome.org/ @@ -152,6 +154,7 @@ gnome-patch-translation-prepare %endif %patch34 -p1 %patch35 -p1 +%patch36 -p1 %patch60 # gnome-patch-translation-update From e585cde50388f397ea96da1e41258ab38f75d05d71268c2b340e4893718a071d Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Mon, 28 Sep 2009 15:39:56 +0000 Subject: [PATCH 03/10] tweak for darix OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=97 --- gdm.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gdm.spec b/gdm.spec index 087f31e..decc8e6 100644 --- a/gdm.spec +++ b/gdm.spec @@ -61,11 +61,11 @@ Patch6: gdm-desktop-session-env-pam.patch # PATCH-FIX-OPENSUSE gdm-suse-xsession.patch vuntz@novell.com -- Use the /etc/X11/xdm/* scripts Patch7: gdm-suse-xsession.patch # PATCH-NEEDS-REBASE gdm-domain-logon.patch hpj@novell.com -- Add UI to log in a specific domain (was: PATCH-FEATURE-SLED) -#Patch8: gdm-domain-logon.patch +Patch8: gdm-domain-logon.patch # PATCH-FIX-OPENSUSE gdm-sysconfig-settings.patch bnc432360 hpj@novell.com -- Read autologin options from /etc/sysconfig/displaymanager Patch13: gdm-sysconfig-settings.patch # PATCH-NEEDS-REBASE gdm-greeter-greater-ui.patch bnc436431 bgo560508 vuntz@novell.com -- Improve the layout of the greeter. Note: the patch contains a patched glade file *and* the result glade file (for reference only, in case we need to rebase the patch) (was PATCH-FIX-UPSTREAM) -#Patch15: gdm-greeter-greater-ui.patch +Patch15: gdm-greeter-greater-ui.patch # PATCH-FIX-UPSTREAM gdm-always-reflect-keyboard-layout.patch bnc438159 bgo561771 hpj@novell.com -- Make keyboard selector not neglect to apply the selected keyboard in some situations. Patch18: gdm-always-reflect-keyboard-layout.patch # PATCH-FIX-OPENSUSE gdm-save-panel-space-on-low-resolutions.patch bnc449815 hpj@novell.com -- Hide clock and/or selector labels on low resolutions. From f2388cc126f7ea5c5b8dc8ea0682a2c6dfb71bb72b9228dd07738c021af0e1d2 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Mon, 28 Sep 2009 16:22:39 +0000 Subject: [PATCH 04/10] unbreak OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=98 --- gdm-keyboard-from-hal.patch | 31 ++-- gdm-selecting-desktop-environment.patch | 21 ++- gdm.changes | 26 --- gdm.spec | 15 +- project.diff | 203 ++++++++++++++++++++++++ 5 files changed, 233 insertions(+), 63 deletions(-) create mode 100644 project.diff diff --git a/gdm-keyboard-from-hal.patch b/gdm-keyboard-from-hal.patch index 32c8cc6..fdf0a6b 100644 --- a/gdm-keyboard-from-hal.patch +++ b/gdm-keyboard-from-hal.patch @@ -1,19 +1,17 @@ -Index: gdm-2.28.0/configure.ac -=================================================================== ---- gdm-2.28.0.orig/configure.ac -+++ gdm-2.28.0/configure.ac -@@ -70,6 +70,7 @@ PKG_CHECK_MODULES(DAEMON, +diff -ur gdm-2.27.4/configure.ac gdm-2.27.4.patched//configure.ac +--- gdm-2.27.4/configure.ac 2009-07-20 04:17:17.000000000 +0200 ++++ gdm-2.27.4.patched//configure.ac 2009-07-20 17:50:13.000000000 +0200 +@@ -68,6 +68,7 @@ + PKG_CHECK_MODULES(DAEMON, dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION gobject-2.0 >= $GLIB_REQUIRED_VERSION - gio-2.0 >= $GLIB_REQUIRED_VERSION + hal ) AC_SUBST(DAEMON_CFLAGS) AC_SUBST(DAEMON_LIBS) -Index: gdm-2.28.0/daemon/gdm-session-direct.c -=================================================================== ---- gdm-2.28.0.orig/daemon/gdm-session-direct.c -+++ gdm-2.28.0/daemon/gdm-session-direct.c +diff -ur gdm-2.27.4/daemon/gdm-session-direct.c gdm-2.27.4.patched//daemon/gdm-session-direct.c +--- gdm-2.27.4/daemon/gdm-session-direct.c 2009-07-20 03:09:09.000000000 +0200 ++++ gdm-2.27.4.patched//daemon/gdm-session-direct.c 2009-07-20 17:53:04.000000000 +0200 @@ -45,6 +45,8 @@ #include #include @@ -23,7 +21,7 @@ Index: gdm-2.28.0/daemon/gdm-session-direct.c #include "gdm-session-direct.h" #include "gdm-session.h" #include "gdm-session-private.h" -@@ -600,14 +602,66 @@ get_default_language_name (GdmSessionDir +@@ -597,14 +599,66 @@ return setlocale (LC_MESSAGES, NULL); } @@ -93,7 +91,7 @@ Index: gdm-2.28.0/daemon/gdm-session-direct.c } static char * -@@ -1970,9 +2024,10 @@ setup_session_environment (GdmSessionDir +@@ -1955,9 +2009,10 @@ if (strcmp (get_layout_name (session), get_default_layout_name (session)) == 0) { @@ -107,11 +105,10 @@ Index: gdm-2.28.0/daemon/gdm-session-direct.c } gdm_session_direct_set_environment_variable (session, -Index: gdm-2.28.0/daemon/gdm-session-settings.c -=================================================================== ---- gdm-2.28.0.orig/daemon/gdm-session-settings.c -+++ gdm-2.28.0/daemon/gdm-session-settings.c -@@ -149,8 +149,7 @@ gdm_session_settings_set_layout_name (Gd +diff -ur gdm-2.27.4/daemon/gdm-session-settings.c gdm-2.27.4.patched//daemon/gdm-session-settings.c +--- gdm-2.27.4/daemon/gdm-session-settings.c 2009-05-19 17:18:12.000000000 +0200 ++++ gdm-2.27.4.patched//daemon/gdm-session-settings.c 2009-07-20 17:50:13.000000000 +0200 +@@ -149,8 +149,7 @@ { g_return_if_fail (GDM_IS_SESSION_SETTINGS (settings)); diff --git a/gdm-selecting-desktop-environment.patch b/gdm-selecting-desktop-environment.patch index 224af89..ede8749 100644 --- a/gdm-selecting-desktop-environment.patch +++ b/gdm-selecting-desktop-environment.patch @@ -1,8 +1,8 @@ -Index: gdm-2.28.0/daemon/gdm-session-worker.c -=================================================================== ---- gdm-2.28.0.orig/daemon/gdm-session-worker.c -+++ gdm-2.28.0/daemon/gdm-session-worker.c -@@ -157,6 +157,9 @@ typedef int (* GdmSessionWorkerPamNewMes +diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c +index c1ac7cf..a5de412 100644 +--- a/daemon/gdm-session-worker.c ++++ b/daemon/gdm-session-worker.c +@@ -149,6 +149,9 @@ typedef int (* GdmSessionWorkerPamNewMessagesFunc) (int, const struct pam_message **, struct pam_response **, gpointer); @@ -12,11 +12,10 @@ Index: gdm-2.28.0/daemon/gdm-session-worker.c G_DEFINE_TYPE (GdmSessionWorker, gdm_session_worker, G_TYPE_OBJECT) -@@ -597,6 +600,22 @@ attempt_to_load_user_settings (GdmSessio - gdm_session_settings_load (worker->priv->user_settings, - username, +@@ -617,6 +620,21 @@ attempt_to_load_user_settings (GdmSessionWorker *worker, + passwd_entry->pw_dir, NULL); -+ + + /* These singal handlers should be disconnected after the loading, + * so that gdm_session_settings_set_* APIs don't cause the emitting + * of Saved*NameRead D-Bus signals any more. @@ -32,6 +31,6 @@ Index: gdm-2.28.0/daemon/gdm-session-worker.c + g_signal_handlers_disconnect_by_func (worker->priv->user_settings, + G_CALLBACK (on_saved_layout_name_read), + worker); + seteuid (old_uid); + setegid (old_gid); } - - static void diff --git a/gdm.changes b/gdm.changes index aafd25a..fa59d98 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,29 +1,3 @@ -------------------------------------------------------------------- -Mon Sep 28 14:59:45 CEST 2009 - vuntz@opensuse.org - -- Update to version 2.28.0: - + GDM supports the ability to specify the automatic/timed login - user via a script via the same interface that the old GDM - supported. - + The user's dmrc and face image files are stored in - /var/cache/gdm, so that the login process does not need to - access the user's $HOME directory before authentication. Refer - to bgo#565151. - + Fix the login GUI options widget so the language/session/layout - choices are not reset after a failed login. - + Fix language dialog so it does not crash if the user click's - the "OK" button when no language is selected. - + Fix to ensure that the login dialog regains focus after the - language or layout dialogs are used. - + The language dialog has improved logic to sort the language - names more correctly. - + Make sure to check error variable is not NULL before - referencing it in the gdm-user-manager code. - + Make sure to not print NULL strings since this causes crashes - on some platforms. - + Improve documentation. -- Add gdm-build-fixes.patch to fix build. - ------------------------------------------------------------------- Mon Sep 28 14:25:50 CEST 2009 - vuntz@opensuse.org diff --git a/gdm.spec b/gdm.spec index decc8e6..19a5f35 100644 --- a/gdm.spec +++ b/gdm.spec @@ -1,5 +1,5 @@ # -# spec file for package gdm (Version 2.28.0) +# spec file for package gdm (Version 2.27.90) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -41,8 +41,8 @@ BuildRequires: xorg-x11-server-extra BuildRequires: zenity License: GPL v2 or later Group: System/GUI/GNOME -Version: 2.28.0 -Release: 1 +Version: 2.27.90 +Release: 2 Summary: The GNOME 2.x Display Manager Source: %{name}-%{version}.tar.bz2 Source1: gdm.pamd @@ -61,11 +61,11 @@ Patch6: gdm-desktop-session-env-pam.patch # PATCH-FIX-OPENSUSE gdm-suse-xsession.patch vuntz@novell.com -- Use the /etc/X11/xdm/* scripts Patch7: gdm-suse-xsession.patch # PATCH-NEEDS-REBASE gdm-domain-logon.patch hpj@novell.com -- Add UI to log in a specific domain (was: PATCH-FEATURE-SLED) -Patch8: gdm-domain-logon.patch +#Patch8: gdm-domain-logon.patch # PATCH-FIX-OPENSUSE gdm-sysconfig-settings.patch bnc432360 hpj@novell.com -- Read autologin options from /etc/sysconfig/displaymanager Patch13: gdm-sysconfig-settings.patch # PATCH-NEEDS-REBASE gdm-greeter-greater-ui.patch bnc436431 bgo560508 vuntz@novell.com -- Improve the layout of the greeter. Note: the patch contains a patched glade file *and* the result glade file (for reference only, in case we need to rebase the patch) (was PATCH-FIX-UPSTREAM) -Patch15: gdm-greeter-greater-ui.patch +#Patch15: gdm-greeter-greater-ui.patch # PATCH-FIX-UPSTREAM gdm-always-reflect-keyboard-layout.patch bnc438159 bgo561771 hpj@novell.com -- Make keyboard selector not neglect to apply the selected keyboard in some situations. Patch18: gdm-always-reflect-keyboard-layout.patch # PATCH-FIX-OPENSUSE gdm-save-panel-space-on-low-resolutions.patch bnc449815 hpj@novell.com -- Hide clock and/or selector labels on low resolutions. @@ -80,10 +80,8 @@ Patch32: gdm-keyboard-from-hal.patch Patch33: gdm-keyboard-from-sysconfig.patch # PATCH-FIX-OPENSUSE gdm-default-wm.patch vuntz@novell.com -- Use sysconfig to know to which desktop to use by default Patch34: gdm-default-wm.patch -# PATCH-FIX-OPENSUSE gdm-xauthlocalhostname.patch bgo555464 vuntz@novell.com -- Set XAUTHLOCALHOSTNAME to localhost for local logins to avoid issues in the session in case the hostname changes +# PATCH-FIX-OPENSUSE gdm-xauthlocalhostname.patch vuntz@novell.com -- Set XAUTHLOCALHOSTNAME to localhost for local logins to avoid issues in the session in case the hostname changes Patch35: gdm-xauthlocalhostname.patch -# PATCH-FIX-UPSTREAM gdm-build-fixes.patch bgo596605 vuntz@novell.com -- Add missing return value -Patch36: gdm-build-fixes.patch # PATCH-FIX-OPENSUSE gdm-selinux.patch -- Small changes to make it compile fine with SELinux Patch60: gdm-selinux.patch Url: http://www.gnome.org/ @@ -154,7 +152,6 @@ gnome-patch-translation-prepare %endif %patch34 -p1 %patch35 -p1 -%patch36 -p1 %patch60 # gnome-patch-translation-update diff --git a/project.diff b/project.diff new file mode 100644 index 0000000..a2dd051 --- /dev/null +++ b/project.diff @@ -0,0 +1,203 @@ +--- gdm-keyboard-from-hal.patch.orig ++++ gdm-keyboard-from-hal.patch +@@ -1,17 +1,19 @@ +-diff -ur gdm-2.27.4/configure.ac gdm-2.27.4.patched//configure.ac +---- gdm-2.27.4/configure.ac 2009-07-20 04:17:17.000000000 +0200 +-+++ gdm-2.27.4.patched//configure.ac 2009-07-20 17:50:13.000000000 +0200 +-@@ -68,6 +68,7 @@ +- PKG_CHECK_MODULES(DAEMON, ++Index: gdm-2.28.0/configure.ac ++=================================================================== ++--- gdm-2.28.0.orig/configure.ac +++++ gdm-2.28.0/configure.ac ++@@ -70,6 +70,7 @@ PKG_CHECK_MODULES(DAEMON, + dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION + gobject-2.0 >= $GLIB_REQUIRED_VERSION ++ gio-2.0 >= $GLIB_REQUIRED_VERSION + + hal + ) + AC_SUBST(DAEMON_CFLAGS) + AC_SUBST(DAEMON_LIBS) +-diff -ur gdm-2.27.4/daemon/gdm-session-direct.c gdm-2.27.4.patched//daemon/gdm-session-direct.c +---- gdm-2.27.4/daemon/gdm-session-direct.c 2009-07-20 03:09:09.000000000 +0200 +-+++ gdm-2.27.4.patched//daemon/gdm-session-direct.c 2009-07-20 17:53:04.000000000 +0200 ++Index: gdm-2.28.0/daemon/gdm-session-direct.c ++=================================================================== ++--- gdm-2.28.0.orig/daemon/gdm-session-direct.c +++++ gdm-2.28.0/daemon/gdm-session-direct.c + @@ -45,6 +45,8 @@ + #include + #include +@@ -21,7 +23,7 @@ diff -ur gdm-2.27.4/daemon/gdm-session-d + #include "gdm-session-direct.h" + #include "gdm-session.h" + #include "gdm-session-private.h" +-@@ -597,14 +599,66 @@ ++@@ -600,14 +602,66 @@ get_default_language_name (GdmSessionDir + return setlocale (LC_MESSAGES, NULL); + } + +@@ -91,7 +93,7 @@ diff -ur gdm-2.27.4/daemon/gdm-session-d + } + + static char * +-@@ -1955,9 +2009,10 @@ ++@@ -1970,9 +2024,10 @@ setup_session_environment (GdmSessionDir + + if (strcmp (get_layout_name (session), + get_default_layout_name (session)) == 0) { +@@ -105,10 +107,11 @@ diff -ur gdm-2.27.4/daemon/gdm-session-d + } + + gdm_session_direct_set_environment_variable (session, +-diff -ur gdm-2.27.4/daemon/gdm-session-settings.c gdm-2.27.4.patched//daemon/gdm-session-settings.c +---- gdm-2.27.4/daemon/gdm-session-settings.c 2009-05-19 17:18:12.000000000 +0200 +-+++ gdm-2.27.4.patched//daemon/gdm-session-settings.c 2009-07-20 17:50:13.000000000 +0200 +-@@ -149,8 +149,7 @@ ++Index: gdm-2.28.0/daemon/gdm-session-settings.c ++=================================================================== ++--- gdm-2.28.0.orig/daemon/gdm-session-settings.c +++++ gdm-2.28.0/daemon/gdm-session-settings.c ++@@ -149,8 +149,7 @@ gdm_session_settings_set_layout_name (Gd + { + g_return_if_fail (GDM_IS_SESSION_SETTINGS (settings)); + +--- gdm-selecting-desktop-environment.patch.orig ++++ gdm-selecting-desktop-environment.patch +@@ -1,8 +1,8 @@ +-diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c +-index c1ac7cf..a5de412 100644 +---- a/daemon/gdm-session-worker.c +-+++ b/daemon/gdm-session-worker.c +-@@ -149,6 +149,9 @@ typedef int (* GdmSessionWorkerPamNewMessagesFunc) (int, ++Index: gdm-2.28.0/daemon/gdm-session-worker.c ++=================================================================== ++--- gdm-2.28.0.orig/daemon/gdm-session-worker.c +++++ gdm-2.28.0/daemon/gdm-session-worker.c ++@@ -157,6 +157,9 @@ typedef int (* GdmSessionWorkerPamNewMes + const struct pam_message **, + struct pam_response **, + gpointer); +@@ -12,10 +12,11 @@ index c1ac7cf..a5de412 100644 + + G_DEFINE_TYPE (GdmSessionWorker, gdm_session_worker, G_TYPE_OBJECT) + +-@@ -617,6 +620,21 @@ attempt_to_load_user_settings (GdmSessionWorker *worker, +- passwd_entry->pw_dir, ++@@ -597,6 +600,22 @@ attempt_to_load_user_settings (GdmSessio ++ gdm_session_settings_load (worker->priv->user_settings, ++ username, + NULL); +- +++ + + /* These singal handlers should be disconnected after the loading, + + * so that gdm_session_settings_set_* APIs don't cause the emitting + + * of Saved*NameRead D-Bus signals any more. +@@ -31,6 +32,6 @@ index c1ac7cf..a5de412 100644 + + g_signal_handlers_disconnect_by_func (worker->priv->user_settings, + + G_CALLBACK (on_saved_layout_name_read), + + worker); +- seteuid (old_uid); +- setegid (old_gid); + } ++ ++ static void +--- gdm.changes.orig ++++ gdm.changes +@@ -1,4 +1,41 @@ + ------------------------------------------------------------------- ++Mon Sep 28 14:59:45 CEST 2009 - vuntz@opensuse.org ++ ++- Update to version 2.28.0: ++ + GDM supports the ability to specify the automatic/timed login ++ user via a script via the same interface that the old GDM ++ supported. ++ + The user's dmrc and face image files are stored in ++ /var/cache/gdm, so that the login process does not need to ++ access the user's $HOME directory before authentication. Refer ++ to bgo#565151. ++ + Fix the login GUI options widget so the language/session/layout ++ choices are not reset after a failed login. ++ + Fix language dialog so it does not crash if the user click's ++ the "OK" button when no language is selected. ++ + Fix to ensure that the login dialog regains focus after the ++ language or layout dialogs are used. ++ + The language dialog has improved logic to sort the language ++ names more correctly. ++ + Make sure to check error variable is not NULL before ++ referencing it in the gdm-user-manager code. ++ + Make sure to not print NULL strings since this causes crashes ++ on some platforms. ++ + Improve documentation. ++- Add gdm-build-fixes.patch to fix build. ++ ++------------------------------------------------------------------- ++Mon Sep 28 14:25:50 CEST 2009 - vuntz@opensuse.org ++ ++- Add gdm-xauthlocalhostname.patch: fix non-working user session ++ when the hostname changes during login. Fix shipstopper ++ bnc#538064. ++- Add gdm-default-wm.patch: gdm now reads the DEFAULT_WM setting in ++ /etc/sysconfig/windowmanager to know which session to use by ++ default instead of always using GNOME. ++ This should fix using GDM for XFCE. ++ ++------------------------------------------------------------------- + Tue Aug 25 14:03:14 CEST 2009 - vuntz@novell.com + + - Update to version 2.27.90: +--- gdm.spec.orig ++++ gdm.spec +@@ -1,5 +1,5 @@ + # +-# spec file for package gdm (Version 2.27.90) ++# spec file for package gdm (Version 2.28.0) + # + # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. + # +@@ -41,7 +41,7 @@ BuildRequires: xorg-x11-server-extra + BuildRequires: zenity + License: GPL v2 or later + Group: System/GUI/GNOME +-Version: 2.27.90 ++Version: 2.28.0 + Release: 1 + Summary: The GNOME 2.x Display Manager + Source: %{name}-%{version}.tar.bz2 +@@ -61,11 +61,11 @@ Patch6: gdm-desktop-session-env- + # PATCH-FIX-OPENSUSE gdm-suse-xsession.patch vuntz@novell.com -- Use the /etc/X11/xdm/* scripts + Patch7: gdm-suse-xsession.patch + # PATCH-NEEDS-REBASE gdm-domain-logon.patch hpj@novell.com -- Add UI to log in a specific domain (was: PATCH-FEATURE-SLED) +-#Patch8: gdm-domain-logon.patch ++Patch8: gdm-domain-logon.patch + # PATCH-FIX-OPENSUSE gdm-sysconfig-settings.patch bnc432360 hpj@novell.com -- Read autologin options from /etc/sysconfig/displaymanager + Patch13: gdm-sysconfig-settings.patch + # PATCH-NEEDS-REBASE gdm-greeter-greater-ui.patch bnc436431 bgo560508 vuntz@novell.com -- Improve the layout of the greeter. Note: the patch contains a patched glade file *and* the result glade file (for reference only, in case we need to rebase the patch) (was PATCH-FIX-UPSTREAM) +-#Patch15: gdm-greeter-greater-ui.patch ++Patch15: gdm-greeter-greater-ui.patch + # PATCH-FIX-UPSTREAM gdm-always-reflect-keyboard-layout.patch bnc438159 bgo561771 hpj@novell.com -- Make keyboard selector not neglect to apply the selected keyboard in some situations. + Patch18: gdm-always-reflect-keyboard-layout.patch + # PATCH-FIX-OPENSUSE gdm-save-panel-space-on-low-resolutions.patch bnc449815 hpj@novell.com -- Hide clock and/or selector labels on low resolutions. +@@ -78,6 +78,12 @@ Patch31: gdm-gconf-path.patch + Patch32: gdm-keyboard-from-hal.patch + # PATCH-FIX-OPENSUSE gdm-keyboard-from-sysconfig.patch bnc432360 bnc478083 hpj@novell.com -- Read keyboard options from sysconfig (for openSUSE <= 11.1, since keyboard layout wasn't in hal) + Patch33: gdm-keyboard-from-sysconfig.patch ++# PATCH-FIX-OPENSUSE gdm-default-wm.patch vuntz@novell.com -- Use sysconfig to know to which desktop to use by default ++Patch34: gdm-default-wm.patch ++# PATCH-FIX-OPENSUSE gdm-xauthlocalhostname.patch bgo555464 vuntz@novell.com -- Set XAUTHLOCALHOSTNAME to localhost for local logins to avoid issues in the session in case the hostname changes ++Patch35: gdm-xauthlocalhostname.patch ++# PATCH-FIX-UPSTREAM gdm-build-fixes.patch bgo596605 vuntz@novell.com -- Add missing return value ++Patch36: gdm-build-fixes.patch + # PATCH-FIX-OPENSUSE gdm-selinux.patch -- Small changes to make it compile fine with SELinux + Patch60: gdm-selinux.patch + Url: http://www.gnome.org/ +@@ -146,6 +152,9 @@ gnome-patch-translation-prepare + %else + %patch33 -p1 + %endif ++%patch34 -p1 ++%patch35 -p1 ++%patch36 -p1 + %patch60 + # gnome-patch-translation-update + From f8d666b509acc170de56500defcd1dff48e11b1376eff6f155f1e0517f38828c Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Mon, 28 Sep 2009 16:24:35 +0000 Subject: [PATCH 05/10] Unbreak part 2 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=99 --- gdm-keyboard-from-hal.patch | 31 ++-- gdm-selecting-desktop-environment.patch | 21 +-- gdm.changes | 26 +++ gdm.spec | 15 +- project.diff | 203 ------------------------ 5 files changed, 63 insertions(+), 233 deletions(-) delete mode 100644 project.diff diff --git a/gdm-keyboard-from-hal.patch b/gdm-keyboard-from-hal.patch index fdf0a6b..32c8cc6 100644 --- a/gdm-keyboard-from-hal.patch +++ b/gdm-keyboard-from-hal.patch @@ -1,17 +1,19 @@ -diff -ur gdm-2.27.4/configure.ac gdm-2.27.4.patched//configure.ac ---- gdm-2.27.4/configure.ac 2009-07-20 04:17:17.000000000 +0200 -+++ gdm-2.27.4.patched//configure.ac 2009-07-20 17:50:13.000000000 +0200 -@@ -68,6 +68,7 @@ - PKG_CHECK_MODULES(DAEMON, +Index: gdm-2.28.0/configure.ac +=================================================================== +--- gdm-2.28.0.orig/configure.ac ++++ gdm-2.28.0/configure.ac +@@ -70,6 +70,7 @@ PKG_CHECK_MODULES(DAEMON, dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION gobject-2.0 >= $GLIB_REQUIRED_VERSION + gio-2.0 >= $GLIB_REQUIRED_VERSION + hal ) AC_SUBST(DAEMON_CFLAGS) AC_SUBST(DAEMON_LIBS) -diff -ur gdm-2.27.4/daemon/gdm-session-direct.c gdm-2.27.4.patched//daemon/gdm-session-direct.c ---- gdm-2.27.4/daemon/gdm-session-direct.c 2009-07-20 03:09:09.000000000 +0200 -+++ gdm-2.27.4.patched//daemon/gdm-session-direct.c 2009-07-20 17:53:04.000000000 +0200 +Index: gdm-2.28.0/daemon/gdm-session-direct.c +=================================================================== +--- gdm-2.28.0.orig/daemon/gdm-session-direct.c ++++ gdm-2.28.0/daemon/gdm-session-direct.c @@ -45,6 +45,8 @@ #include #include @@ -21,7 +23,7 @@ diff -ur gdm-2.27.4/daemon/gdm-session-direct.c gdm-2.27.4.patched//daemon/gdm-s #include "gdm-session-direct.h" #include "gdm-session.h" #include "gdm-session-private.h" -@@ -597,14 +599,66 @@ +@@ -600,14 +602,66 @@ get_default_language_name (GdmSessionDir return setlocale (LC_MESSAGES, NULL); } @@ -91,7 +93,7 @@ diff -ur gdm-2.27.4/daemon/gdm-session-direct.c gdm-2.27.4.patched//daemon/gdm-s } static char * -@@ -1955,9 +2009,10 @@ +@@ -1970,9 +2024,10 @@ setup_session_environment (GdmSessionDir if (strcmp (get_layout_name (session), get_default_layout_name (session)) == 0) { @@ -105,10 +107,11 @@ diff -ur gdm-2.27.4/daemon/gdm-session-direct.c gdm-2.27.4.patched//daemon/gdm-s } gdm_session_direct_set_environment_variable (session, -diff -ur gdm-2.27.4/daemon/gdm-session-settings.c gdm-2.27.4.patched//daemon/gdm-session-settings.c ---- gdm-2.27.4/daemon/gdm-session-settings.c 2009-05-19 17:18:12.000000000 +0200 -+++ gdm-2.27.4.patched//daemon/gdm-session-settings.c 2009-07-20 17:50:13.000000000 +0200 -@@ -149,8 +149,7 @@ +Index: gdm-2.28.0/daemon/gdm-session-settings.c +=================================================================== +--- gdm-2.28.0.orig/daemon/gdm-session-settings.c ++++ gdm-2.28.0/daemon/gdm-session-settings.c +@@ -149,8 +149,7 @@ gdm_session_settings_set_layout_name (Gd { g_return_if_fail (GDM_IS_SESSION_SETTINGS (settings)); diff --git a/gdm-selecting-desktop-environment.patch b/gdm-selecting-desktop-environment.patch index ede8749..224af89 100644 --- a/gdm-selecting-desktop-environment.patch +++ b/gdm-selecting-desktop-environment.patch @@ -1,8 +1,8 @@ -diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c -index c1ac7cf..a5de412 100644 ---- a/daemon/gdm-session-worker.c -+++ b/daemon/gdm-session-worker.c -@@ -149,6 +149,9 @@ typedef int (* GdmSessionWorkerPamNewMessagesFunc) (int, +Index: gdm-2.28.0/daemon/gdm-session-worker.c +=================================================================== +--- gdm-2.28.0.orig/daemon/gdm-session-worker.c ++++ gdm-2.28.0/daemon/gdm-session-worker.c +@@ -157,6 +157,9 @@ typedef int (* GdmSessionWorkerPamNewMes const struct pam_message **, struct pam_response **, gpointer); @@ -12,10 +12,11 @@ index c1ac7cf..a5de412 100644 G_DEFINE_TYPE (GdmSessionWorker, gdm_session_worker, G_TYPE_OBJECT) -@@ -617,6 +620,21 @@ attempt_to_load_user_settings (GdmSessionWorker *worker, - passwd_entry->pw_dir, +@@ -597,6 +600,22 @@ attempt_to_load_user_settings (GdmSessio + gdm_session_settings_load (worker->priv->user_settings, + username, NULL); - ++ + /* These singal handlers should be disconnected after the loading, + * so that gdm_session_settings_set_* APIs don't cause the emitting + * of Saved*NameRead D-Bus signals any more. @@ -31,6 +32,6 @@ index c1ac7cf..a5de412 100644 + g_signal_handlers_disconnect_by_func (worker->priv->user_settings, + G_CALLBACK (on_saved_layout_name_read), + worker); - seteuid (old_uid); - setegid (old_gid); } + + static void diff --git a/gdm.changes b/gdm.changes index fa59d98..aafd25a 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Mon Sep 28 14:59:45 CEST 2009 - vuntz@opensuse.org + +- Update to version 2.28.0: + + GDM supports the ability to specify the automatic/timed login + user via a script via the same interface that the old GDM + supported. + + The user's dmrc and face image files are stored in + /var/cache/gdm, so that the login process does not need to + access the user's $HOME directory before authentication. Refer + to bgo#565151. + + Fix the login GUI options widget so the language/session/layout + choices are not reset after a failed login. + + Fix language dialog so it does not crash if the user click's + the "OK" button when no language is selected. + + Fix to ensure that the login dialog regains focus after the + language or layout dialogs are used. + + The language dialog has improved logic to sort the language + names more correctly. + + Make sure to check error variable is not NULL before + referencing it in the gdm-user-manager code. + + Make sure to not print NULL strings since this causes crashes + on some platforms. + + Improve documentation. +- Add gdm-build-fixes.patch to fix build. + ------------------------------------------------------------------- Mon Sep 28 14:25:50 CEST 2009 - vuntz@opensuse.org diff --git a/gdm.spec b/gdm.spec index 19a5f35..decc8e6 100644 --- a/gdm.spec +++ b/gdm.spec @@ -1,5 +1,5 @@ # -# spec file for package gdm (Version 2.27.90) +# spec file for package gdm (Version 2.28.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -41,8 +41,8 @@ BuildRequires: xorg-x11-server-extra BuildRequires: zenity License: GPL v2 or later Group: System/GUI/GNOME -Version: 2.27.90 -Release: 2 +Version: 2.28.0 +Release: 1 Summary: The GNOME 2.x Display Manager Source: %{name}-%{version}.tar.bz2 Source1: gdm.pamd @@ -61,11 +61,11 @@ Patch6: gdm-desktop-session-env-pam.patch # PATCH-FIX-OPENSUSE gdm-suse-xsession.patch vuntz@novell.com -- Use the /etc/X11/xdm/* scripts Patch7: gdm-suse-xsession.patch # PATCH-NEEDS-REBASE gdm-domain-logon.patch hpj@novell.com -- Add UI to log in a specific domain (was: PATCH-FEATURE-SLED) -#Patch8: gdm-domain-logon.patch +Patch8: gdm-domain-logon.patch # PATCH-FIX-OPENSUSE gdm-sysconfig-settings.patch bnc432360 hpj@novell.com -- Read autologin options from /etc/sysconfig/displaymanager Patch13: gdm-sysconfig-settings.patch # PATCH-NEEDS-REBASE gdm-greeter-greater-ui.patch bnc436431 bgo560508 vuntz@novell.com -- Improve the layout of the greeter. Note: the patch contains a patched glade file *and* the result glade file (for reference only, in case we need to rebase the patch) (was PATCH-FIX-UPSTREAM) -#Patch15: gdm-greeter-greater-ui.patch +Patch15: gdm-greeter-greater-ui.patch # PATCH-FIX-UPSTREAM gdm-always-reflect-keyboard-layout.patch bnc438159 bgo561771 hpj@novell.com -- Make keyboard selector not neglect to apply the selected keyboard in some situations. Patch18: gdm-always-reflect-keyboard-layout.patch # PATCH-FIX-OPENSUSE gdm-save-panel-space-on-low-resolutions.patch bnc449815 hpj@novell.com -- Hide clock and/or selector labels on low resolutions. @@ -80,8 +80,10 @@ Patch32: gdm-keyboard-from-hal.patch Patch33: gdm-keyboard-from-sysconfig.patch # PATCH-FIX-OPENSUSE gdm-default-wm.patch vuntz@novell.com -- Use sysconfig to know to which desktop to use by default Patch34: gdm-default-wm.patch -# PATCH-FIX-OPENSUSE gdm-xauthlocalhostname.patch vuntz@novell.com -- Set XAUTHLOCALHOSTNAME to localhost for local logins to avoid issues in the session in case the hostname changes +# PATCH-FIX-OPENSUSE gdm-xauthlocalhostname.patch bgo555464 vuntz@novell.com -- Set XAUTHLOCALHOSTNAME to localhost for local logins to avoid issues in the session in case the hostname changes Patch35: gdm-xauthlocalhostname.patch +# PATCH-FIX-UPSTREAM gdm-build-fixes.patch bgo596605 vuntz@novell.com -- Add missing return value +Patch36: gdm-build-fixes.patch # PATCH-FIX-OPENSUSE gdm-selinux.patch -- Small changes to make it compile fine with SELinux Patch60: gdm-selinux.patch Url: http://www.gnome.org/ @@ -152,6 +154,7 @@ gnome-patch-translation-prepare %endif %patch34 -p1 %patch35 -p1 +%patch36 -p1 %patch60 # gnome-patch-translation-update diff --git a/project.diff b/project.diff deleted file mode 100644 index a2dd051..0000000 --- a/project.diff +++ /dev/null @@ -1,203 +0,0 @@ ---- gdm-keyboard-from-hal.patch.orig -+++ gdm-keyboard-from-hal.patch -@@ -1,17 +1,19 @@ --diff -ur gdm-2.27.4/configure.ac gdm-2.27.4.patched//configure.ac ----- gdm-2.27.4/configure.ac 2009-07-20 04:17:17.000000000 +0200 --+++ gdm-2.27.4.patched//configure.ac 2009-07-20 17:50:13.000000000 +0200 --@@ -68,6 +68,7 @@ -- PKG_CHECK_MODULES(DAEMON, -+Index: gdm-2.28.0/configure.ac -+=================================================================== -+--- gdm-2.28.0.orig/configure.ac -++++ gdm-2.28.0/configure.ac -+@@ -70,6 +70,7 @@ PKG_CHECK_MODULES(DAEMON, - dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gobject-2.0 >= $GLIB_REQUIRED_VERSION -+ gio-2.0 >= $GLIB_REQUIRED_VERSION - + hal - ) - AC_SUBST(DAEMON_CFLAGS) - AC_SUBST(DAEMON_LIBS) --diff -ur gdm-2.27.4/daemon/gdm-session-direct.c gdm-2.27.4.patched//daemon/gdm-session-direct.c ----- gdm-2.27.4/daemon/gdm-session-direct.c 2009-07-20 03:09:09.000000000 +0200 --+++ gdm-2.27.4.patched//daemon/gdm-session-direct.c 2009-07-20 17:53:04.000000000 +0200 -+Index: gdm-2.28.0/daemon/gdm-session-direct.c -+=================================================================== -+--- gdm-2.28.0.orig/daemon/gdm-session-direct.c -++++ gdm-2.28.0/daemon/gdm-session-direct.c - @@ -45,6 +45,8 @@ - #include - #include -@@ -21,7 +23,7 @@ diff -ur gdm-2.27.4/daemon/gdm-session-d - #include "gdm-session-direct.h" - #include "gdm-session.h" - #include "gdm-session-private.h" --@@ -597,14 +599,66 @@ -+@@ -600,14 +602,66 @@ get_default_language_name (GdmSessionDir - return setlocale (LC_MESSAGES, NULL); - } - -@@ -91,7 +93,7 @@ diff -ur gdm-2.27.4/daemon/gdm-session-d - } - - static char * --@@ -1955,9 +2009,10 @@ -+@@ -1970,9 +2024,10 @@ setup_session_environment (GdmSessionDir - - if (strcmp (get_layout_name (session), - get_default_layout_name (session)) == 0) { -@@ -105,10 +107,11 @@ diff -ur gdm-2.27.4/daemon/gdm-session-d - } - - gdm_session_direct_set_environment_variable (session, --diff -ur gdm-2.27.4/daemon/gdm-session-settings.c gdm-2.27.4.patched//daemon/gdm-session-settings.c ----- gdm-2.27.4/daemon/gdm-session-settings.c 2009-05-19 17:18:12.000000000 +0200 --+++ gdm-2.27.4.patched//daemon/gdm-session-settings.c 2009-07-20 17:50:13.000000000 +0200 --@@ -149,8 +149,7 @@ -+Index: gdm-2.28.0/daemon/gdm-session-settings.c -+=================================================================== -+--- gdm-2.28.0.orig/daemon/gdm-session-settings.c -++++ gdm-2.28.0/daemon/gdm-session-settings.c -+@@ -149,8 +149,7 @@ gdm_session_settings_set_layout_name (Gd - { - g_return_if_fail (GDM_IS_SESSION_SETTINGS (settings)); - ---- gdm-selecting-desktop-environment.patch.orig -+++ gdm-selecting-desktop-environment.patch -@@ -1,8 +1,8 @@ --diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c --index c1ac7cf..a5de412 100644 ----- a/daemon/gdm-session-worker.c --+++ b/daemon/gdm-session-worker.c --@@ -149,6 +149,9 @@ typedef int (* GdmSessionWorkerPamNewMessagesFunc) (int, -+Index: gdm-2.28.0/daemon/gdm-session-worker.c -+=================================================================== -+--- gdm-2.28.0.orig/daemon/gdm-session-worker.c -++++ gdm-2.28.0/daemon/gdm-session-worker.c -+@@ -157,6 +157,9 @@ typedef int (* GdmSessionWorkerPamNewMes - const struct pam_message **, - struct pam_response **, - gpointer); -@@ -12,10 +12,11 @@ index c1ac7cf..a5de412 100644 - - G_DEFINE_TYPE (GdmSessionWorker, gdm_session_worker, G_TYPE_OBJECT) - --@@ -617,6 +620,21 @@ attempt_to_load_user_settings (GdmSessionWorker *worker, -- passwd_entry->pw_dir, -+@@ -597,6 +600,22 @@ attempt_to_load_user_settings (GdmSessio -+ gdm_session_settings_load (worker->priv->user_settings, -+ username, - NULL); -- -++ - + /* These singal handlers should be disconnected after the loading, - + * so that gdm_session_settings_set_* APIs don't cause the emitting - + * of Saved*NameRead D-Bus signals any more. -@@ -31,6 +32,6 @@ index c1ac7cf..a5de412 100644 - + g_signal_handlers_disconnect_by_func (worker->priv->user_settings, - + G_CALLBACK (on_saved_layout_name_read), - + worker); -- seteuid (old_uid); -- setegid (old_gid); - } -+ -+ static void ---- gdm.changes.orig -+++ gdm.changes -@@ -1,4 +1,41 @@ - ------------------------------------------------------------------- -+Mon Sep 28 14:59:45 CEST 2009 - vuntz@opensuse.org -+ -+- Update to version 2.28.0: -+ + GDM supports the ability to specify the automatic/timed login -+ user via a script via the same interface that the old GDM -+ supported. -+ + The user's dmrc and face image files are stored in -+ /var/cache/gdm, so that the login process does not need to -+ access the user's $HOME directory before authentication. Refer -+ to bgo#565151. -+ + Fix the login GUI options widget so the language/session/layout -+ choices are not reset after a failed login. -+ + Fix language dialog so it does not crash if the user click's -+ the "OK" button when no language is selected. -+ + Fix to ensure that the login dialog regains focus after the -+ language or layout dialogs are used. -+ + The language dialog has improved logic to sort the language -+ names more correctly. -+ + Make sure to check error variable is not NULL before -+ referencing it in the gdm-user-manager code. -+ + Make sure to not print NULL strings since this causes crashes -+ on some platforms. -+ + Improve documentation. -+- Add gdm-build-fixes.patch to fix build. -+ -+------------------------------------------------------------------- -+Mon Sep 28 14:25:50 CEST 2009 - vuntz@opensuse.org -+ -+- Add gdm-xauthlocalhostname.patch: fix non-working user session -+ when the hostname changes during login. Fix shipstopper -+ bnc#538064. -+- Add gdm-default-wm.patch: gdm now reads the DEFAULT_WM setting in -+ /etc/sysconfig/windowmanager to know which session to use by -+ default instead of always using GNOME. -+ This should fix using GDM for XFCE. -+ -+------------------------------------------------------------------- - Tue Aug 25 14:03:14 CEST 2009 - vuntz@novell.com - - - Update to version 2.27.90: ---- gdm.spec.orig -+++ gdm.spec -@@ -1,5 +1,5 @@ - # --# spec file for package gdm (Version 2.27.90) -+# spec file for package gdm (Version 2.28.0) - # - # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. - # -@@ -41,7 +41,7 @@ BuildRequires: xorg-x11-server-extra - BuildRequires: zenity - License: GPL v2 or later - Group: System/GUI/GNOME --Version: 2.27.90 -+Version: 2.28.0 - Release: 1 - Summary: The GNOME 2.x Display Manager - Source: %{name}-%{version}.tar.bz2 -@@ -61,11 +61,11 @@ Patch6: gdm-desktop-session-env- - # PATCH-FIX-OPENSUSE gdm-suse-xsession.patch vuntz@novell.com -- Use the /etc/X11/xdm/* scripts - Patch7: gdm-suse-xsession.patch - # PATCH-NEEDS-REBASE gdm-domain-logon.patch hpj@novell.com -- Add UI to log in a specific domain (was: PATCH-FEATURE-SLED) --#Patch8: gdm-domain-logon.patch -+Patch8: gdm-domain-logon.patch - # PATCH-FIX-OPENSUSE gdm-sysconfig-settings.patch bnc432360 hpj@novell.com -- Read autologin options from /etc/sysconfig/displaymanager - Patch13: gdm-sysconfig-settings.patch - # PATCH-NEEDS-REBASE gdm-greeter-greater-ui.patch bnc436431 bgo560508 vuntz@novell.com -- Improve the layout of the greeter. Note: the patch contains a patched glade file *and* the result glade file (for reference only, in case we need to rebase the patch) (was PATCH-FIX-UPSTREAM) --#Patch15: gdm-greeter-greater-ui.patch -+Patch15: gdm-greeter-greater-ui.patch - # PATCH-FIX-UPSTREAM gdm-always-reflect-keyboard-layout.patch bnc438159 bgo561771 hpj@novell.com -- Make keyboard selector not neglect to apply the selected keyboard in some situations. - Patch18: gdm-always-reflect-keyboard-layout.patch - # PATCH-FIX-OPENSUSE gdm-save-panel-space-on-low-resolutions.patch bnc449815 hpj@novell.com -- Hide clock and/or selector labels on low resolutions. -@@ -78,6 +78,12 @@ Patch31: gdm-gconf-path.patch - Patch32: gdm-keyboard-from-hal.patch - # PATCH-FIX-OPENSUSE gdm-keyboard-from-sysconfig.patch bnc432360 bnc478083 hpj@novell.com -- Read keyboard options from sysconfig (for openSUSE <= 11.1, since keyboard layout wasn't in hal) - Patch33: gdm-keyboard-from-sysconfig.patch -+# PATCH-FIX-OPENSUSE gdm-default-wm.patch vuntz@novell.com -- Use sysconfig to know to which desktop to use by default -+Patch34: gdm-default-wm.patch -+# PATCH-FIX-OPENSUSE gdm-xauthlocalhostname.patch bgo555464 vuntz@novell.com -- Set XAUTHLOCALHOSTNAME to localhost for local logins to avoid issues in the session in case the hostname changes -+Patch35: gdm-xauthlocalhostname.patch -+# PATCH-FIX-UPSTREAM gdm-build-fixes.patch bgo596605 vuntz@novell.com -- Add missing return value -+Patch36: gdm-build-fixes.patch - # PATCH-FIX-OPENSUSE gdm-selinux.patch -- Small changes to make it compile fine with SELinux - Patch60: gdm-selinux.patch - Url: http://www.gnome.org/ -@@ -146,6 +152,9 @@ gnome-patch-translation-prepare - %else - %patch33 -p1 - %endif -+%patch34 -p1 -+%patch35 -p1 -+%patch36 -p1 - %patch60 - # gnome-patch-translation-update - From bb288c5b4f6fe534479e313d94d7ed349ec4b45737c025fc7b124a6e1fd79157 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 2 Oct 2009 10:22:55 +0000 Subject: [PATCH 06/10] Accepting request 21574 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/gdm via accept of submit request 21574 revision 2. OBS-URL: https://build.opensuse.org/request/show/21574 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=100 --- gdm-autologin-once.patch | 52 ++++++++++++++++++++++++++++++++++++++++ gdm.changes | 6 +++++ gdm.spec | 3 +++ 3 files changed, 61 insertions(+) create mode 100644 gdm-autologin-once.patch diff --git a/gdm-autologin-once.patch b/gdm-autologin-once.patch new file mode 100644 index 0000000..055e1ef --- /dev/null +++ b/gdm-autologin-once.patch @@ -0,0 +1,52 @@ +diff --git a/daemon/gdm-static-display.c b/daemon/gdm-static-display.c +index a747ee3..9605f5a 100644 +--- a/daemon/gdm-static-display.c ++++ b/daemon/gdm-static-display.c +@@ -45,7 +45,7 @@ + + struct GdmStaticDisplayPrivate + { +- gboolean enable_timed_login; ++ gboolean first_login; + }; + + enum { +@@ -121,6 +121,8 @@ gdm_static_display_unmanage (GdmDisplay *display) + { + g_return_val_if_fail (GDM_IS_DISPLAY (display), FALSE); + ++ GDM_STATIC_DISPLAY (display)->priv->first_login = FALSE; ++ + GDM_DISPLAY_CLASS (gdm_static_display_parent_class)->unmanage (display); + + return TRUE; +@@ -158,12 +160,14 @@ gdm_static_display_get_timed_login_details (GdmDisplay *display, + char **usernamep, + int *delayp) + { +- if (GDM_STATIC_DISPLAY (display)->priv->enable_timed_login) { +- GDM_DISPLAY_CLASS (gdm_static_display_parent_class)->get_timed_login_details (display, enabledp, usernamep, delayp); +- } else { +- *enabledp = FALSE; +- *usernamep = g_strdup (""); +- *delayp = 0; ++ GDM_DISPLAY_CLASS (gdm_static_display_parent_class)->get_timed_login_details (display, enabledp, usernamep, delayp); ++ ++ if (!GDM_STATIC_DISPLAY (display)->priv->first_login) { ++ /* if this is autologin but not timed login, then disable ++ * autologin after the first one */ ++ if (*enabledp && *delayp == 0) { ++ *enabledp = FALSE; ++ } + } + } + +@@ -196,7 +200,7 @@ gdm_static_display_init (GdmStaticDisplay *static_display) + + static_display->priv = GDM_STATIC_DISPLAY_GET_PRIVATE (static_display); + +- static_display->priv->enable_timed_login = TRUE; ++ static_display->priv->first_login = TRUE; + } + + static void diff --git a/gdm.changes b/gdm.changes index aafd25a..7b045f4 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Oct 2 00:47:14 CEST 2009 - vuntz@opensuse.org + +- Add gdm-autologin-once.patch: we don't want to autologin again + after a logout. Fix bnc#532090. + ------------------------------------------------------------------- Mon Sep 28 14:59:45 CEST 2009 - vuntz@opensuse.org diff --git a/gdm.spec b/gdm.spec index decc8e6..731eb73 100644 --- a/gdm.spec +++ b/gdm.spec @@ -84,6 +84,8 @@ Patch34: gdm-default-wm.patch Patch35: gdm-xauthlocalhostname.patch # PATCH-FIX-UPSTREAM gdm-build-fixes.patch bgo596605 vuntz@novell.com -- Add missing return value Patch36: gdm-build-fixes.patch +# PATCH-FIX-UPSTREAM gdm-autologin-once.patch bgo587606 vuntz@novell.com -- Make autologin work only once +Patch37: gdm-autologin-once.patch # PATCH-FIX-OPENSUSE gdm-selinux.patch -- Small changes to make it compile fine with SELinux Patch60: gdm-selinux.patch Url: http://www.gnome.org/ @@ -155,6 +157,7 @@ gnome-patch-translation-prepare %patch34 -p1 %patch35 -p1 %patch36 -p1 +%patch37 -p1 %patch60 # gnome-patch-translation-update From b6a44adcc8c27e7b49ae7d13a07fa56bcdb359bfb88332e83eeeff1b38eb4ed4 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 2 Oct 2009 15:26:52 +0000 Subject: [PATCH 07/10] Accepting request 21607 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/gdm via accept of submit request 21607 revision 2. OBS-URL: https://build.opensuse.org/request/show/21607 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=101 --- gdm.changes | 6 ++++++ gdm.spec | 1 + 2 files changed, 7 insertions(+) diff --git a/gdm.changes b/gdm.changes index 7b045f4..0aa326a 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Oct 2 17:25:38 CEST 2009 - vuntz@opensuse.org + +- Make sure to package /var/cache/gdm: without it, gdm doesn't use + the configured language/layout for the user. + ------------------------------------------------------------------- Fri Oct 2 00:47:14 CEST 2009 - vuntz@opensuse.org diff --git a/gdm.spec b/gdm.spec index 731eb73..e1ee1de 100644 --- a/gdm.spec +++ b/gdm.spec @@ -251,6 +251,7 @@ fi %attr(750,gdm,gdm) %dir %{_localstatedir}/lib/gdm/.gconf.mandatory %attr(640,gdm,gdm) %{_localstatedir}/lib/gdm/.gconf.mandatory/%gconf-tree.xml %attr(640,gdm,gdm) %{_localstatedir}/lib/gdm/.gconf.path +%dir %{_localstatedir}/cache/gdm %config /etc/pam.d/* /sbin/conf.d/SuSEconfig.gdm %config %{_sysconfdir}/dbus-1/system.d/gdm.conf From efcb544327f9b1740a3a753e2df7ecb8a48a92a7b32f4fbf19687c3ee1ce8827 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 2 Oct 2009 20:59:21 +0000 Subject: [PATCH 08/10] Accepting request 21619 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/gdm via accept of submit request 21619 revision 3. OBS-URL: https://build.opensuse.org/request/show/21619 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=102 --- gdm-devkit-power.patch | 186 ++++ gdm-greeter-greater-ui.patch | 1922 ++++++++++++++++++++++++++-------- gdm-polkit-gnome-path.patch | 11 + gdm.changes | 11 + gdm.spec | 11 +- 5 files changed, 1697 insertions(+), 444 deletions(-) create mode 100644 gdm-devkit-power.patch create mode 100644 gdm-polkit-gnome-path.patch diff --git a/gdm-devkit-power.patch b/gdm-devkit-power.patch new file mode 100644 index 0000000..29fae72 --- /dev/null +++ b/gdm-devkit-power.patch @@ -0,0 +1,186 @@ +From aa132a553b871a19a8d23fe8e9d93f736f2a4faf Mon Sep 17 00:00:00 2001 +From: Richard Hughes +Date: Mon, 28 Sep 2009 09:14:33 +0100 +Subject: [PATCH] Convert gdm from using gnome-power-manager to DeviceKit-power + +--- + configure.ac | 7 ++ + gui/simple-greeter/Makefile.am | 4 + + gui/simple-greeter/gdm-greeter-login-window.c | 84 ++++++------------------- + 3 files changed, 31 insertions(+), 64 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 756890a..2cae1cf 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -51,6 +51,7 @@ LIBXKLAVIER_REQUIRED_VERSION=4.0 + LIBCANBERRA_GTK_REQUIRED_VERSION=0.4 + #FONTCONFIG_REQUIRED_VERSION=2.6.0 + FONTCONFIG_REQUIRED_VERSION=2.5.0 ++DEVKIT_POWER_REQUIRED_VERSION=008 + + EXTRA_COMPILE_WARNINGS(yes) + +@@ -103,6 +104,12 @@ PKG_CHECK_MODULES(GCONF, + AC_SUBST(GCONF_CFLAGS) + AC_SUBST(GCONF_LIBS) + ++PKG_CHECK_MODULES(DEVKIT_POWER, ++ devkit-power-gobject >= $DEVKIT_POWER_REQUIRED_VERSION ++) ++AC_SUBST(DEVKIT_POWER_CFLAGS) ++AC_SUBST(DEVKIT_POWER_LIBS) ++ + PKG_CHECK_MODULES(SIMPLE_GREETER, + dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION + gtk+-2.0 >= $GTK_REQUIRED_VERSION +diff --git a/gui/simple-greeter/Makefile.am b/gui/simple-greeter/Makefile.am +index 8c9ae46..4c06bc3 100644 +--- a/gui/simple-greeter/Makefile.am ++++ b/gui/simple-greeter/Makefile.am +@@ -18,6 +18,8 @@ AM_CPPFLAGS = \ + -DSBINDIR=\""$(sbindir)"\" \ + -DGDM_CACHE_DIR=\""$(localstatedir)/cache/gdm"\" \ + -DAT_SPI_REGISTRYD_DIR="\"$(AT_SPI_REGISTRYD_DIR)\"" \ ++ $(DEVKIT_POWER_CFLAGS) \ ++ -DI_KNOW_THE_DEVICEKIT_POWER_API_IS_SUBJECT_TO_CHANGE \ + $(DISABLE_DEPRECATED_CFLAGS) \ + $(GTK_CFLAGS) \ + $(SIMPLE_GREETER_CFLAGS) \ +@@ -90,6 +92,7 @@ test_greeter_login_window_LDADD = \ + libgdmuser.la \ + $(COMMON_LIBS) \ + $(SIMPLE_GREETER_LIBS) \ ++ $(DEVKIT_POWER_LIBS) \ + $(RBAC_LIBS) \ + $(NULL) + +@@ -324,6 +327,7 @@ gdm_simple_greeter_LDADD = \ + $(SIMPLE_GREETER_LIBS) \ + $(RBAC_LIBS) \ + $(LIBXKLAVIER_LIBS) \ ++ $(DEVKIT_POWER_LIBS) \ + $(NULL) + + gladedir = $(pkgdatadir) +diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c +index c7ea5d6..7d4ef83 100644 +--- a/gui/simple-greeter/gdm-greeter-login-window.c ++++ b/gui/simple-greeter/gdm-greeter-login-window.c +@@ -56,6 +56,8 @@ + #include + #include + ++#include ++ + #include "gdm-settings-client.h" + #include "gdm-settings-keys.h" + #include "gdm-profile.h" +@@ -79,10 +81,6 @@ + #define CK_SEAT_INTERFACE "org.freedesktop.ConsoleKit.Seat" + #define CK_SESSION_INTERFACE "org.freedesktop.ConsoleKit.Session" + +-#define GPM_DBUS_NAME "org.freedesktop.PowerManagement" +-#define GPM_DBUS_PATH "/org/freedesktop/PowerManagement" +-#define GPM_DBUS_INTERFACE "org.freedesktop.PowerManagement" +- + #define GLADE_XML_FILE "gdm-greeter-login-window.glade" + + #define KEY_GREETER_DIR "/apps/gdm/simple-greeter" +@@ -480,40 +478,15 @@ adjust_other_login_visibility(GdmGreeterLoginWindow *login_window) + static gboolean + can_suspend (GdmGreeterLoginWindow *login_window) + { +- DBusGConnection *connection; +- DBusGProxy *proxy; +- GError *error; +- gboolean ret; +- gboolean res; +- +- error = NULL; +- connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error); +- if (error != NULL) { +- g_warning ("Couldn't connect to power manager: %s", error->message); +- g_error_free (error); +- return FALSE; +- } +- proxy = dbus_g_proxy_new_for_name (connection, +- GPM_DBUS_NAME, +- GPM_DBUS_PATH, +- GPM_DBUS_INTERFACE); +- ret = FALSE; +- +- res = dbus_g_proxy_call (proxy, "CanSuspend", +- &error, +- G_TYPE_INVALID, +- G_TYPE_BOOLEAN, +- &ret, +- G_TYPE_INVALID); +- if (! res) { +- if (error != NULL) { +- g_warning ("Could not ask power manager if user can suspend: %s", +- error->message); +- g_error_free (error); +- } +- ret = FALSE; +- } ++ gboolean ret; ++ DkpClient *dkp_client; + ++ /* use DeviceKit-power to get data */ ++ dkp_client = dkp_client_new (); ++ g_object_get (dkp_client, ++ "can-suspend", &ret, ++ NULL); ++ g_object_unref (dkp_client); + return ret; + } + +@@ -655,36 +628,19 @@ do_disconnect (GdmGreeterLoginWindow *login_window) + static void + do_suspend (GdmGreeterLoginWindow *login_window) + { +- GError *error; +- DBusGConnection *connection; +- DBusGProxy *proxy; ++ gboolean ret; ++ DkpClient *dkp_client; ++ GError *error = NULL; + +- g_debug ("GdmGreeterLoginWindow: Suspend button clicked"); +- +- error = NULL; +- connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error); +- if (error != NULL) { ++ /* use DeviceKit-power to get data */ ++ dkp_client = dkp_client_new (); ++ ret = dkp_client_suspend (dkp_client, &error); ++ if (!ret) { + g_warning ("Couldn't suspend: %s", error->message); + g_error_free (error); + return; + } +- proxy = dbus_g_proxy_new_for_name (connection, +- GPM_DBUS_NAME, +- GPM_DBUS_PATH, +- GPM_DBUS_INTERFACE); +- error = NULL; +- dbus_g_proxy_call (proxy, +- "Suspend", +- &error, +- G_TYPE_INVALID, +- G_TYPE_INVALID); +- if (error != NULL) { +- g_warning ("Couldn't suspend: %s", error->message); +- g_error_free (error); +- return; +- } +- +- g_object_unref (proxy); ++ g_object_unref (dkp_client); + } + + static void +-- +1.6.4.4 + diff --git a/gdm-greeter-greater-ui.patch b/gdm-greeter-greater-ui.patch index 057b406..28852a3 100644 --- a/gdm-greeter-greater-ui.patch +++ b/gdm-greeter-greater-ui.patch @@ -1,8 +1,8 @@ -Index: gdm-2.24.0/gui/simple-greeter/gdm-greeter-login-window.c +Index: gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.c =================================================================== ---- gdm-2.24.0.orig/gui/simple-greeter/gdm-greeter-login-window.c -+++ gdm-2.24.0/gui/simple-greeter/gdm-greeter-login-window.c -@@ -1414,29 +1414,6 @@ on_user_unchosen (GdmUserChooserWidget +--- gdm-2.28.0.orig/gui/simple-greeter/gdm-greeter-login-window.c ++++ gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.c +@@ -1199,29 +1199,6 @@ on_user_unchosen (GdmUserChooserWidget do_cancel (login_window); } @@ -32,7 +32,7 @@ Index: gdm-2.24.0/gui/simple-greeter/gdm-greeter-login-window.c static char * file_read_one_line (const char *filename) { -@@ -1529,9 +1506,12 @@ create_computer_info (GdmGreeterLoginWin +@@ -1314,9 +1291,12 @@ create_computer_info (GdmGreeterLoginWin label = glade_xml_get_widget (login_window->priv->xml, "computer-info-version-label"); if (label != NULL) { char *version; @@ -46,7 +46,7 @@ Index: gdm-2.24.0/gui/simple-greeter/gdm-greeter-login-window.c } gdm_profile_end (NULL); -@@ -1667,9 +1647,6 @@ load_theme (GdmGreeterLoginWindow *login +@@ -1455,9 +1435,6 @@ load_theme (GdmGreeterLoginWindow *login create_computer_info (login_window); @@ -56,508 +56,1546 @@ Index: gdm-2.24.0/gui/simple-greeter/gdm-greeter-login-window.c switch_mode (login_window, MODE_SELECTION); gdm_profile_end (NULL); -Index: gdm-2.24.0/gui/simple-greeter/gdm-greeter-login-window.glade +Index: gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.glade =================================================================== ---- gdm-2.24.0.orig/gui/simple-greeter/gdm-greeter-login-window.glade -+++ gdm-2.24.0/gui/simple-greeter/gdm-greeter-login-window.glade -@@ -1,9 +1,7 @@ -- -- -- +--- gdm-2.28.0.orig/gui/simple-greeter/gdm-greeter-login-window.glade ++++ gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.glade +@@ -1,789 +1,374 @@ +- +- +- + -+ - -- 400 - True - 12 - Authentication Dialog -@@ -13,100 +11,67 @@ - True - 10 - -- -+ - True -+ 12 - - - True -- 64 -+ 0 -+ 48 - computer - -+ -+ False -+ False -+ - -- -- -- False -- False -- -- -- -- -- False -- True -- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - -- -+ - True -- False -- False -+ 6 - -- -+ - True -- Computer Name -+ 0 -+ Version -+ True - - - -- -+ - True -- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK -- page 5 -+ 0 -+ Computer Name - - -- tab -- False -+ 1 - - - -- -+ - True -- Version -+ 6 -+ -+ -+ True -+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK -+ 0 -+ GTK_JUSTIFY_CENTER -+ True -+ -+ - - -- 1 -- -- -- -- -- -- tab -- -- -- -- -- -- -- -- -- tab -- -- -- -- -- -- -- -- -- tab -+ 2 - - - -+ -+ 1 -+ - - -- -- False -- False -- 1 -- -- -- -- -- True -- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK -- GTK_JUSTIFY_CENTER -- True -- -- -- 3 -- - - - -@@ -138,7 +103,7 @@ - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK -- • -+ • - True - - -@@ -189,7 +154,7 @@ - - - -- 5 -+ 1 - - - -Index: gdm-2.24.0/gui/simple-greeter/gdm-greeter-login-window.glade.new -=================================================================== ---- /dev/null -+++ gdm-2.24.0/gui/simple-greeter/gdm-greeter-login-window.glade.new -@@ -0,0 +1,334 @@ -+ -+ -+ +- +- +- 400 +- True +- Authentication Dialog +- GTK_WINDOW_TOPLEVEL +- GTK_WIN_POS_NONE +- False +- True +- False +- True +- False +- False +- GDK_WINDOW_TYPE_HINT_DIALOG +- GDK_GRAVITY_NORTH_WEST +- True +- False +- +- +- +- True +- 0 +- 0.5 +- GTK_SHADOW_OUT +- +- +- +- 24 +- True +- 0.5 +- 0.5 +- 1 +- 1 +- 0 +- 0 +- 0 +- 0 +- +- +- +- True +- False +- 10 +- +- +- +- True +- 0.5 +- 0.5 +- 1 +- 1 +- 0 +- 0 +- 0 +- 0 +- +- +- +- True +- computer +- 64 +- 0.5 +- 0.5 +- 0 +- 0 +- +- +- +- +- 0 +- False +- False +- +- +- +- +- +- True +- False +- False +- +- +- +- True +- False +- False +- GTK_POS_TOP +- False +- False +- +- +- +- True +- Computer Name +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- False +- True +- +- +- +- +- +- True +- page 5 +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- tab +- +- +- +- +- +- True +- Version +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- False +- True +- +- +- +- +- +- True +- +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- tab +- +- +- +- +- +- +- +- +- +- True +- +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- tab +- +- +- +- +- +- +- +- +- +- True +- +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- tab +- +- +- +- +- +- +- +- +- +- True +- +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- tab +- +- +- +- +- +- +- +- +- +- True +- +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- tab +- +- +- +- +- +- +- +- +- +- True +- +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- tab +- +- +- +- +- +- +- 0 +- False +- False +- +- +- +- +- +- True +- GTK_BUTTONBOX_END +- 6 +- +- +- +- True +- True +- gtk-disconnect +- True +- GTK_RELIEF_NORMAL +- True +- +- +- +- +- +- True +- True +- True +- True +- GTK_RELIEF_NORMAL +- True +- +- +- +- True +- False +- 0 +- +- +- +- True +- media-playback-pause +- 16 +- 0.5 +- 0.5 +- 0 +- 0 +- +- +- 0 +- True +- True +- +- +- +- +- +- True +- Suspend +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- 0 +- True +- True +- +- +- +- +- +- +- +- +- +- True +- True +- True +- True +- GTK_RELIEF_NORMAL +- True +- +- +- +- True +- False +- 0 +- +- +- +- True +- view-refresh +- 16 +- 0.5 +- 0.5 +- 0 +- 0 +- +- +- 0 +- True +- True +- +- +- +- +- +- True +- Restart +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- 0 +- True +- True +- +- +- +- +- +- +- +- +- +- True +- True +- True +- True +- GTK_RELIEF_NORMAL +- True +- +- +- +- True +- False +- 0 +- +- +- +- True +- system-shutdown +- 16 +- 0.5 +- 0.5 +- 0 +- 0 +- +- +- 0 +- True +- True +- +- +- +- +- +- True +- Shut Down +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- 0 +- True +- True +- +- +- +- +- +- +- +- +- +- True +- True +- gtk-cancel +- True +- GTK_RELIEF_NORMAL +- True +- +- +- +- +- +- True +- True +- True +- True +- GTK_RELIEF_NORMAL +- True +- +- +- +- True +- False +- 0 +- +- +- +- True +- go-home +- 16 +- 0.5 +- 0.5 +- 0 +- 0 +- +- +- 0 +- True +- True +- +- +- +- +- +- True +- Log In +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- 0 +- True +- True +- +- +- +- +- +- +- +- +- 0 +- False +- False +- GTK_PACK_END +- +- +- +- +- +- True +- +- False +- False +- GTK_JUSTIFY_CENTER +- True +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- 0 +- True +- True +- +- +- +- +- +- True +- 0.5 +- 0.5 +- 1 +- 1 +- 0 +- 0 +- 0 +- 0 +- +- +- +- True +- False +- 10 +- +- +- +- True +- 0 +- 0 +- Tue, 18 Nov 2008 21:55:38 GMT +- +- +- 0 +- True +- True +- +- +- +- +- +- True +- False +- 6 +- +- +- +- True +- +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- 0 +- False +- False +- +- +- +- +- +- True +- True +- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK +- True +- True +- 0 +- +- True +- True +- +- +- 0 +- True +- True +- +- +- +- +- +- +- +- +- 0 +- False +- False +- +- +- +- +- +- True +- False +- 0 +- +- +- +- True +- +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- 0 +- True +- True +- +- +- +- +- 0 +- False +- False +- +- +- +- +- +- +- 0 +- True +- True +- +- +- +- +- +- +- +- +- +- +- +- +- +- ++ ++ + ++ 400 + True -+ 12 + Authentication Dialog -+ GDK_WINDOW_TYPE_HINT_DIALOG ++ dialog + -+ ++ + True -+ 10 -+ -+ -+ True -+ 12 -+ -+ -+ True -+ 0 -+ 48 -+ computer -+ -+ -+ False -+ False -+ -+ -+ -+ -+ True -+ 6 -+ -+ -+ True -+ 0 -+ Version -+ True -+ -+ -+ -+ -+ True -+ 0 -+ Computer Name -+ -+ -+ 1 -+ -+ -+ -+ -+ True -+ 6 -+ -+ -+ True -+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK -+ 0 -+ GTK_JUSTIFY_CENTER -+ True -+ -+ -+ -+ -+ 2 -+ -+ -+ -+ -+ 1 -+ -+ -+ -+ ++ 0 ++ out + + + True ++ 24 + -+ ++ + True ++ vertical + 10 + -+ ++ + True -+ -+ -+ -+ -+ True -+ 6 ++ 12 + -+ ++ + True ++ 0 ++ 48 ++ computer + + + False + False ++ 0 + + + -+ ++ + True -+ True -+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK -+ • -+ True ++ vertical ++ 6 ++ ++ ++ True ++ 0 ++ Version ++ ++ ++ 0 ++ ++ ++ ++ ++ True ++ 0 ++ Computer Name ++ ++ ++ 1 ++ ++ ++ ++ ++ True ++ ++ ++ True ++ 0 ++ center ++ True ++ ++ ++ ++ ++ False ++ False ++ 2 ++ ++ + + + 1 + + ++ ++ ++ 0 ++ ++ ++ ++ ++ True + -+ ++ ++ True ++ vertical ++ 10 ++ ++ ++ True ++ ++ ++ 0 ++ ++ ++ ++ ++ True ++ 6 ++ ++ ++ True ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ True ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ ● ++ True ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ True ++ ++ ++ True ++ ++ ++ 0 ++ ++ ++ ++ ++ False ++ False ++ 2 ++ ++ ++ + + + -+ False -+ False + 1 + + + -+ ++ + True ++ 6 ++ end + -+ ++ ++ gtk-disconnect + True ++ True ++ True ++ True + ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ True ++ True ++ True ++ True ++ True ++ ++ ++ True ++ ++ ++ True ++ 16 ++ media-playback-pause ++ ++ ++ 0 ++ ++ ++ ++ ++ True ++ 0 ++ Suspend ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ True ++ True ++ True ++ True ++ True ++ ++ ++ True ++ ++ ++ True ++ 16 ++ view-refresh ++ ++ ++ 0 ++ ++ ++ ++ ++ True ++ 0 ++ Restart ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ False ++ False ++ 2 ++ ++ ++ ++ ++ True ++ True ++ True ++ True ++ True ++ ++ ++ True ++ ++ ++ True ++ 16 ++ system-shutdown ++ ++ ++ 0 ++ ++ ++ ++ ++ True ++ Shut Down ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ False ++ False ++ 3 ++ ++ ++ ++ ++ gtk-cancel ++ True ++ True ++ True ++ True ++ ++ ++ False ++ False ++ 4 ++ ++ ++ ++ ++ True ++ True ++ True ++ True ++ True ++ ++ ++ True ++ ++ ++ True ++ 16 ++ go-home ++ ++ ++ 0 ++ ++ ++ ++ ++ True ++ 0 ++ Log In ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ False ++ False ++ 5 ++ + + + + False + False ++ end + 2 + + ++ ++ ++ ++ ++ ++ ++ + +Index: gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.glade.new +=================================================================== +--- /dev/null ++++ gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.glade.new +@@ -0,0 +1,374 @@ ++ ++ ++ ++ ++ ++ 400 ++ True ++ Authentication Dialog ++ dialog ++ ++ ++ True ++ 0 ++ out ++ ++ ++ True ++ 24 ++ ++ ++ True ++ vertical ++ 10 + -+ ++ ++ True ++ 12 ++ ++ ++ True ++ 0 ++ 48 ++ computer ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ True ++ vertical ++ 6 ++ ++ ++ True ++ 0 ++ Version ++ ++ ++ 0 ++ ++ ++ ++ ++ True ++ 0 ++ Computer Name ++ ++ ++ 1 ++ ++ ++ ++ ++ True ++ ++ ++ True ++ 0 ++ center ++ True ++ ++ ++ ++ ++ False ++ False ++ 2 ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ 0 ++ ++ ++ ++ + True + -+ ++ + True ++ vertical ++ 10 ++ ++ ++ True ++ ++ ++ 0 ++ ++ ++ ++ ++ True ++ 6 ++ ++ ++ True ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ True ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ ● ++ True ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ True ++ ++ ++ True ++ ++ ++ 0 ++ ++ ++ ++ ++ False ++ False ++ 2 ++ ++ + + + + ++ 1 ++ ++ ++ ++ ++ True ++ 6 ++ end ++ ++ ++ gtk-disconnect ++ True ++ True ++ True ++ True ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ True ++ True ++ True ++ True ++ True ++ ++ ++ True ++ ++ ++ True ++ 16 ++ media-playback-pause ++ ++ ++ 0 ++ ++ ++ ++ ++ True ++ 0 ++ Suspend ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ True ++ True ++ True ++ True ++ True ++ ++ ++ True ++ ++ ++ True ++ 16 ++ view-refresh ++ ++ ++ 0 ++ ++ ++ ++ ++ True ++ 0 ++ Restart ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ False ++ False ++ 2 ++ ++ ++ ++ ++ True ++ True ++ True ++ True ++ True ++ ++ ++ True ++ ++ ++ True ++ 16 ++ system-shutdown ++ ++ ++ 0 ++ ++ ++ ++ ++ True ++ Shut Down ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ False ++ False ++ 3 ++ ++ ++ ++ ++ gtk-cancel ++ True ++ True ++ True ++ True ++ ++ ++ False ++ False ++ 4 ++ ++ ++ ++ ++ True ++ True ++ True ++ True ++ True ++ ++ ++ True ++ ++ ++ True ++ 16 ++ go-home ++ ++ ++ 0 ++ ++ ++ ++ ++ True ++ 0 ++ Log In ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ False ++ False ++ 5 ++ ++ ++ ++ + False + False -+ 3 ++ end ++ 2 + + + + + -+ -+ 1 -+ -+ -+ -+ -+ True -+ 6 -+ GTK_BUTTONBOX_END -+ -+ -+ True -+ True -+ True -+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK -+ gtk-disconnect -+ True -+ 0 -+ -+ -+ -+ -+ True -+ True -+ True -+ True -+ 0 -+ -+ -+ True -+ -+ -+ True -+ 16 -+ media-playback-pause -+ -+ -+ -+ -+ True -+ 0 -+ Suspend -+ -+ -+ 1 -+ -+ -+ -+ -+ -+ -+ 1 -+ -+ -+ -+ -+ True -+ True -+ True -+ True -+ 0 -+ -+ -+ True -+ -+ -+ True -+ 16 -+ view-refresh -+ -+ -+ -+ -+ True -+ 0 -+ Restart -+ -+ -+ 1 -+ -+ -+ -+ -+ -+ -+ 2 -+ -+ -+ -+ -+ True -+ True -+ True -+ True -+ 0 -+ -+ -+ True -+ -+ -+ True -+ 16 -+ system-shutdown -+ -+ -+ -+ -+ True -+ Shut Down -+ -+ -+ 1 -+ -+ -+ -+ -+ -+ -+ 3 -+ -+ -+ -+ -+ True -+ True -+ gtk-cancel -+ True -+ 0 -+ -+ -+ 4 -+ -+ -+ -+ -+ True -+ True -+ True -+ True -+ 0 -+ -+ -+ True -+ -+ -+ True -+ 16 -+ go-home -+ -+ -+ -+ -+ True -+ 0 -+ Log In -+ -+ -+ 1 -+ -+ -+ -+ -+ -+ -+ 5 -+ -+ -+ -+ -+ False -+ False -+ GTK_PACK_END -+ 2 -+ + + + diff --git a/gdm-polkit-gnome-path.patch b/gdm-polkit-gnome-path.patch new file mode 100644 index 0000000..6df8da4 --- /dev/null +++ b/gdm-polkit-gnome-path.patch @@ -0,0 +1,11 @@ +Index: gdm-2.28.0/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in +=================================================================== +--- gdm-2.28.0.orig/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in ++++ gdm-2.28.0/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in +@@ -1,5 +1,5 @@ + [Desktop Entry] + Type=Application + _Name=PolicyKit Authentication Agent +-Exec=/usr/libexec/polkit-gnome-authentication-agent-1 ++Exec=/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 + OnlyShowIn=GNOME; diff --git a/gdm.changes b/gdm.changes index 0aa326a..fc4c00c 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Oct 2 19:33:46 CEST 2009 - vuntz@opensuse.org + +- Add gdm-devkit-power.patch: gdm was using a dbus API which + doesn't exist anymore, and the right way to handle this is to use + DeviceKit-power. +- Add DeviceKit-power-devel BuildRequires for the patch. +- Add gdm-polkit-gnome-path.patch to use the correct path for the + polkit agent. +- Rebase gdm-greeter-greater-ui.patch. Fix bnc#533597. + ------------------------------------------------------------------- Fri Oct 2 17:25:38 CEST 2009 - vuntz@opensuse.org diff --git a/gdm.spec b/gdm.spec index e1ee1de..bc9fa5d 100644 --- a/gdm.spec +++ b/gdm.spec @@ -19,6 +19,7 @@ Name: gdm +BuildRequires: DeviceKit-power-devel BuildRequires: check-devel BuildRequires: fdupes BuildRequires: gconf2-devel @@ -64,7 +65,7 @@ Patch7: gdm-suse-xsession.patch Patch8: gdm-domain-logon.patch # PATCH-FIX-OPENSUSE gdm-sysconfig-settings.patch bnc432360 hpj@novell.com -- Read autologin options from /etc/sysconfig/displaymanager Patch13: gdm-sysconfig-settings.patch -# PATCH-NEEDS-REBASE gdm-greeter-greater-ui.patch bnc436431 bgo560508 vuntz@novell.com -- Improve the layout of the greeter. Note: the patch contains a patched glade file *and* the result glade file (for reference only, in case we need to rebase the patch) (was PATCH-FIX-UPSTREAM) +# PATCH-FIX-UPSTREAM gdm-greeter-greater-ui.patch bnc436431 bgo560508 vuntz@novell.com -- Improve the layout of the greeter. Note: the patch contains a patched glade file *and* the result glade file (for reference only, in case we need to rebase the patch) Patch15: gdm-greeter-greater-ui.patch # PATCH-FIX-UPSTREAM gdm-always-reflect-keyboard-layout.patch bnc438159 bgo561771 hpj@novell.com -- Make keyboard selector not neglect to apply the selected keyboard in some situations. Patch18: gdm-always-reflect-keyboard-layout.patch @@ -86,6 +87,10 @@ Patch35: gdm-xauthlocalhostname.patch Patch36: gdm-build-fixes.patch # PATCH-FIX-UPSTREAM gdm-autologin-once.patch bgo587606 vuntz@novell.com -- Make autologin work only once Patch37: gdm-autologin-once.patch +# PATCH-FIX-UPSTREAM gdm-devkit-power.patch bgo596569 vuntz@opensuse.org -- Use devkit-power instead of non-existing dbus API, patch from upstream +Patch38: gdm-devkit-power.patch +# PATCH-FIX-UPSTREAM gdm-polkit-gnome-path.patch bgo597050 vuntz@opensuse.org -- Use the right patch for the polkit agent. The current patch is a quick workaround for now, until we know how upstream wants to fix this. +Patch39: gdm-polkit-gnome-path.patch # PATCH-FIX-OPENSUSE gdm-selinux.patch -- Small changes to make it compile fine with SELinux Patch60: gdm-selinux.patch Url: http://www.gnome.org/ @@ -144,7 +149,7 @@ gnome-patch-translation-prepare # NEEDS-REBASE - also re-enable gnome-patch-translation-update after patch rebase # %%patch8 -p1 %patch13 -p1 -# %%patch15 -p1 +%patch15 -p1 %patch18 -p1 %patch19 -p1 %patch20 -p1 @@ -158,6 +163,8 @@ gnome-patch-translation-prepare %patch35 -p1 %patch36 -p1 %patch37 -p1 +%patch38 -p1 +%patch39 -p1 %patch60 # gnome-patch-translation-update From a3595f3e08b3fdab2a534bc20b8e8ad55da16c59fc0c4dc867b748def89651db Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 5 Oct 2009 23:59:04 +0000 Subject: [PATCH 09/10] checked in OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=103 --- gdm-2.27.90.tar.bz2 | 3 + gdm-2.28.0.tar.bz2 | 3 - gdm-autologin-once.patch | 52 - gdm-build-fixes.patch | 13 - gdm-devkit-power.patch | 186 --- gdm-greeter-greater-ui.patch | 1896 +++++------------------ gdm-keyboard-from-hal.patch | 31 +- gdm-polkit-gnome-path.patch | 11 - gdm-selecting-desktop-environment.patch | 21 +- gdm.changes | 49 - gdm.spec | 30 +- 11 files changed, 464 insertions(+), 1831 deletions(-) create mode 100644 gdm-2.27.90.tar.bz2 delete mode 100644 gdm-2.28.0.tar.bz2 delete mode 100644 gdm-autologin-once.patch delete mode 100644 gdm-build-fixes.patch delete mode 100644 gdm-devkit-power.patch delete mode 100644 gdm-polkit-gnome-path.patch diff --git a/gdm-2.27.90.tar.bz2 b/gdm-2.27.90.tar.bz2 new file mode 100644 index 0000000..1d2c2d2 --- /dev/null +++ b/gdm-2.27.90.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4e842a59285a456d9a9cc03e5519f027319fc254d98f818c275a7e90882ab6f9 +size 2392706 diff --git a/gdm-2.28.0.tar.bz2 b/gdm-2.28.0.tar.bz2 deleted file mode 100644 index 1a16303..0000000 --- a/gdm-2.28.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b83db2613192df8a8865ca59877de5181df6247cd17be42418cc5a39d314d5a4 -size 2314347 diff --git a/gdm-autologin-once.patch b/gdm-autologin-once.patch deleted file mode 100644 index 055e1ef..0000000 --- a/gdm-autologin-once.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/daemon/gdm-static-display.c b/daemon/gdm-static-display.c -index a747ee3..9605f5a 100644 ---- a/daemon/gdm-static-display.c -+++ b/daemon/gdm-static-display.c -@@ -45,7 +45,7 @@ - - struct GdmStaticDisplayPrivate - { -- gboolean enable_timed_login; -+ gboolean first_login; - }; - - enum { -@@ -121,6 +121,8 @@ gdm_static_display_unmanage (GdmDisplay *display) - { - g_return_val_if_fail (GDM_IS_DISPLAY (display), FALSE); - -+ GDM_STATIC_DISPLAY (display)->priv->first_login = FALSE; -+ - GDM_DISPLAY_CLASS (gdm_static_display_parent_class)->unmanage (display); - - return TRUE; -@@ -158,12 +160,14 @@ gdm_static_display_get_timed_login_details (GdmDisplay *display, - char **usernamep, - int *delayp) - { -- if (GDM_STATIC_DISPLAY (display)->priv->enable_timed_login) { -- GDM_DISPLAY_CLASS (gdm_static_display_parent_class)->get_timed_login_details (display, enabledp, usernamep, delayp); -- } else { -- *enabledp = FALSE; -- *usernamep = g_strdup (""); -- *delayp = 0; -+ GDM_DISPLAY_CLASS (gdm_static_display_parent_class)->get_timed_login_details (display, enabledp, usernamep, delayp); -+ -+ if (!GDM_STATIC_DISPLAY (display)->priv->first_login) { -+ /* if this is autologin but not timed login, then disable -+ * autologin after the first one */ -+ if (*enabledp && *delayp == 0) { -+ *enabledp = FALSE; -+ } - } - } - -@@ -196,7 +200,7 @@ gdm_static_display_init (GdmStaticDisplay *static_display) - - static_display->priv = GDM_STATIC_DISPLAY_GET_PRIVATE (static_display); - -- static_display->priv->enable_timed_login = TRUE; -+ static_display->priv->first_login = TRUE; - } - - static void diff --git a/gdm-build-fixes.patch b/gdm-build-fixes.patch deleted file mode 100644 index dbfd5b3..0000000 --- a/gdm-build-fixes.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: gdm-2.28.0/daemon/gdm-slave.c -=================================================================== ---- gdm-2.28.0.orig/daemon/gdm-slave.c -+++ gdm-2.28.0/daemon/gdm-slave.c -@@ -836,6 +836,8 @@ gdm_slave_parse_enriched_login (GdmSlave - } else { - return (g_strdup (username)); - } -+ -+ return NULL; - } - - gboolean diff --git a/gdm-devkit-power.patch b/gdm-devkit-power.patch deleted file mode 100644 index 29fae72..0000000 --- a/gdm-devkit-power.patch +++ /dev/null @@ -1,186 +0,0 @@ -From aa132a553b871a19a8d23fe8e9d93f736f2a4faf Mon Sep 17 00:00:00 2001 -From: Richard Hughes -Date: Mon, 28 Sep 2009 09:14:33 +0100 -Subject: [PATCH] Convert gdm from using gnome-power-manager to DeviceKit-power - ---- - configure.ac | 7 ++ - gui/simple-greeter/Makefile.am | 4 + - gui/simple-greeter/gdm-greeter-login-window.c | 84 ++++++------------------- - 3 files changed, 31 insertions(+), 64 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 756890a..2cae1cf 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -51,6 +51,7 @@ LIBXKLAVIER_REQUIRED_VERSION=4.0 - LIBCANBERRA_GTK_REQUIRED_VERSION=0.4 - #FONTCONFIG_REQUIRED_VERSION=2.6.0 - FONTCONFIG_REQUIRED_VERSION=2.5.0 -+DEVKIT_POWER_REQUIRED_VERSION=008 - - EXTRA_COMPILE_WARNINGS(yes) - -@@ -103,6 +104,12 @@ PKG_CHECK_MODULES(GCONF, - AC_SUBST(GCONF_CFLAGS) - AC_SUBST(GCONF_LIBS) - -+PKG_CHECK_MODULES(DEVKIT_POWER, -+ devkit-power-gobject >= $DEVKIT_POWER_REQUIRED_VERSION -+) -+AC_SUBST(DEVKIT_POWER_CFLAGS) -+AC_SUBST(DEVKIT_POWER_LIBS) -+ - PKG_CHECK_MODULES(SIMPLE_GREETER, - dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gtk+-2.0 >= $GTK_REQUIRED_VERSION -diff --git a/gui/simple-greeter/Makefile.am b/gui/simple-greeter/Makefile.am -index 8c9ae46..4c06bc3 100644 ---- a/gui/simple-greeter/Makefile.am -+++ b/gui/simple-greeter/Makefile.am -@@ -18,6 +18,8 @@ AM_CPPFLAGS = \ - -DSBINDIR=\""$(sbindir)"\" \ - -DGDM_CACHE_DIR=\""$(localstatedir)/cache/gdm"\" \ - -DAT_SPI_REGISTRYD_DIR="\"$(AT_SPI_REGISTRYD_DIR)\"" \ -+ $(DEVKIT_POWER_CFLAGS) \ -+ -DI_KNOW_THE_DEVICEKIT_POWER_API_IS_SUBJECT_TO_CHANGE \ - $(DISABLE_DEPRECATED_CFLAGS) \ - $(GTK_CFLAGS) \ - $(SIMPLE_GREETER_CFLAGS) \ -@@ -90,6 +92,7 @@ test_greeter_login_window_LDADD = \ - libgdmuser.la \ - $(COMMON_LIBS) \ - $(SIMPLE_GREETER_LIBS) \ -+ $(DEVKIT_POWER_LIBS) \ - $(RBAC_LIBS) \ - $(NULL) - -@@ -324,6 +327,7 @@ gdm_simple_greeter_LDADD = \ - $(SIMPLE_GREETER_LIBS) \ - $(RBAC_LIBS) \ - $(LIBXKLAVIER_LIBS) \ -+ $(DEVKIT_POWER_LIBS) \ - $(NULL) - - gladedir = $(pkgdatadir) -diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c -index c7ea5d6..7d4ef83 100644 ---- a/gui/simple-greeter/gdm-greeter-login-window.c -+++ b/gui/simple-greeter/gdm-greeter-login-window.c -@@ -56,6 +56,8 @@ - #include - #include - -+#include -+ - #include "gdm-settings-client.h" - #include "gdm-settings-keys.h" - #include "gdm-profile.h" -@@ -79,10 +81,6 @@ - #define CK_SEAT_INTERFACE "org.freedesktop.ConsoleKit.Seat" - #define CK_SESSION_INTERFACE "org.freedesktop.ConsoleKit.Session" - --#define GPM_DBUS_NAME "org.freedesktop.PowerManagement" --#define GPM_DBUS_PATH "/org/freedesktop/PowerManagement" --#define GPM_DBUS_INTERFACE "org.freedesktop.PowerManagement" -- - #define GLADE_XML_FILE "gdm-greeter-login-window.glade" - - #define KEY_GREETER_DIR "/apps/gdm/simple-greeter" -@@ -480,40 +478,15 @@ adjust_other_login_visibility(GdmGreeterLoginWindow *login_window) - static gboolean - can_suspend (GdmGreeterLoginWindow *login_window) - { -- DBusGConnection *connection; -- DBusGProxy *proxy; -- GError *error; -- gboolean ret; -- gboolean res; -- -- error = NULL; -- connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error); -- if (error != NULL) { -- g_warning ("Couldn't connect to power manager: %s", error->message); -- g_error_free (error); -- return FALSE; -- } -- proxy = dbus_g_proxy_new_for_name (connection, -- GPM_DBUS_NAME, -- GPM_DBUS_PATH, -- GPM_DBUS_INTERFACE); -- ret = FALSE; -- -- res = dbus_g_proxy_call (proxy, "CanSuspend", -- &error, -- G_TYPE_INVALID, -- G_TYPE_BOOLEAN, -- &ret, -- G_TYPE_INVALID); -- if (! res) { -- if (error != NULL) { -- g_warning ("Could not ask power manager if user can suspend: %s", -- error->message); -- g_error_free (error); -- } -- ret = FALSE; -- } -+ gboolean ret; -+ DkpClient *dkp_client; - -+ /* use DeviceKit-power to get data */ -+ dkp_client = dkp_client_new (); -+ g_object_get (dkp_client, -+ "can-suspend", &ret, -+ NULL); -+ g_object_unref (dkp_client); - return ret; - } - -@@ -655,36 +628,19 @@ do_disconnect (GdmGreeterLoginWindow *login_window) - static void - do_suspend (GdmGreeterLoginWindow *login_window) - { -- GError *error; -- DBusGConnection *connection; -- DBusGProxy *proxy; -+ gboolean ret; -+ DkpClient *dkp_client; -+ GError *error = NULL; - -- g_debug ("GdmGreeterLoginWindow: Suspend button clicked"); -- -- error = NULL; -- connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error); -- if (error != NULL) { -+ /* use DeviceKit-power to get data */ -+ dkp_client = dkp_client_new (); -+ ret = dkp_client_suspend (dkp_client, &error); -+ if (!ret) { - g_warning ("Couldn't suspend: %s", error->message); - g_error_free (error); - return; - } -- proxy = dbus_g_proxy_new_for_name (connection, -- GPM_DBUS_NAME, -- GPM_DBUS_PATH, -- GPM_DBUS_INTERFACE); -- error = NULL; -- dbus_g_proxy_call (proxy, -- "Suspend", -- &error, -- G_TYPE_INVALID, -- G_TYPE_INVALID); -- if (error != NULL) { -- g_warning ("Couldn't suspend: %s", error->message); -- g_error_free (error); -- return; -- } -- -- g_object_unref (proxy); -+ g_object_unref (dkp_client); - } - - static void --- -1.6.4.4 - diff --git a/gdm-greeter-greater-ui.patch b/gdm-greeter-greater-ui.patch index 28852a3..057b406 100644 --- a/gdm-greeter-greater-ui.patch +++ b/gdm-greeter-greater-ui.patch @@ -1,8 +1,8 @@ -Index: gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.c +Index: gdm-2.24.0/gui/simple-greeter/gdm-greeter-login-window.c =================================================================== ---- gdm-2.28.0.orig/gui/simple-greeter/gdm-greeter-login-window.c -+++ gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.c -@@ -1199,29 +1199,6 @@ on_user_unchosen (GdmUserChooserWidget +--- gdm-2.24.0.orig/gui/simple-greeter/gdm-greeter-login-window.c ++++ gdm-2.24.0/gui/simple-greeter/gdm-greeter-login-window.c +@@ -1414,29 +1414,6 @@ on_user_unchosen (GdmUserChooserWidget do_cancel (login_window); } @@ -32,7 +32,7 @@ Index: gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.c static char * file_read_one_line (const char *filename) { -@@ -1314,9 +1291,12 @@ create_computer_info (GdmGreeterLoginWin +@@ -1529,9 +1506,12 @@ create_computer_info (GdmGreeterLoginWin label = glade_xml_get_widget (login_window->priv->xml, "computer-info-version-label"); if (label != NULL) { char *version; @@ -46,7 +46,7 @@ Index: gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.c } gdm_profile_end (NULL); -@@ -1455,9 +1435,6 @@ load_theme (GdmGreeterLoginWindow *login +@@ -1667,9 +1647,6 @@ load_theme (GdmGreeterLoginWindow *login create_computer_info (login_window); @@ -56,1546 +56,508 @@ Index: gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.c switch_mode (login_window, MODE_SELECTION); gdm_profile_end (NULL); -Index: gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.glade +Index: gdm-2.24.0/gui/simple-greeter/gdm-greeter-login-window.glade =================================================================== ---- gdm-2.28.0.orig/gui/simple-greeter/gdm-greeter-login-window.glade -+++ gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.glade -@@ -1,789 +1,374 @@ -- -- -- +--- gdm-2.24.0.orig/gui/simple-greeter/gdm-greeter-login-window.glade ++++ gdm-2.24.0/gui/simple-greeter/gdm-greeter-login-window.glade +@@ -1,9 +1,7 @@ +- +- +- + -- -- -- 400 -- True -- Authentication Dialog -- GTK_WINDOW_TOPLEVEL -- GTK_WIN_POS_NONE -- False -- True -- False -- True -- False -- False -- GDK_WINDOW_TYPE_HINT_DIALOG -- GDK_GRAVITY_NORTH_WEST -- True -- False -- -- -- -- True -- 0 -- 0.5 -- GTK_SHADOW_OUT -- -- -- -- 24 -- True -- 0.5 -- 0.5 -- 1 -- 1 -- 0 -- 0 -- 0 -- 0 -- -- -- -- True -- False -- 10 -- -- -- -- True -- 0.5 -- 0.5 -- 1 -- 1 -- 0 -- 0 -- 0 -- 0 -- -- -- -- True -- computer -- 64 -- 0.5 -- 0.5 -- 0 -- 0 -- -- -- -- -- 0 -- False -- False -- -- -- -- -- -- True -- False -- False -- -- -- -- True -- False -- False -- GTK_POS_TOP -- False -- False -- -- -- -- True -- Computer Name -- False -- False -- GTK_JUSTIFY_LEFT -- False -- False -- 0.5 -- 0.5 -- 0 -- 0 -- PANGO_ELLIPSIZE_NONE -- -1 -- False -- 0 -- -- -- False -- True -- -- -- -- -- -- True -- page 5 -- False -- False -- GTK_JUSTIFY_LEFT -- False -- False -- 0.5 -- 0.5 -- 0 -- 0 -- PANGO_ELLIPSIZE_NONE -- -1 -- False -- 0 -- -- -- tab -- -- -- -- -- -- True -- Version -- False -- False -- GTK_JUSTIFY_LEFT -- False -- False -- 0.5 -- 0.5 -- 0 -- 0 -- PANGO_ELLIPSIZE_NONE -- -1 -- False -- 0 -- -- -- False -- True -- -- -- -- -- -- True -- -- False -- False -- GTK_JUSTIFY_LEFT -- False -- False -- 0.5 -- 0.5 -- 0 -- 0 -- PANGO_ELLIPSIZE_NONE -- -1 -- False -- 0 -- -- -- tab -- -- -- -- -- -- -- -- -- -- True -- -- False -- False -- GTK_JUSTIFY_LEFT -- False -- False -- 0.5 -- 0.5 -- 0 -- 0 -- PANGO_ELLIPSIZE_NONE -- -1 -- False -- 0 -- -- -- tab -- -- -- -- -- -- -- -- -- -- True -- -- False -- False -- GTK_JUSTIFY_LEFT -- False -- False -- 0.5 -- 0.5 -- 0 -- 0 -- PANGO_ELLIPSIZE_NONE -- -1 -- False -- 0 -- -- -- tab -- -- -- -- -- -- -- -- -- -- True -- -- False -- False -- GTK_JUSTIFY_LEFT -- False -- False -- 0.5 -- 0.5 -- 0 -- 0 -- PANGO_ELLIPSIZE_NONE -- -1 -- False -- 0 -- -- -- tab -- -- -- -- -- -- -- -- -- -- True -- -- False -- False -- GTK_JUSTIFY_LEFT -- False -- False -- 0.5 -- 0.5 -- 0 -- 0 -- PANGO_ELLIPSIZE_NONE -- -1 -- False -- 0 -- -- -- tab -- -- -- -- -- -- -- -- -- -- True -- -- False -- False -- GTK_JUSTIFY_LEFT -- False -- False -- 0.5 -- 0.5 -- 0 -- 0 -- PANGO_ELLIPSIZE_NONE -- -1 -- False -- 0 -- -- -- tab -- -- -- -- -- -- -- 0 -- False -- False -- -- -- -- -- -- True -- GTK_BUTTONBOX_END -- 6 -- -- -- -- True -- True -- gtk-disconnect -- True -- GTK_RELIEF_NORMAL -- True -- -- -- -- -- -- True -- True -- True -- True -- GTK_RELIEF_NORMAL -- True -- -- -- -- True -- False -- 0 -- -- -- -- True -- media-playback-pause -- 16 -- 0.5 -- 0.5 -- 0 -- 0 -- -- -- 0 -- True -- True -- -- -- -- -- -- True -- Suspend -- False -- False -- GTK_JUSTIFY_LEFT -- False -- False -- 0 -- 0.5 -- 0 -- 0 -- PANGO_ELLIPSIZE_NONE -- -1 -- False -- 0 -- -- -- 0 -- True -- True -- -- -- -- -- -- -- -- -- -- True -- True -- True -- True -- GTK_RELIEF_NORMAL -- True -- -- -- -- True -- False -- 0 -- -- -- -- True -- view-refresh -- 16 -- 0.5 -- 0.5 -- 0 -- 0 -- -- -- 0 -- True -- True -- -- -- -- -- -- True -- Restart -- False -- False -- GTK_JUSTIFY_LEFT -- False -- False -- 0 -- 0.5 -- 0 -- 0 -- PANGO_ELLIPSIZE_NONE -- -1 -- False -- 0 -- -- -- 0 -- True -- True -- -- -- -- -- -- -- -- -- -- True -- True -- True -- True -- GTK_RELIEF_NORMAL -- True -- -- -- -- True -- False -- 0 -- -- -- -- True -- system-shutdown -- 16 -- 0.5 -- 0.5 -- 0 -- 0 -- -- -- 0 -- True -- True -- -- -- -- -- -- True -- Shut Down -- False -- False -- GTK_JUSTIFY_LEFT -- False -- False -- 0.5 -- 0.5 -- 0 -- 0 -- PANGO_ELLIPSIZE_NONE -- -1 -- False -- 0 -- -- -- 0 -- True -- True -- -- -- -- -- -- -- -- -- -- True -- True -- gtk-cancel -- True -- GTK_RELIEF_NORMAL -- True -- -- -- -- -- -- True -- True -- True -- True -- GTK_RELIEF_NORMAL -- True -- -- -- -- True -- False -- 0 -- -- -- -- True -- go-home -- 16 -- 0.5 -- 0.5 -- 0 -- 0 -- -- -- 0 -- True -- True -- -- -- -- -- -- True -- Log In -- False -- False -- GTK_JUSTIFY_LEFT -- False -- False -- 0 -- 0.5 -- 0 -- 0 -- PANGO_ELLIPSIZE_NONE -- -1 -- False -- 0 -- -- -- 0 -- True -- True -- -- -- -- -- -- -- -- -- 0 -- False -- False -- GTK_PACK_END -- -- -- -- -- -- True -- -- False -- False -- GTK_JUSTIFY_CENTER -- True -- False -- 0.5 -- 0.5 -- 0 -- 0 -- PANGO_ELLIPSIZE_NONE -- -1 -- False -- 0 -- -- -- 0 -- True -- True -- -- -- -- -- -- True -- 0.5 -- 0.5 -- 1 -- 1 -- 0 -- 0 -- 0 -- 0 -- -- -- -- True -- False -- 10 -- -- -- -- True -- 0 -- 0 -- Tue, 18 Nov 2008 21:55:38 GMT -- -- -- 0 -- True -- True -- -- -- -- -- -- True -- False -- 6 -- -- -- -- True -- -- False -- False -- GTK_JUSTIFY_LEFT -- False -- False -- 0.5 -- 0.5 -- 0 -- 0 -- PANGO_ELLIPSIZE_NONE -- -1 -- False -- 0 -- -- -- 0 -- False -- False -- -- -- -- -- -- True -- True -- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK -- True -- True -- 0 -- -- True -- True -- -- -- 0 -- True -- True -- -- -- -- -- -- -- -- -- 0 -- False -- False -- -- -- -- -- -- True -- False -- 0 -- -- -- -- True -- -- False -- False -- GTK_JUSTIFY_LEFT -- False -- False -- 0.5 -- 0.5 -- 0 -- 0 -- PANGO_ELLIPSIZE_NONE -- -1 -- False -- 0 -- -- -- 0 -- True -- True -- -- -- -- -- 0 -- False -- False -- -- -- -- -- -- -- 0 -- True -- True -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -+ ++ + +- 400 + True + 12 + Authentication Dialog +@@ -13,100 +11,67 @@ + True + 10 + +- ++ + True ++ 12 + + + True +- 64 ++ 0 ++ 48 + computer + ++ ++ False ++ False ++ + +- +- +- False +- False +- +- +- +- +- False +- True +- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + +- ++ + True +- False +- False ++ 6 + +- ++ + True +- Computer Name ++ 0 ++ Version ++ True + + + +- ++ + True +- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK +- page 5 ++ 0 ++ Computer Name + + +- tab +- False ++ 1 + + + +- ++ + True +- Version ++ 6 ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ 0 ++ GTK_JUSTIFY_CENTER ++ True ++ ++ + + +- 1 +- +- +- +- +- +- tab +- +- +- +- +- +- +- +- +- tab +- +- +- +- +- +- +- +- +- tab ++ 2 + + + ++ ++ 1 ++ + + +- +- False +- False +- 1 +- +- +- +- +- True +- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK +- GTK_JUSTIFY_CENTER +- True +- +- +- 3 +- + + + +@@ -138,7 +103,7 @@ + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK +- • ++ • + True + + +@@ -189,7 +154,7 @@ + + + +- 5 ++ 1 + + + +Index: gdm-2.24.0/gui/simple-greeter/gdm-greeter-login-window.glade.new +=================================================================== +--- /dev/null ++++ gdm-2.24.0/gui/simple-greeter/gdm-greeter-login-window.glade.new +@@ -0,0 +1,334 @@ ++ ++ ++ + -+ 400 + True ++ 12 + Authentication Dialog -+ dialog ++ GDK_WINDOW_TYPE_HINT_DIALOG + -+ ++ + True -+ 0 -+ out ++ 10 + -+ ++ + True -+ 24 ++ 12 + -+ ++ + True -+ vertical -+ 10 ++ 0 ++ 48 ++ computer ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ 6 + -+ ++ + True -+ 12 -+ -+ -+ True -+ 0 -+ 48 -+ computer -+ -+ -+ False -+ False -+ 0 -+ -+ -+ -+ -+ True -+ vertical -+ 6 -+ -+ -+ True -+ 0 -+ Version -+ -+ -+ 0 -+ -+ -+ -+ -+ True -+ 0 -+ Computer Name -+ -+ -+ 1 -+ -+ -+ -+ -+ True -+ -+ -+ True -+ 0 -+ center -+ True -+ -+ -+ -+ -+ False -+ False -+ 2 -+ -+ -+ -+ -+ 1 -+ -+ ++ 0 ++ Version ++ True + -+ -+ 0 -+ + + -+ ++ + True -+ -+ -+ True -+ vertical -+ 10 -+ -+ -+ True -+ -+ -+ 0 -+ -+ -+ -+ -+ True -+ 6 -+ -+ -+ True -+ -+ -+ False -+ False -+ 0 -+ -+ -+ -+ -+ True -+ True -+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK -+ ● -+ True -+ -+ -+ 1 -+ -+ -+ -+ -+ -+ -+ -+ False -+ False -+ 1 -+ -+ -+ -+ -+ True -+ -+ -+ True -+ -+ -+ 0 -+ -+ -+ -+ -+ False -+ False -+ 2 -+ -+ -+ -+ ++ 0 ++ Computer Name + + + 1 + + + -+ ++ + True -+ 6 -+ end ++ 6 + -+ -+ gtk-disconnect ++ + True -+ True -+ True -+ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ 0 ++ GTK_JUSTIFY_CENTER ++ True + -+ -+ False -+ False -+ 0 -+ -+ -+ -+ -+ True -+ True -+ True -+ True -+ True -+ -+ -+ True -+ -+ -+ True -+ 16 -+ media-playback-pause -+ -+ -+ 0 -+ -+ -+ -+ -+ True -+ 0 -+ Suspend -+ -+ -+ 1 -+ -+ -+ -+ -+ -+ -+ False -+ False -+ 1 -+ -+ -+ -+ -+ True -+ True -+ True -+ True -+ True -+ -+ -+ True -+ -+ -+ True -+ 16 -+ view-refresh -+ -+ -+ 0 -+ -+ -+ -+ -+ True -+ 0 -+ Restart -+ -+ -+ 1 -+ -+ -+ -+ -+ -+ -+ False -+ False -+ 2 -+ -+ -+ -+ -+ True -+ True -+ True -+ True -+ True -+ -+ -+ True -+ -+ -+ True -+ 16 -+ system-shutdown -+ -+ -+ 0 -+ -+ -+ -+ -+ True -+ Shut Down -+ -+ -+ 1 -+ -+ -+ -+ -+ -+ -+ False -+ False -+ 3 -+ -+ -+ -+ -+ gtk-cancel -+ True -+ True -+ True -+ True -+ -+ -+ False -+ False -+ 4 -+ -+ -+ -+ -+ True -+ True -+ True -+ True -+ True -+ -+ -+ True -+ -+ -+ True -+ 16 -+ go-home -+ -+ -+ 0 -+ -+ -+ -+ -+ True -+ 0 -+ Log In -+ -+ -+ 1 -+ -+ -+ -+ -+ -+ -+ False -+ False -+ 5 -+ + + + -+ False -+ False -+ end + 2 + + + ++ ++ 1 ++ + + + -+ -+ -+ - -Index: gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.glade.new -=================================================================== ---- /dev/null -+++ gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.glade.new -@@ -0,0 +1,374 @@ -+ -+ -+ -+ -+ -+ 400 -+ True -+ Authentication Dialog -+ dialog -+ -+ -+ True -+ 0 -+ out + + + True -+ 24 + -+ ++ + True -+ vertical + 10 + -+ ++ + True -+ 12 -+ -+ -+ True -+ 0 -+ 48 -+ computer -+ -+ -+ False -+ False -+ 0 -+ -+ -+ -+ -+ True -+ vertical -+ 6 -+ -+ -+ True -+ 0 -+ Version -+ -+ -+ 0 -+ -+ -+ -+ -+ True -+ 0 -+ Computer Name -+ -+ -+ 1 -+ -+ -+ -+ -+ True -+ -+ -+ True -+ 0 -+ center -+ True -+ -+ -+ -+ -+ False -+ False -+ 2 -+ -+ -+ -+ -+ 1 -+ -+ + -+ -+ 0 -+ + + -+ -+ True -+ -+ -+ True -+ vertical -+ 10 -+ -+ -+ True -+ -+ -+ 0 -+ -+ -+ -+ -+ True -+ 6 -+ -+ -+ True -+ -+ -+ False -+ False -+ 0 -+ -+ -+ -+ -+ True -+ True -+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK -+ ● -+ True -+ -+ -+ 1 -+ -+ -+ -+ -+ -+ -+ -+ False -+ False -+ 1 -+ -+ -+ -+ -+ True -+ -+ -+ True -+ -+ -+ 0 -+ -+ -+ -+ -+ False -+ False -+ 2 -+ -+ -+ -+ -+ -+ -+ 1 -+ -+ -+ -+ ++ + True + 6 -+ end + -+ -+ gtk-disconnect ++ + True -+ True -+ True -+ True + + + False + False -+ 0 + + + -+ ++ + True + True -+ True -+ True -+ True -+ -+ -+ True -+ -+ -+ True -+ 16 -+ media-playback-pause -+ -+ -+ 0 -+ -+ -+ -+ -+ True -+ 0 -+ Suspend -+ -+ -+ 1 -+ -+ -+ -+ ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ • ++ True + + -+ False -+ False + 1 + + + -+ -+ True -+ True -+ True -+ True -+ True -+ -+ -+ True -+ -+ -+ True -+ 16 -+ view-refresh -+ -+ -+ 0 -+ -+ -+ -+ -+ True -+ 0 -+ Restart -+ -+ -+ 1 -+ -+ -+ -+ -+ -+ -+ False -+ False -+ 2 -+ -+ -+ -+ -+ True -+ True -+ True -+ True -+ True -+ -+ -+ True -+ -+ -+ True -+ 16 -+ system-shutdown -+ -+ -+ 0 -+ -+ -+ -+ -+ True -+ Shut Down -+ -+ -+ 1 -+ -+ -+ -+ -+ -+ -+ False -+ False -+ 3 -+ -+ -+ -+ -+ gtk-cancel -+ True -+ True -+ True -+ True -+ -+ -+ False -+ False -+ 4 -+ -+ -+ -+ -+ True -+ True -+ True -+ True -+ True -+ -+ -+ True -+ -+ -+ True -+ 16 -+ go-home -+ -+ -+ 0 -+ -+ -+ -+ -+ True -+ 0 -+ Log In -+ -+ -+ 1 -+ -+ -+ -+ -+ -+ -+ False -+ False -+ 5 -+ ++ ++ ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ True ++ ++ ++ True ++ + + + + False + False -+ end + 2 + + ++ ++ ++ True ++ ++ ++ True ++ ++ ++ ++ ++ False ++ False ++ 3 ++ ++ + + + ++ ++ 1 ++ ++ ++ ++ ++ True ++ 6 ++ GTK_BUTTONBOX_END ++ ++ ++ True ++ True ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ gtk-disconnect ++ True ++ 0 ++ ++ ++ ++ ++ True ++ True ++ True ++ True ++ 0 ++ ++ ++ True ++ ++ ++ True ++ 16 ++ media-playback-pause ++ ++ ++ ++ ++ True ++ 0 ++ Suspend ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ True ++ True ++ True ++ True ++ 0 ++ ++ ++ True ++ ++ ++ True ++ 16 ++ view-refresh ++ ++ ++ ++ ++ True ++ 0 ++ Restart ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ 2 ++ ++ ++ ++ ++ True ++ True ++ True ++ True ++ 0 ++ ++ ++ True ++ ++ ++ True ++ 16 ++ system-shutdown ++ ++ ++ ++ ++ True ++ Shut Down ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ 3 ++ ++ ++ ++ ++ True ++ True ++ gtk-cancel ++ True ++ 0 ++ ++ ++ 4 ++ ++ ++ ++ ++ True ++ True ++ True ++ True ++ 0 ++ ++ ++ True ++ ++ ++ True ++ 16 ++ go-home ++ ++ ++ ++ ++ True ++ 0 ++ Log In ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ 5 ++ ++ ++ ++ ++ False ++ False ++ GTK_PACK_END ++ 2 ++ + + + diff --git a/gdm-keyboard-from-hal.patch b/gdm-keyboard-from-hal.patch index 32c8cc6..fdf0a6b 100644 --- a/gdm-keyboard-from-hal.patch +++ b/gdm-keyboard-from-hal.patch @@ -1,19 +1,17 @@ -Index: gdm-2.28.0/configure.ac -=================================================================== ---- gdm-2.28.0.orig/configure.ac -+++ gdm-2.28.0/configure.ac -@@ -70,6 +70,7 @@ PKG_CHECK_MODULES(DAEMON, +diff -ur gdm-2.27.4/configure.ac gdm-2.27.4.patched//configure.ac +--- gdm-2.27.4/configure.ac 2009-07-20 04:17:17.000000000 +0200 ++++ gdm-2.27.4.patched//configure.ac 2009-07-20 17:50:13.000000000 +0200 +@@ -68,6 +68,7 @@ + PKG_CHECK_MODULES(DAEMON, dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION gobject-2.0 >= $GLIB_REQUIRED_VERSION - gio-2.0 >= $GLIB_REQUIRED_VERSION + hal ) AC_SUBST(DAEMON_CFLAGS) AC_SUBST(DAEMON_LIBS) -Index: gdm-2.28.0/daemon/gdm-session-direct.c -=================================================================== ---- gdm-2.28.0.orig/daemon/gdm-session-direct.c -+++ gdm-2.28.0/daemon/gdm-session-direct.c +diff -ur gdm-2.27.4/daemon/gdm-session-direct.c gdm-2.27.4.patched//daemon/gdm-session-direct.c +--- gdm-2.27.4/daemon/gdm-session-direct.c 2009-07-20 03:09:09.000000000 +0200 ++++ gdm-2.27.4.patched//daemon/gdm-session-direct.c 2009-07-20 17:53:04.000000000 +0200 @@ -45,6 +45,8 @@ #include #include @@ -23,7 +21,7 @@ Index: gdm-2.28.0/daemon/gdm-session-direct.c #include "gdm-session-direct.h" #include "gdm-session.h" #include "gdm-session-private.h" -@@ -600,14 +602,66 @@ get_default_language_name (GdmSessionDir +@@ -597,14 +599,66 @@ return setlocale (LC_MESSAGES, NULL); } @@ -93,7 +91,7 @@ Index: gdm-2.28.0/daemon/gdm-session-direct.c } static char * -@@ -1970,9 +2024,10 @@ setup_session_environment (GdmSessionDir +@@ -1955,9 +2009,10 @@ if (strcmp (get_layout_name (session), get_default_layout_name (session)) == 0) { @@ -107,11 +105,10 @@ Index: gdm-2.28.0/daemon/gdm-session-direct.c } gdm_session_direct_set_environment_variable (session, -Index: gdm-2.28.0/daemon/gdm-session-settings.c -=================================================================== ---- gdm-2.28.0.orig/daemon/gdm-session-settings.c -+++ gdm-2.28.0/daemon/gdm-session-settings.c -@@ -149,8 +149,7 @@ gdm_session_settings_set_layout_name (Gd +diff -ur gdm-2.27.4/daemon/gdm-session-settings.c gdm-2.27.4.patched//daemon/gdm-session-settings.c +--- gdm-2.27.4/daemon/gdm-session-settings.c 2009-05-19 17:18:12.000000000 +0200 ++++ gdm-2.27.4.patched//daemon/gdm-session-settings.c 2009-07-20 17:50:13.000000000 +0200 +@@ -149,8 +149,7 @@ { g_return_if_fail (GDM_IS_SESSION_SETTINGS (settings)); diff --git a/gdm-polkit-gnome-path.patch b/gdm-polkit-gnome-path.patch deleted file mode 100644 index 6df8da4..0000000 --- a/gdm-polkit-gnome-path.patch +++ /dev/null @@ -1,11 +0,0 @@ -Index: gdm-2.28.0/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in -=================================================================== ---- gdm-2.28.0.orig/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in -+++ gdm-2.28.0/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in -@@ -1,5 +1,5 @@ - [Desktop Entry] - Type=Application - _Name=PolicyKit Authentication Agent --Exec=/usr/libexec/polkit-gnome-authentication-agent-1 -+Exec=/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 - OnlyShowIn=GNOME; diff --git a/gdm-selecting-desktop-environment.patch b/gdm-selecting-desktop-environment.patch index 224af89..ede8749 100644 --- a/gdm-selecting-desktop-environment.patch +++ b/gdm-selecting-desktop-environment.patch @@ -1,8 +1,8 @@ -Index: gdm-2.28.0/daemon/gdm-session-worker.c -=================================================================== ---- gdm-2.28.0.orig/daemon/gdm-session-worker.c -+++ gdm-2.28.0/daemon/gdm-session-worker.c -@@ -157,6 +157,9 @@ typedef int (* GdmSessionWorkerPamNewMes +diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c +index c1ac7cf..a5de412 100644 +--- a/daemon/gdm-session-worker.c ++++ b/daemon/gdm-session-worker.c +@@ -149,6 +149,9 @@ typedef int (* GdmSessionWorkerPamNewMessagesFunc) (int, const struct pam_message **, struct pam_response **, gpointer); @@ -12,11 +12,10 @@ Index: gdm-2.28.0/daemon/gdm-session-worker.c G_DEFINE_TYPE (GdmSessionWorker, gdm_session_worker, G_TYPE_OBJECT) -@@ -597,6 +600,22 @@ attempt_to_load_user_settings (GdmSessio - gdm_session_settings_load (worker->priv->user_settings, - username, +@@ -617,6 +620,21 @@ attempt_to_load_user_settings (GdmSessionWorker *worker, + passwd_entry->pw_dir, NULL); -+ + + /* These singal handlers should be disconnected after the loading, + * so that gdm_session_settings_set_* APIs don't cause the emitting + * of Saved*NameRead D-Bus signals any more. @@ -32,6 +31,6 @@ Index: gdm-2.28.0/daemon/gdm-session-worker.c + g_signal_handlers_disconnect_by_func (worker->priv->user_settings, + G_CALLBACK (on_saved_layout_name_read), + worker); + seteuid (old_uid); + setegid (old_gid); } - - static void diff --git a/gdm.changes b/gdm.changes index fc4c00c..fa59d98 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,52 +1,3 @@ -------------------------------------------------------------------- -Fri Oct 2 19:33:46 CEST 2009 - vuntz@opensuse.org - -- Add gdm-devkit-power.patch: gdm was using a dbus API which - doesn't exist anymore, and the right way to handle this is to use - DeviceKit-power. -- Add DeviceKit-power-devel BuildRequires for the patch. -- Add gdm-polkit-gnome-path.patch to use the correct path for the - polkit agent. -- Rebase gdm-greeter-greater-ui.patch. Fix bnc#533597. - -------------------------------------------------------------------- -Fri Oct 2 17:25:38 CEST 2009 - vuntz@opensuse.org - -- Make sure to package /var/cache/gdm: without it, gdm doesn't use - the configured language/layout for the user. - -------------------------------------------------------------------- -Fri Oct 2 00:47:14 CEST 2009 - vuntz@opensuse.org - -- Add gdm-autologin-once.patch: we don't want to autologin again - after a logout. Fix bnc#532090. - -------------------------------------------------------------------- -Mon Sep 28 14:59:45 CEST 2009 - vuntz@opensuse.org - -- Update to version 2.28.0: - + GDM supports the ability to specify the automatic/timed login - user via a script via the same interface that the old GDM - supported. - + The user's dmrc and face image files are stored in - /var/cache/gdm, so that the login process does not need to - access the user's $HOME directory before authentication. Refer - to bgo#565151. - + Fix the login GUI options widget so the language/session/layout - choices are not reset after a failed login. - + Fix language dialog so it does not crash if the user click's - the "OK" button when no language is selected. - + Fix to ensure that the login dialog regains focus after the - language or layout dialogs are used. - + The language dialog has improved logic to sort the language - names more correctly. - + Make sure to check error variable is not NULL before - referencing it in the gdm-user-manager code. - + Make sure to not print NULL strings since this causes crashes - on some platforms. - + Improve documentation. -- Add gdm-build-fixes.patch to fix build. - ------------------------------------------------------------------- Mon Sep 28 14:25:50 CEST 2009 - vuntz@opensuse.org diff --git a/gdm.spec b/gdm.spec index bc9fa5d..19a5f35 100644 --- a/gdm.spec +++ b/gdm.spec @@ -1,5 +1,5 @@ # -# spec file for package gdm (Version 2.28.0) +# spec file for package gdm (Version 2.27.90) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,6 @@ Name: gdm -BuildRequires: DeviceKit-power-devel BuildRequires: check-devel BuildRequires: fdupes BuildRequires: gconf2-devel @@ -42,8 +41,8 @@ BuildRequires: xorg-x11-server-extra BuildRequires: zenity License: GPL v2 or later Group: System/GUI/GNOME -Version: 2.28.0 -Release: 1 +Version: 2.27.90 +Release: 2 Summary: The GNOME 2.x Display Manager Source: %{name}-%{version}.tar.bz2 Source1: gdm.pamd @@ -62,11 +61,11 @@ Patch6: gdm-desktop-session-env-pam.patch # PATCH-FIX-OPENSUSE gdm-suse-xsession.patch vuntz@novell.com -- Use the /etc/X11/xdm/* scripts Patch7: gdm-suse-xsession.patch # PATCH-NEEDS-REBASE gdm-domain-logon.patch hpj@novell.com -- Add UI to log in a specific domain (was: PATCH-FEATURE-SLED) -Patch8: gdm-domain-logon.patch +#Patch8: gdm-domain-logon.patch # PATCH-FIX-OPENSUSE gdm-sysconfig-settings.patch bnc432360 hpj@novell.com -- Read autologin options from /etc/sysconfig/displaymanager Patch13: gdm-sysconfig-settings.patch -# PATCH-FIX-UPSTREAM gdm-greeter-greater-ui.patch bnc436431 bgo560508 vuntz@novell.com -- Improve the layout of the greeter. Note: the patch contains a patched glade file *and* the result glade file (for reference only, in case we need to rebase the patch) -Patch15: gdm-greeter-greater-ui.patch +# PATCH-NEEDS-REBASE gdm-greeter-greater-ui.patch bnc436431 bgo560508 vuntz@novell.com -- Improve the layout of the greeter. Note: the patch contains a patched glade file *and* the result glade file (for reference only, in case we need to rebase the patch) (was PATCH-FIX-UPSTREAM) +#Patch15: gdm-greeter-greater-ui.patch # PATCH-FIX-UPSTREAM gdm-always-reflect-keyboard-layout.patch bnc438159 bgo561771 hpj@novell.com -- Make keyboard selector not neglect to apply the selected keyboard in some situations. Patch18: gdm-always-reflect-keyboard-layout.patch # PATCH-FIX-OPENSUSE gdm-save-panel-space-on-low-resolutions.patch bnc449815 hpj@novell.com -- Hide clock and/or selector labels on low resolutions. @@ -81,16 +80,8 @@ Patch32: gdm-keyboard-from-hal.patch Patch33: gdm-keyboard-from-sysconfig.patch # PATCH-FIX-OPENSUSE gdm-default-wm.patch vuntz@novell.com -- Use sysconfig to know to which desktop to use by default Patch34: gdm-default-wm.patch -# PATCH-FIX-OPENSUSE gdm-xauthlocalhostname.patch bgo555464 vuntz@novell.com -- Set XAUTHLOCALHOSTNAME to localhost for local logins to avoid issues in the session in case the hostname changes +# PATCH-FIX-OPENSUSE gdm-xauthlocalhostname.patch vuntz@novell.com -- Set XAUTHLOCALHOSTNAME to localhost for local logins to avoid issues in the session in case the hostname changes Patch35: gdm-xauthlocalhostname.patch -# PATCH-FIX-UPSTREAM gdm-build-fixes.patch bgo596605 vuntz@novell.com -- Add missing return value -Patch36: gdm-build-fixes.patch -# PATCH-FIX-UPSTREAM gdm-autologin-once.patch bgo587606 vuntz@novell.com -- Make autologin work only once -Patch37: gdm-autologin-once.patch -# PATCH-FIX-UPSTREAM gdm-devkit-power.patch bgo596569 vuntz@opensuse.org -- Use devkit-power instead of non-existing dbus API, patch from upstream -Patch38: gdm-devkit-power.patch -# PATCH-FIX-UPSTREAM gdm-polkit-gnome-path.patch bgo597050 vuntz@opensuse.org -- Use the right patch for the polkit agent. The current patch is a quick workaround for now, until we know how upstream wants to fix this. -Patch39: gdm-polkit-gnome-path.patch # PATCH-FIX-OPENSUSE gdm-selinux.patch -- Small changes to make it compile fine with SELinux Patch60: gdm-selinux.patch Url: http://www.gnome.org/ @@ -149,7 +140,7 @@ gnome-patch-translation-prepare # NEEDS-REBASE - also re-enable gnome-patch-translation-update after patch rebase # %%patch8 -p1 %patch13 -p1 -%patch15 -p1 +# %%patch15 -p1 %patch18 -p1 %patch19 -p1 %patch20 -p1 @@ -161,10 +152,6 @@ gnome-patch-translation-prepare %endif %patch34 -p1 %patch35 -p1 -%patch36 -p1 -%patch37 -p1 -%patch38 -p1 -%patch39 -p1 %patch60 # gnome-patch-translation-update @@ -258,7 +245,6 @@ fi %attr(750,gdm,gdm) %dir %{_localstatedir}/lib/gdm/.gconf.mandatory %attr(640,gdm,gdm) %{_localstatedir}/lib/gdm/.gconf.mandatory/%gconf-tree.xml %attr(640,gdm,gdm) %{_localstatedir}/lib/gdm/.gconf.path -%dir %{_localstatedir}/cache/gdm %config /etc/pam.d/* /sbin/conf.d/SuSEconfig.gdm %config %{_sysconfdir}/dbus-1/system.d/gdm.conf From f1c1c305fc95966333d08e692d142018c21143472b881ffebd305b31615232b7 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 5 Oct 2009 23:59:05 +0000 Subject: [PATCH 10/10] Updating link to change in openSUSE:Factory/gdm revision 83.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=3c2e099c82d285eb2c05b1c5efbfee5a --- gdm-2.27.90.tar.bz2 | 3 - gdm-2.28.0.tar.bz2 | 3 + gdm-autologin-once.patch | 52 + gdm-build-fixes.patch | 13 + gdm-devkit-power.patch | 186 +++ gdm-greeter-greater-ui.patch | 1922 +++++++++++++++++------ gdm-keyboard-from-hal.patch | 31 +- gdm-polkit-gnome-path.patch | 11 + gdm-selecting-desktop-environment.patch | 21 +- gdm.changes | 49 + gdm.spec | 30 +- 11 files changed, 1844 insertions(+), 477 deletions(-) delete mode 100644 gdm-2.27.90.tar.bz2 create mode 100644 gdm-2.28.0.tar.bz2 create mode 100644 gdm-autologin-once.patch create mode 100644 gdm-build-fixes.patch create mode 100644 gdm-devkit-power.patch create mode 100644 gdm-polkit-gnome-path.patch diff --git a/gdm-2.27.90.tar.bz2 b/gdm-2.27.90.tar.bz2 deleted file mode 100644 index 1d2c2d2..0000000 --- a/gdm-2.27.90.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4e842a59285a456d9a9cc03e5519f027319fc254d98f818c275a7e90882ab6f9 -size 2392706 diff --git a/gdm-2.28.0.tar.bz2 b/gdm-2.28.0.tar.bz2 new file mode 100644 index 0000000..1a16303 --- /dev/null +++ b/gdm-2.28.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b83db2613192df8a8865ca59877de5181df6247cd17be42418cc5a39d314d5a4 +size 2314347 diff --git a/gdm-autologin-once.patch b/gdm-autologin-once.patch new file mode 100644 index 0000000..055e1ef --- /dev/null +++ b/gdm-autologin-once.patch @@ -0,0 +1,52 @@ +diff --git a/daemon/gdm-static-display.c b/daemon/gdm-static-display.c +index a747ee3..9605f5a 100644 +--- a/daemon/gdm-static-display.c ++++ b/daemon/gdm-static-display.c +@@ -45,7 +45,7 @@ + + struct GdmStaticDisplayPrivate + { +- gboolean enable_timed_login; ++ gboolean first_login; + }; + + enum { +@@ -121,6 +121,8 @@ gdm_static_display_unmanage (GdmDisplay *display) + { + g_return_val_if_fail (GDM_IS_DISPLAY (display), FALSE); + ++ GDM_STATIC_DISPLAY (display)->priv->first_login = FALSE; ++ + GDM_DISPLAY_CLASS (gdm_static_display_parent_class)->unmanage (display); + + return TRUE; +@@ -158,12 +160,14 @@ gdm_static_display_get_timed_login_details (GdmDisplay *display, + char **usernamep, + int *delayp) + { +- if (GDM_STATIC_DISPLAY (display)->priv->enable_timed_login) { +- GDM_DISPLAY_CLASS (gdm_static_display_parent_class)->get_timed_login_details (display, enabledp, usernamep, delayp); +- } else { +- *enabledp = FALSE; +- *usernamep = g_strdup (""); +- *delayp = 0; ++ GDM_DISPLAY_CLASS (gdm_static_display_parent_class)->get_timed_login_details (display, enabledp, usernamep, delayp); ++ ++ if (!GDM_STATIC_DISPLAY (display)->priv->first_login) { ++ /* if this is autologin but not timed login, then disable ++ * autologin after the first one */ ++ if (*enabledp && *delayp == 0) { ++ *enabledp = FALSE; ++ } + } + } + +@@ -196,7 +200,7 @@ gdm_static_display_init (GdmStaticDisplay *static_display) + + static_display->priv = GDM_STATIC_DISPLAY_GET_PRIVATE (static_display); + +- static_display->priv->enable_timed_login = TRUE; ++ static_display->priv->first_login = TRUE; + } + + static void diff --git a/gdm-build-fixes.patch b/gdm-build-fixes.patch new file mode 100644 index 0000000..dbfd5b3 --- /dev/null +++ b/gdm-build-fixes.patch @@ -0,0 +1,13 @@ +Index: gdm-2.28.0/daemon/gdm-slave.c +=================================================================== +--- gdm-2.28.0.orig/daemon/gdm-slave.c ++++ gdm-2.28.0/daemon/gdm-slave.c +@@ -836,6 +836,8 @@ gdm_slave_parse_enriched_login (GdmSlave + } else { + return (g_strdup (username)); + } ++ ++ return NULL; + } + + gboolean diff --git a/gdm-devkit-power.patch b/gdm-devkit-power.patch new file mode 100644 index 0000000..29fae72 --- /dev/null +++ b/gdm-devkit-power.patch @@ -0,0 +1,186 @@ +From aa132a553b871a19a8d23fe8e9d93f736f2a4faf Mon Sep 17 00:00:00 2001 +From: Richard Hughes +Date: Mon, 28 Sep 2009 09:14:33 +0100 +Subject: [PATCH] Convert gdm from using gnome-power-manager to DeviceKit-power + +--- + configure.ac | 7 ++ + gui/simple-greeter/Makefile.am | 4 + + gui/simple-greeter/gdm-greeter-login-window.c | 84 ++++++------------------- + 3 files changed, 31 insertions(+), 64 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 756890a..2cae1cf 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -51,6 +51,7 @@ LIBXKLAVIER_REQUIRED_VERSION=4.0 + LIBCANBERRA_GTK_REQUIRED_VERSION=0.4 + #FONTCONFIG_REQUIRED_VERSION=2.6.0 + FONTCONFIG_REQUIRED_VERSION=2.5.0 ++DEVKIT_POWER_REQUIRED_VERSION=008 + + EXTRA_COMPILE_WARNINGS(yes) + +@@ -103,6 +104,12 @@ PKG_CHECK_MODULES(GCONF, + AC_SUBST(GCONF_CFLAGS) + AC_SUBST(GCONF_LIBS) + ++PKG_CHECK_MODULES(DEVKIT_POWER, ++ devkit-power-gobject >= $DEVKIT_POWER_REQUIRED_VERSION ++) ++AC_SUBST(DEVKIT_POWER_CFLAGS) ++AC_SUBST(DEVKIT_POWER_LIBS) ++ + PKG_CHECK_MODULES(SIMPLE_GREETER, + dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION + gtk+-2.0 >= $GTK_REQUIRED_VERSION +diff --git a/gui/simple-greeter/Makefile.am b/gui/simple-greeter/Makefile.am +index 8c9ae46..4c06bc3 100644 +--- a/gui/simple-greeter/Makefile.am ++++ b/gui/simple-greeter/Makefile.am +@@ -18,6 +18,8 @@ AM_CPPFLAGS = \ + -DSBINDIR=\""$(sbindir)"\" \ + -DGDM_CACHE_DIR=\""$(localstatedir)/cache/gdm"\" \ + -DAT_SPI_REGISTRYD_DIR="\"$(AT_SPI_REGISTRYD_DIR)\"" \ ++ $(DEVKIT_POWER_CFLAGS) \ ++ -DI_KNOW_THE_DEVICEKIT_POWER_API_IS_SUBJECT_TO_CHANGE \ + $(DISABLE_DEPRECATED_CFLAGS) \ + $(GTK_CFLAGS) \ + $(SIMPLE_GREETER_CFLAGS) \ +@@ -90,6 +92,7 @@ test_greeter_login_window_LDADD = \ + libgdmuser.la \ + $(COMMON_LIBS) \ + $(SIMPLE_GREETER_LIBS) \ ++ $(DEVKIT_POWER_LIBS) \ + $(RBAC_LIBS) \ + $(NULL) + +@@ -324,6 +327,7 @@ gdm_simple_greeter_LDADD = \ + $(SIMPLE_GREETER_LIBS) \ + $(RBAC_LIBS) \ + $(LIBXKLAVIER_LIBS) \ ++ $(DEVKIT_POWER_LIBS) \ + $(NULL) + + gladedir = $(pkgdatadir) +diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c +index c7ea5d6..7d4ef83 100644 +--- a/gui/simple-greeter/gdm-greeter-login-window.c ++++ b/gui/simple-greeter/gdm-greeter-login-window.c +@@ -56,6 +56,8 @@ + #include + #include + ++#include ++ + #include "gdm-settings-client.h" + #include "gdm-settings-keys.h" + #include "gdm-profile.h" +@@ -79,10 +81,6 @@ + #define CK_SEAT_INTERFACE "org.freedesktop.ConsoleKit.Seat" + #define CK_SESSION_INTERFACE "org.freedesktop.ConsoleKit.Session" + +-#define GPM_DBUS_NAME "org.freedesktop.PowerManagement" +-#define GPM_DBUS_PATH "/org/freedesktop/PowerManagement" +-#define GPM_DBUS_INTERFACE "org.freedesktop.PowerManagement" +- + #define GLADE_XML_FILE "gdm-greeter-login-window.glade" + + #define KEY_GREETER_DIR "/apps/gdm/simple-greeter" +@@ -480,40 +478,15 @@ adjust_other_login_visibility(GdmGreeterLoginWindow *login_window) + static gboolean + can_suspend (GdmGreeterLoginWindow *login_window) + { +- DBusGConnection *connection; +- DBusGProxy *proxy; +- GError *error; +- gboolean ret; +- gboolean res; +- +- error = NULL; +- connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error); +- if (error != NULL) { +- g_warning ("Couldn't connect to power manager: %s", error->message); +- g_error_free (error); +- return FALSE; +- } +- proxy = dbus_g_proxy_new_for_name (connection, +- GPM_DBUS_NAME, +- GPM_DBUS_PATH, +- GPM_DBUS_INTERFACE); +- ret = FALSE; +- +- res = dbus_g_proxy_call (proxy, "CanSuspend", +- &error, +- G_TYPE_INVALID, +- G_TYPE_BOOLEAN, +- &ret, +- G_TYPE_INVALID); +- if (! res) { +- if (error != NULL) { +- g_warning ("Could not ask power manager if user can suspend: %s", +- error->message); +- g_error_free (error); +- } +- ret = FALSE; +- } ++ gboolean ret; ++ DkpClient *dkp_client; + ++ /* use DeviceKit-power to get data */ ++ dkp_client = dkp_client_new (); ++ g_object_get (dkp_client, ++ "can-suspend", &ret, ++ NULL); ++ g_object_unref (dkp_client); + return ret; + } + +@@ -655,36 +628,19 @@ do_disconnect (GdmGreeterLoginWindow *login_window) + static void + do_suspend (GdmGreeterLoginWindow *login_window) + { +- GError *error; +- DBusGConnection *connection; +- DBusGProxy *proxy; ++ gboolean ret; ++ DkpClient *dkp_client; ++ GError *error = NULL; + +- g_debug ("GdmGreeterLoginWindow: Suspend button clicked"); +- +- error = NULL; +- connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error); +- if (error != NULL) { ++ /* use DeviceKit-power to get data */ ++ dkp_client = dkp_client_new (); ++ ret = dkp_client_suspend (dkp_client, &error); ++ if (!ret) { + g_warning ("Couldn't suspend: %s", error->message); + g_error_free (error); + return; + } +- proxy = dbus_g_proxy_new_for_name (connection, +- GPM_DBUS_NAME, +- GPM_DBUS_PATH, +- GPM_DBUS_INTERFACE); +- error = NULL; +- dbus_g_proxy_call (proxy, +- "Suspend", +- &error, +- G_TYPE_INVALID, +- G_TYPE_INVALID); +- if (error != NULL) { +- g_warning ("Couldn't suspend: %s", error->message); +- g_error_free (error); +- return; +- } +- +- g_object_unref (proxy); ++ g_object_unref (dkp_client); + } + + static void +-- +1.6.4.4 + diff --git a/gdm-greeter-greater-ui.patch b/gdm-greeter-greater-ui.patch index 057b406..28852a3 100644 --- a/gdm-greeter-greater-ui.patch +++ b/gdm-greeter-greater-ui.patch @@ -1,8 +1,8 @@ -Index: gdm-2.24.0/gui/simple-greeter/gdm-greeter-login-window.c +Index: gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.c =================================================================== ---- gdm-2.24.0.orig/gui/simple-greeter/gdm-greeter-login-window.c -+++ gdm-2.24.0/gui/simple-greeter/gdm-greeter-login-window.c -@@ -1414,29 +1414,6 @@ on_user_unchosen (GdmUserChooserWidget +--- gdm-2.28.0.orig/gui/simple-greeter/gdm-greeter-login-window.c ++++ gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.c +@@ -1199,29 +1199,6 @@ on_user_unchosen (GdmUserChooserWidget do_cancel (login_window); } @@ -32,7 +32,7 @@ Index: gdm-2.24.0/gui/simple-greeter/gdm-greeter-login-window.c static char * file_read_one_line (const char *filename) { -@@ -1529,9 +1506,12 @@ create_computer_info (GdmGreeterLoginWin +@@ -1314,9 +1291,12 @@ create_computer_info (GdmGreeterLoginWin label = glade_xml_get_widget (login_window->priv->xml, "computer-info-version-label"); if (label != NULL) { char *version; @@ -46,7 +46,7 @@ Index: gdm-2.24.0/gui/simple-greeter/gdm-greeter-login-window.c } gdm_profile_end (NULL); -@@ -1667,9 +1647,6 @@ load_theme (GdmGreeterLoginWindow *login +@@ -1455,9 +1435,6 @@ load_theme (GdmGreeterLoginWindow *login create_computer_info (login_window); @@ -56,508 +56,1546 @@ Index: gdm-2.24.0/gui/simple-greeter/gdm-greeter-login-window.c switch_mode (login_window, MODE_SELECTION); gdm_profile_end (NULL); -Index: gdm-2.24.0/gui/simple-greeter/gdm-greeter-login-window.glade +Index: gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.glade =================================================================== ---- gdm-2.24.0.orig/gui/simple-greeter/gdm-greeter-login-window.glade -+++ gdm-2.24.0/gui/simple-greeter/gdm-greeter-login-window.glade -@@ -1,9 +1,7 @@ -- -- -- +--- gdm-2.28.0.orig/gui/simple-greeter/gdm-greeter-login-window.glade ++++ gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.glade +@@ -1,789 +1,374 @@ +- +- +- + -+ - -- 400 - True - 12 - Authentication Dialog -@@ -13,100 +11,67 @@ - True - 10 - -- -+ - True -+ 12 - - - True -- 64 -+ 0 -+ 48 - computer - -+ -+ False -+ False -+ - -- -- -- False -- False -- -- -- -- -- False -- True -- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - -- -+ - True -- False -- False -+ 6 - -- -+ - True -- Computer Name -+ 0 -+ Version -+ True - - - -- -+ - True -- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK -- page 5 -+ 0 -+ Computer Name - - -- tab -- False -+ 1 - - - -- -+ - True -- Version -+ 6 -+ -+ -+ True -+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK -+ 0 -+ GTK_JUSTIFY_CENTER -+ True -+ -+ - - -- 1 -- -- -- -- -- -- tab -- -- -- -- -- -- -- -- -- tab -- -- -- -- -- -- -- -- -- tab -+ 2 - - - -+ -+ 1 -+ - - -- -- False -- False -- 1 -- -- -- -- -- True -- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK -- GTK_JUSTIFY_CENTER -- True -- -- -- 3 -- - - - -@@ -138,7 +103,7 @@ - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK -- • -+ • - True - - -@@ -189,7 +154,7 @@ - - - -- 5 -+ 1 - - - -Index: gdm-2.24.0/gui/simple-greeter/gdm-greeter-login-window.glade.new -=================================================================== ---- /dev/null -+++ gdm-2.24.0/gui/simple-greeter/gdm-greeter-login-window.glade.new -@@ -0,0 +1,334 @@ -+ -+ -+ +- +- +- 400 +- True +- Authentication Dialog +- GTK_WINDOW_TOPLEVEL +- GTK_WIN_POS_NONE +- False +- True +- False +- True +- False +- False +- GDK_WINDOW_TYPE_HINT_DIALOG +- GDK_GRAVITY_NORTH_WEST +- True +- False +- +- +- +- True +- 0 +- 0.5 +- GTK_SHADOW_OUT +- +- +- +- 24 +- True +- 0.5 +- 0.5 +- 1 +- 1 +- 0 +- 0 +- 0 +- 0 +- +- +- +- True +- False +- 10 +- +- +- +- True +- 0.5 +- 0.5 +- 1 +- 1 +- 0 +- 0 +- 0 +- 0 +- +- +- +- True +- computer +- 64 +- 0.5 +- 0.5 +- 0 +- 0 +- +- +- +- +- 0 +- False +- False +- +- +- +- +- +- True +- False +- False +- +- +- +- True +- False +- False +- GTK_POS_TOP +- False +- False +- +- +- +- True +- Computer Name +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- False +- True +- +- +- +- +- +- True +- page 5 +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- tab +- +- +- +- +- +- True +- Version +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- False +- True +- +- +- +- +- +- True +- +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- tab +- +- +- +- +- +- +- +- +- +- True +- +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- tab +- +- +- +- +- +- +- +- +- +- True +- +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- tab +- +- +- +- +- +- +- +- +- +- True +- +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- tab +- +- +- +- +- +- +- +- +- +- True +- +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- tab +- +- +- +- +- +- +- +- +- +- True +- +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- tab +- +- +- +- +- +- +- 0 +- False +- False +- +- +- +- +- +- True +- GTK_BUTTONBOX_END +- 6 +- +- +- +- True +- True +- gtk-disconnect +- True +- GTK_RELIEF_NORMAL +- True +- +- +- +- +- +- True +- True +- True +- True +- GTK_RELIEF_NORMAL +- True +- +- +- +- True +- False +- 0 +- +- +- +- True +- media-playback-pause +- 16 +- 0.5 +- 0.5 +- 0 +- 0 +- +- +- 0 +- True +- True +- +- +- +- +- +- True +- Suspend +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- 0 +- True +- True +- +- +- +- +- +- +- +- +- +- True +- True +- True +- True +- GTK_RELIEF_NORMAL +- True +- +- +- +- True +- False +- 0 +- +- +- +- True +- view-refresh +- 16 +- 0.5 +- 0.5 +- 0 +- 0 +- +- +- 0 +- True +- True +- +- +- +- +- +- True +- Restart +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- 0 +- True +- True +- +- +- +- +- +- +- +- +- +- True +- True +- True +- True +- GTK_RELIEF_NORMAL +- True +- +- +- +- True +- False +- 0 +- +- +- +- True +- system-shutdown +- 16 +- 0.5 +- 0.5 +- 0 +- 0 +- +- +- 0 +- True +- True +- +- +- +- +- +- True +- Shut Down +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- 0 +- True +- True +- +- +- +- +- +- +- +- +- +- True +- True +- gtk-cancel +- True +- GTK_RELIEF_NORMAL +- True +- +- +- +- +- +- True +- True +- True +- True +- GTK_RELIEF_NORMAL +- True +- +- +- +- True +- False +- 0 +- +- +- +- True +- go-home +- 16 +- 0.5 +- 0.5 +- 0 +- 0 +- +- +- 0 +- True +- True +- +- +- +- +- +- True +- Log In +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- 0 +- True +- True +- +- +- +- +- +- +- +- +- 0 +- False +- False +- GTK_PACK_END +- +- +- +- +- +- True +- +- False +- False +- GTK_JUSTIFY_CENTER +- True +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- 0 +- True +- True +- +- +- +- +- +- True +- 0.5 +- 0.5 +- 1 +- 1 +- 0 +- 0 +- 0 +- 0 +- +- +- +- True +- False +- 10 +- +- +- +- True +- 0 +- 0 +- Tue, 18 Nov 2008 21:55:38 GMT +- +- +- 0 +- True +- True +- +- +- +- +- +- True +- False +- 6 +- +- +- +- True +- +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- 0 +- False +- False +- +- +- +- +- +- True +- True +- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK +- True +- True +- 0 +- +- True +- True +- +- +- 0 +- True +- True +- +- +- +- +- +- +- +- +- 0 +- False +- False +- +- +- +- +- +- True +- False +- 0 +- +- +- +- True +- +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- 0 +- True +- True +- +- +- +- +- 0 +- False +- False +- +- +- +- +- +- +- 0 +- True +- True +- +- +- +- +- +- +- +- +- +- +- +- +- +- ++ ++ + ++ 400 + True -+ 12 + Authentication Dialog -+ GDK_WINDOW_TYPE_HINT_DIALOG ++ dialog + -+ ++ + True -+ 10 -+ -+ -+ True -+ 12 -+ -+ -+ True -+ 0 -+ 48 -+ computer -+ -+ -+ False -+ False -+ -+ -+ -+ -+ True -+ 6 -+ -+ -+ True -+ 0 -+ Version -+ True -+ -+ -+ -+ -+ True -+ 0 -+ Computer Name -+ -+ -+ 1 -+ -+ -+ -+ -+ True -+ 6 -+ -+ -+ True -+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK -+ 0 -+ GTK_JUSTIFY_CENTER -+ True -+ -+ -+ -+ -+ 2 -+ -+ -+ -+ -+ 1 -+ -+ -+ -+ ++ 0 ++ out + + + True ++ 24 + -+ ++ + True ++ vertical + 10 + -+ ++ + True -+ -+ -+ -+ -+ True -+ 6 ++ 12 + -+ ++ + True ++ 0 ++ 48 ++ computer + + + False + False ++ 0 + + + -+ ++ + True -+ True -+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK -+ • -+ True ++ vertical ++ 6 ++ ++ ++ True ++ 0 ++ Version ++ ++ ++ 0 ++ ++ ++ ++ ++ True ++ 0 ++ Computer Name ++ ++ ++ 1 ++ ++ ++ ++ ++ True ++ ++ ++ True ++ 0 ++ center ++ True ++ ++ ++ ++ ++ False ++ False ++ 2 ++ ++ + + + 1 + + ++ ++ ++ 0 ++ ++ ++ ++ ++ True + -+ ++ ++ True ++ vertical ++ 10 ++ ++ ++ True ++ ++ ++ 0 ++ ++ ++ ++ ++ True ++ 6 ++ ++ ++ True ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ True ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ ● ++ True ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ True ++ ++ ++ True ++ ++ ++ 0 ++ ++ ++ ++ ++ False ++ False ++ 2 ++ ++ ++ + + + -+ False -+ False + 1 + + + -+ ++ + True ++ 6 ++ end + -+ ++ ++ gtk-disconnect + True ++ True ++ True ++ True + ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ True ++ True ++ True ++ True ++ True ++ ++ ++ True ++ ++ ++ True ++ 16 ++ media-playback-pause ++ ++ ++ 0 ++ ++ ++ ++ ++ True ++ 0 ++ Suspend ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ True ++ True ++ True ++ True ++ True ++ ++ ++ True ++ ++ ++ True ++ 16 ++ view-refresh ++ ++ ++ 0 ++ ++ ++ ++ ++ True ++ 0 ++ Restart ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ False ++ False ++ 2 ++ ++ ++ ++ ++ True ++ True ++ True ++ True ++ True ++ ++ ++ True ++ ++ ++ True ++ 16 ++ system-shutdown ++ ++ ++ 0 ++ ++ ++ ++ ++ True ++ Shut Down ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ False ++ False ++ 3 ++ ++ ++ ++ ++ gtk-cancel ++ True ++ True ++ True ++ True ++ ++ ++ False ++ False ++ 4 ++ ++ ++ ++ ++ True ++ True ++ True ++ True ++ True ++ ++ ++ True ++ ++ ++ True ++ 16 ++ go-home ++ ++ ++ 0 ++ ++ ++ ++ ++ True ++ 0 ++ Log In ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ False ++ False ++ 5 ++ + + + + False + False ++ end + 2 + + ++ ++ ++ ++ ++ ++ ++ + +Index: gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.glade.new +=================================================================== +--- /dev/null ++++ gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.glade.new +@@ -0,0 +1,374 @@ ++ ++ ++ ++ ++ ++ 400 ++ True ++ Authentication Dialog ++ dialog ++ ++ ++ True ++ 0 ++ out ++ ++ ++ True ++ 24 ++ ++ ++ True ++ vertical ++ 10 + -+ ++ ++ True ++ 12 ++ ++ ++ True ++ 0 ++ 48 ++ computer ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ True ++ vertical ++ 6 ++ ++ ++ True ++ 0 ++ Version ++ ++ ++ 0 ++ ++ ++ ++ ++ True ++ 0 ++ Computer Name ++ ++ ++ 1 ++ ++ ++ ++ ++ True ++ ++ ++ True ++ 0 ++ center ++ True ++ ++ ++ ++ ++ False ++ False ++ 2 ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ 0 ++ ++ ++ ++ + True + -+ ++ + True ++ vertical ++ 10 ++ ++ ++ True ++ ++ ++ 0 ++ ++ ++ ++ ++ True ++ 6 ++ ++ ++ True ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ True ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ ● ++ True ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ True ++ ++ ++ True ++ ++ ++ 0 ++ ++ ++ ++ ++ False ++ False ++ 2 ++ ++ + + + + ++ 1 ++ ++ ++ ++ ++ True ++ 6 ++ end ++ ++ ++ gtk-disconnect ++ True ++ True ++ True ++ True ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ True ++ True ++ True ++ True ++ True ++ ++ ++ True ++ ++ ++ True ++ 16 ++ media-playback-pause ++ ++ ++ 0 ++ ++ ++ ++ ++ True ++ 0 ++ Suspend ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ True ++ True ++ True ++ True ++ True ++ ++ ++ True ++ ++ ++ True ++ 16 ++ view-refresh ++ ++ ++ 0 ++ ++ ++ ++ ++ True ++ 0 ++ Restart ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ False ++ False ++ 2 ++ ++ ++ ++ ++ True ++ True ++ True ++ True ++ True ++ ++ ++ True ++ ++ ++ True ++ 16 ++ system-shutdown ++ ++ ++ 0 ++ ++ ++ ++ ++ True ++ Shut Down ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ False ++ False ++ 3 ++ ++ ++ ++ ++ gtk-cancel ++ True ++ True ++ True ++ True ++ ++ ++ False ++ False ++ 4 ++ ++ ++ ++ ++ True ++ True ++ True ++ True ++ True ++ ++ ++ True ++ ++ ++ True ++ 16 ++ go-home ++ ++ ++ 0 ++ ++ ++ ++ ++ True ++ 0 ++ Log In ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ False ++ False ++ 5 ++ ++ ++ ++ + False + False -+ 3 ++ end ++ 2 + + + + + -+ -+ 1 -+ -+ -+ -+ -+ True -+ 6 -+ GTK_BUTTONBOX_END -+ -+ -+ True -+ True -+ True -+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK -+ gtk-disconnect -+ True -+ 0 -+ -+ -+ -+ -+ True -+ True -+ True -+ True -+ 0 -+ -+ -+ True -+ -+ -+ True -+ 16 -+ media-playback-pause -+ -+ -+ -+ -+ True -+ 0 -+ Suspend -+ -+ -+ 1 -+ -+ -+ -+ -+ -+ -+ 1 -+ -+ -+ -+ -+ True -+ True -+ True -+ True -+ 0 -+ -+ -+ True -+ -+ -+ True -+ 16 -+ view-refresh -+ -+ -+ -+ -+ True -+ 0 -+ Restart -+ -+ -+ 1 -+ -+ -+ -+ -+ -+ -+ 2 -+ -+ -+ -+ -+ True -+ True -+ True -+ True -+ 0 -+ -+ -+ True -+ -+ -+ True -+ 16 -+ system-shutdown -+ -+ -+ -+ -+ True -+ Shut Down -+ -+ -+ 1 -+ -+ -+ -+ -+ -+ -+ 3 -+ -+ -+ -+ -+ True -+ True -+ gtk-cancel -+ True -+ 0 -+ -+ -+ 4 -+ -+ -+ -+ -+ True -+ True -+ True -+ True -+ 0 -+ -+ -+ True -+ -+ -+ True -+ 16 -+ go-home -+ -+ -+ -+ -+ True -+ 0 -+ Log In -+ -+ -+ 1 -+ -+ -+ -+ -+ -+ -+ 5 -+ -+ -+ -+ -+ False -+ False -+ GTK_PACK_END -+ 2 -+ + + + diff --git a/gdm-keyboard-from-hal.patch b/gdm-keyboard-from-hal.patch index fdf0a6b..32c8cc6 100644 --- a/gdm-keyboard-from-hal.patch +++ b/gdm-keyboard-from-hal.patch @@ -1,17 +1,19 @@ -diff -ur gdm-2.27.4/configure.ac gdm-2.27.4.patched//configure.ac ---- gdm-2.27.4/configure.ac 2009-07-20 04:17:17.000000000 +0200 -+++ gdm-2.27.4.patched//configure.ac 2009-07-20 17:50:13.000000000 +0200 -@@ -68,6 +68,7 @@ - PKG_CHECK_MODULES(DAEMON, +Index: gdm-2.28.0/configure.ac +=================================================================== +--- gdm-2.28.0.orig/configure.ac ++++ gdm-2.28.0/configure.ac +@@ -70,6 +70,7 @@ PKG_CHECK_MODULES(DAEMON, dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION gobject-2.0 >= $GLIB_REQUIRED_VERSION + gio-2.0 >= $GLIB_REQUIRED_VERSION + hal ) AC_SUBST(DAEMON_CFLAGS) AC_SUBST(DAEMON_LIBS) -diff -ur gdm-2.27.4/daemon/gdm-session-direct.c gdm-2.27.4.patched//daemon/gdm-session-direct.c ---- gdm-2.27.4/daemon/gdm-session-direct.c 2009-07-20 03:09:09.000000000 +0200 -+++ gdm-2.27.4.patched//daemon/gdm-session-direct.c 2009-07-20 17:53:04.000000000 +0200 +Index: gdm-2.28.0/daemon/gdm-session-direct.c +=================================================================== +--- gdm-2.28.0.orig/daemon/gdm-session-direct.c ++++ gdm-2.28.0/daemon/gdm-session-direct.c @@ -45,6 +45,8 @@ #include #include @@ -21,7 +23,7 @@ diff -ur gdm-2.27.4/daemon/gdm-session-direct.c gdm-2.27.4.patched//daemon/gdm-s #include "gdm-session-direct.h" #include "gdm-session.h" #include "gdm-session-private.h" -@@ -597,14 +599,66 @@ +@@ -600,14 +602,66 @@ get_default_language_name (GdmSessionDir return setlocale (LC_MESSAGES, NULL); } @@ -91,7 +93,7 @@ diff -ur gdm-2.27.4/daemon/gdm-session-direct.c gdm-2.27.4.patched//daemon/gdm-s } static char * -@@ -1955,9 +2009,10 @@ +@@ -1970,9 +2024,10 @@ setup_session_environment (GdmSessionDir if (strcmp (get_layout_name (session), get_default_layout_name (session)) == 0) { @@ -105,10 +107,11 @@ diff -ur gdm-2.27.4/daemon/gdm-session-direct.c gdm-2.27.4.patched//daemon/gdm-s } gdm_session_direct_set_environment_variable (session, -diff -ur gdm-2.27.4/daemon/gdm-session-settings.c gdm-2.27.4.patched//daemon/gdm-session-settings.c ---- gdm-2.27.4/daemon/gdm-session-settings.c 2009-05-19 17:18:12.000000000 +0200 -+++ gdm-2.27.4.patched//daemon/gdm-session-settings.c 2009-07-20 17:50:13.000000000 +0200 -@@ -149,8 +149,7 @@ +Index: gdm-2.28.0/daemon/gdm-session-settings.c +=================================================================== +--- gdm-2.28.0.orig/daemon/gdm-session-settings.c ++++ gdm-2.28.0/daemon/gdm-session-settings.c +@@ -149,8 +149,7 @@ gdm_session_settings_set_layout_name (Gd { g_return_if_fail (GDM_IS_SESSION_SETTINGS (settings)); diff --git a/gdm-polkit-gnome-path.patch b/gdm-polkit-gnome-path.patch new file mode 100644 index 0000000..6df8da4 --- /dev/null +++ b/gdm-polkit-gnome-path.patch @@ -0,0 +1,11 @@ +Index: gdm-2.28.0/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in +=================================================================== +--- gdm-2.28.0.orig/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in ++++ gdm-2.28.0/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in +@@ -1,5 +1,5 @@ + [Desktop Entry] + Type=Application + _Name=PolicyKit Authentication Agent +-Exec=/usr/libexec/polkit-gnome-authentication-agent-1 ++Exec=/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 + OnlyShowIn=GNOME; diff --git a/gdm-selecting-desktop-environment.patch b/gdm-selecting-desktop-environment.patch index ede8749..224af89 100644 --- a/gdm-selecting-desktop-environment.patch +++ b/gdm-selecting-desktop-environment.patch @@ -1,8 +1,8 @@ -diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c -index c1ac7cf..a5de412 100644 ---- a/daemon/gdm-session-worker.c -+++ b/daemon/gdm-session-worker.c -@@ -149,6 +149,9 @@ typedef int (* GdmSessionWorkerPamNewMessagesFunc) (int, +Index: gdm-2.28.0/daemon/gdm-session-worker.c +=================================================================== +--- gdm-2.28.0.orig/daemon/gdm-session-worker.c ++++ gdm-2.28.0/daemon/gdm-session-worker.c +@@ -157,6 +157,9 @@ typedef int (* GdmSessionWorkerPamNewMes const struct pam_message **, struct pam_response **, gpointer); @@ -12,10 +12,11 @@ index c1ac7cf..a5de412 100644 G_DEFINE_TYPE (GdmSessionWorker, gdm_session_worker, G_TYPE_OBJECT) -@@ -617,6 +620,21 @@ attempt_to_load_user_settings (GdmSessionWorker *worker, - passwd_entry->pw_dir, +@@ -597,6 +600,22 @@ attempt_to_load_user_settings (GdmSessio + gdm_session_settings_load (worker->priv->user_settings, + username, NULL); - ++ + /* These singal handlers should be disconnected after the loading, + * so that gdm_session_settings_set_* APIs don't cause the emitting + * of Saved*NameRead D-Bus signals any more. @@ -31,6 +32,6 @@ index c1ac7cf..a5de412 100644 + g_signal_handlers_disconnect_by_func (worker->priv->user_settings, + G_CALLBACK (on_saved_layout_name_read), + worker); - seteuid (old_uid); - setegid (old_gid); } + + static void diff --git a/gdm.changes b/gdm.changes index fa59d98..fc4c00c 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,3 +1,52 @@ +------------------------------------------------------------------- +Fri Oct 2 19:33:46 CEST 2009 - vuntz@opensuse.org + +- Add gdm-devkit-power.patch: gdm was using a dbus API which + doesn't exist anymore, and the right way to handle this is to use + DeviceKit-power. +- Add DeviceKit-power-devel BuildRequires for the patch. +- Add gdm-polkit-gnome-path.patch to use the correct path for the + polkit agent. +- Rebase gdm-greeter-greater-ui.patch. Fix bnc#533597. + +------------------------------------------------------------------- +Fri Oct 2 17:25:38 CEST 2009 - vuntz@opensuse.org + +- Make sure to package /var/cache/gdm: without it, gdm doesn't use + the configured language/layout for the user. + +------------------------------------------------------------------- +Fri Oct 2 00:47:14 CEST 2009 - vuntz@opensuse.org + +- Add gdm-autologin-once.patch: we don't want to autologin again + after a logout. Fix bnc#532090. + +------------------------------------------------------------------- +Mon Sep 28 14:59:45 CEST 2009 - vuntz@opensuse.org + +- Update to version 2.28.0: + + GDM supports the ability to specify the automatic/timed login + user via a script via the same interface that the old GDM + supported. + + The user's dmrc and face image files are stored in + /var/cache/gdm, so that the login process does not need to + access the user's $HOME directory before authentication. Refer + to bgo#565151. + + Fix the login GUI options widget so the language/session/layout + choices are not reset after a failed login. + + Fix language dialog so it does not crash if the user click's + the "OK" button when no language is selected. + + Fix to ensure that the login dialog regains focus after the + language or layout dialogs are used. + + The language dialog has improved logic to sort the language + names more correctly. + + Make sure to check error variable is not NULL before + referencing it in the gdm-user-manager code. + + Make sure to not print NULL strings since this causes crashes + on some platforms. + + Improve documentation. +- Add gdm-build-fixes.patch to fix build. + ------------------------------------------------------------------- Mon Sep 28 14:25:50 CEST 2009 - vuntz@opensuse.org diff --git a/gdm.spec b/gdm.spec index 19a5f35..bc9fa5d 100644 --- a/gdm.spec +++ b/gdm.spec @@ -1,5 +1,5 @@ # -# spec file for package gdm (Version 2.27.90) +# spec file for package gdm (Version 2.28.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,6 +19,7 @@ Name: gdm +BuildRequires: DeviceKit-power-devel BuildRequires: check-devel BuildRequires: fdupes BuildRequires: gconf2-devel @@ -41,8 +42,8 @@ BuildRequires: xorg-x11-server-extra BuildRequires: zenity License: GPL v2 or later Group: System/GUI/GNOME -Version: 2.27.90 -Release: 2 +Version: 2.28.0 +Release: 1 Summary: The GNOME 2.x Display Manager Source: %{name}-%{version}.tar.bz2 Source1: gdm.pamd @@ -61,11 +62,11 @@ Patch6: gdm-desktop-session-env-pam.patch # PATCH-FIX-OPENSUSE gdm-suse-xsession.patch vuntz@novell.com -- Use the /etc/X11/xdm/* scripts Patch7: gdm-suse-xsession.patch # PATCH-NEEDS-REBASE gdm-domain-logon.patch hpj@novell.com -- Add UI to log in a specific domain (was: PATCH-FEATURE-SLED) -#Patch8: gdm-domain-logon.patch +Patch8: gdm-domain-logon.patch # PATCH-FIX-OPENSUSE gdm-sysconfig-settings.patch bnc432360 hpj@novell.com -- Read autologin options from /etc/sysconfig/displaymanager Patch13: gdm-sysconfig-settings.patch -# PATCH-NEEDS-REBASE gdm-greeter-greater-ui.patch bnc436431 bgo560508 vuntz@novell.com -- Improve the layout of the greeter. Note: the patch contains a patched glade file *and* the result glade file (for reference only, in case we need to rebase the patch) (was PATCH-FIX-UPSTREAM) -#Patch15: gdm-greeter-greater-ui.patch +# PATCH-FIX-UPSTREAM gdm-greeter-greater-ui.patch bnc436431 bgo560508 vuntz@novell.com -- Improve the layout of the greeter. Note: the patch contains a patched glade file *and* the result glade file (for reference only, in case we need to rebase the patch) +Patch15: gdm-greeter-greater-ui.patch # PATCH-FIX-UPSTREAM gdm-always-reflect-keyboard-layout.patch bnc438159 bgo561771 hpj@novell.com -- Make keyboard selector not neglect to apply the selected keyboard in some situations. Patch18: gdm-always-reflect-keyboard-layout.patch # PATCH-FIX-OPENSUSE gdm-save-panel-space-on-low-resolutions.patch bnc449815 hpj@novell.com -- Hide clock and/or selector labels on low resolutions. @@ -80,8 +81,16 @@ Patch32: gdm-keyboard-from-hal.patch Patch33: gdm-keyboard-from-sysconfig.patch # PATCH-FIX-OPENSUSE gdm-default-wm.patch vuntz@novell.com -- Use sysconfig to know to which desktop to use by default Patch34: gdm-default-wm.patch -# PATCH-FIX-OPENSUSE gdm-xauthlocalhostname.patch vuntz@novell.com -- Set XAUTHLOCALHOSTNAME to localhost for local logins to avoid issues in the session in case the hostname changes +# PATCH-FIX-OPENSUSE gdm-xauthlocalhostname.patch bgo555464 vuntz@novell.com -- Set XAUTHLOCALHOSTNAME to localhost for local logins to avoid issues in the session in case the hostname changes Patch35: gdm-xauthlocalhostname.patch +# PATCH-FIX-UPSTREAM gdm-build-fixes.patch bgo596605 vuntz@novell.com -- Add missing return value +Patch36: gdm-build-fixes.patch +# PATCH-FIX-UPSTREAM gdm-autologin-once.patch bgo587606 vuntz@novell.com -- Make autologin work only once +Patch37: gdm-autologin-once.patch +# PATCH-FIX-UPSTREAM gdm-devkit-power.patch bgo596569 vuntz@opensuse.org -- Use devkit-power instead of non-existing dbus API, patch from upstream +Patch38: gdm-devkit-power.patch +# PATCH-FIX-UPSTREAM gdm-polkit-gnome-path.patch bgo597050 vuntz@opensuse.org -- Use the right patch for the polkit agent. The current patch is a quick workaround for now, until we know how upstream wants to fix this. +Patch39: gdm-polkit-gnome-path.patch # PATCH-FIX-OPENSUSE gdm-selinux.patch -- Small changes to make it compile fine with SELinux Patch60: gdm-selinux.patch Url: http://www.gnome.org/ @@ -140,7 +149,7 @@ gnome-patch-translation-prepare # NEEDS-REBASE - also re-enable gnome-patch-translation-update after patch rebase # %%patch8 -p1 %patch13 -p1 -# %%patch15 -p1 +%patch15 -p1 %patch18 -p1 %patch19 -p1 %patch20 -p1 @@ -152,6 +161,10 @@ gnome-patch-translation-prepare %endif %patch34 -p1 %patch35 -p1 +%patch36 -p1 +%patch37 -p1 +%patch38 -p1 +%patch39 -p1 %patch60 # gnome-patch-translation-update @@ -245,6 +258,7 @@ fi %attr(750,gdm,gdm) %dir %{_localstatedir}/lib/gdm/.gconf.mandatory %attr(640,gdm,gdm) %{_localstatedir}/lib/gdm/.gconf.mandatory/%gconf-tree.xml %attr(640,gdm,gdm) %{_localstatedir}/lib/gdm/.gconf.path +%dir %{_localstatedir}/cache/gdm %config /etc/pam.d/* /sbin/conf.d/SuSEconfig.gdm %config %{_sysconfdir}/dbus-1/system.d/gdm.conf