204 lines
9.4 KiB
Diff
204 lines
9.4 KiB
Diff
--- 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 <dbus/dbus-glib.h>
|
|
#include <dbus/dbus-glib-lowlevel.h>
|
|
@@ -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
|
|
|