rpm/gdm
SHA256
1
0
Fork 0
forked from pool/gdm
Code Pull Requests Activity

Accepting request 58283 from GNOME:Factory

Browse Source 
Accepted submit request 58283 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/58283
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gdm?expand=0&rev=106
This commit is contained in:
Marcus Rückert 2011-01-15 01:48:56 +00:00 committed by Git OBS Bridge
commit 34364ecd4c
3 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gdm-vt-allocation-hack.patch
View File

@ -1,17 +1,17 @@
Index: gdm-2.31.2/daemon/gdm-server.c
Index: gdm-2.32.0/daemon/gdm-server.c
===================================================================
--- gdm-2.31.2.orig/daemon/gdm-server.c
+++ gdm-2.31.2/daemon/gdm-server.c
@@ -33,6 +33,8 @@
#include <grp.h>
#include <signal.h>
#include <sys/resource.h>
--- gdm-2.32.0.orig/daemon/gdm-server.c
+++ gdm-2.32.0/daemon/gdm-server.c
@@ -27,6 +27,8 @@
#include <string.h>
#include <sys/types.h>
#include <sys/wait.h>
+#include <sys/ioctl.h>
+#include <sys/vt.h>
#ifdef HAVE_SYS_PRCTL_H
#include <sys/prctl.h>
@@ -154,6 +156,92 @@ _gdm_server_query_ck_for_display_device
#include <errno.h>
#include <ctype.h>
#include <pwd.h>
@@ -157,6 +159,92 @@ _gdm_server_query_ck_for_display_device
return out;
}
@ -104,7 +104,7 @@ Index: gdm-2.31.2/daemon/gdm-server.c
char *
gdm_server_get_display_device (GdmServer *server)
{
@@ -314,6 +402,11 @@ gdm_server_resolve_command_line (GdmServ
@@ -317,6 +405,11 @@ gdm_server_resolve_command_line (GdmServ
if (vtarg != NULL && ! gotvtarg) {
argv[len++] = g_strdup (vtarg);

14
gdm.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Fri Jan 14 18:51:02 CET 2011 - vuntz@opensuse.org
- Rebase gdm-vt-allocation-hack.patch to actually apply.
- Apply gdm-vt-allocation-hack.patch on 11.4 and later again: the
topic needs more discussion, and without the hack, on a default
boot, a mingetty instance will receive all the input from Xorg.
This is because Xorg will start on tty2 and a mingetty will also
start there, because of the sysvinit configration. This is
extremely bad, since this means everything the user types will
lead to login attemps in mingetty.
- Add gnome-power-manager and iso-codes Recommends: they are both
improving the gdm experience, but are not mandatory.
-------------------------------------------------------------------
Tue Jan 11 12:57:17 CET 2011 - vuntz@opensuse.org

6
gdm.spec
View File

@ -55,7 +55,7 @@ Patch1: gdm-plymouth-X-nr.patch
Patch2: gdm-helper-directory.patch
# PATCH-FIX-OPENSUSE gdm-is-not-unstable-unless.patch vuntz@opensuse.org -- Make gdm think it's never running a development version unless SUSE_ENABLE_UNSTABLE_CHECK is set. This disables fatal warnings as well as abusive log
Patch3: gdm-is-not-unstable-unless.patch
# PATCH-FIX-UPSTREAM gdm-vt-allocation-hack.patch bgo511168 hpj@novell.com -- Needed for user switching. Needed only for 11.3 and earlier
# PATCH-FIX-UPSTREAM gdm-vt-allocation-hack.patch bgo511168 hpj@novell.com -- Needed for user switching
Patch4: gdm-vt-allocation-hack.patch
# PATCH-FIX-UPSTREAM gdm-focus-user-chooser.patch bgo#629310 bnc#652938 vuntz@opensuse.org -- Correctly give the focus to the user chooser on startup
Patch5: gdm-focus-user-chooser.patch
@ -102,7 +102,9 @@ Requires: xorg-x11-server-extra
# For groupadd, useradd, usermod
PreReq: pwdutils
PreReq: %insserv_prereq
Recommends: gnome-power-manager
Recommends: gnome-settings-daemon
Recommends: iso-codes
%gconf_schemas_prereq
%description
@ -150,9 +152,7 @@ translation-update-upstream
%patch1 -p1
%patch2 -p1
%patch3 -p1
%if 0%{?suse_version} <= 1130
%patch4 -p1
%endif
%patch5 -p1
%patch6 -p1
%patch7 -p1