fix a hang
This commit is contained in:
parent
5d8b69a54b
commit
05da170cf0
9
gdm.spec
9
gdm.spec
@ -16,7 +16,7 @@
|
|||||||
Summary: The GNOME Display Manager
|
Summary: The GNOME Display Manager
|
||||||
Name: gdm
|
Name: gdm
|
||||||
Version: 2.20.0
|
Version: 2.20.0
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
Group: User Interface/X
|
Group: User Interface/X
|
||||||
@ -55,6 +55,9 @@ Patch35: gdmsetup-path.patch
|
|||||||
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=254164
|
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=254164
|
||||||
Patch37: gdm-2.19.8-selinux.patch
|
Patch37: gdm-2.19.8-selinux.patch
|
||||||
|
|
||||||
|
# fixed in upstream svn
|
||||||
|
Patch38: hang.patch
|
||||||
|
|
||||||
Patch100: gdm-2.19.8-change-defaults.patch
|
Patch100: gdm-2.19.8-change-defaults.patch
|
||||||
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
@ -139,6 +142,7 @@ Extra icons / faces for the GNOME Display Manager.
|
|||||||
%patch33 -p1 -b .pass-ats-to-session
|
%patch33 -p1 -b .pass-ats-to-session
|
||||||
%patch35 -p1 -b .gdmsetup-path
|
%patch35 -p1 -b .gdmsetup-path
|
||||||
%patch37 -p1 -b .selinux
|
%patch37 -p1 -b .selinux
|
||||||
|
%patch38 -p1 -b .hang
|
||||||
|
|
||||||
%patch100 -p1 -b .change-defaults
|
%patch100 -p1 -b .change-defaults
|
||||||
|
|
||||||
@ -351,6 +355,9 @@ fi
|
|||||||
%{_datadir}/pixmaps/faces/extras/*.jpg
|
%{_datadir}/pixmaps/faces/extras/*.jpg
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Sep 19 2007 Matthias Clasen <mclasen@redhat.com> - 1:2.20.0-2
|
||||||
|
- Fix a hang on restart (#240853)
|
||||||
|
|
||||||
* Tue Sep 18 2007 Matthias Clasen <mclasen@redhat.com> - 1:2.20.0-1
|
* Tue Sep 18 2007 Matthias Clasen <mclasen@redhat.com> - 1:2.20.0-1
|
||||||
- Update to 2.20.0
|
- Update to 2.20.0
|
||||||
|
|
||||||
|
24
hang.patch
Normal file
24
hang.patch
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
--- trunk/gui/gdmcommon.c 2007/09/18 14:48:25 5279
|
||||||
|
+++ trunk/gui/gdmcommon.c 2007/09/18 18:39:42 5280
|
||||||
|
@@ -681,7 +681,9 @@
|
||||||
|
g_spawn_async (".",
|
||||||
|
pre_fetch_prog_argv,
|
||||||
|
NULL,
|
||||||
|
- (GSpawnFlags) (G_SPAWN_SEARCH_PATH),
|
||||||
|
+ (GSpawnFlags) (G_SPAWN_SEARCH_PATH |
|
||||||
|
+ G_SPAWN_STDOUT_TO_DEV_NULL |
|
||||||
|
+ G_SPAWN_STDERR_TO_DEV_NULL),
|
||||||
|
NULL,
|
||||||
|
NULL,
|
||||||
|
&pid,
|
||||||
|
@@ -710,7 +712,9 @@
|
||||||
|
g_spawn_async (".",
|
||||||
|
atspi_prog_argv,
|
||||||
|
NULL,
|
||||||
|
- (GSpawnFlags) (G_SPAWN_SEARCH_PATH),
|
||||||
|
+ (GSpawnFlags) (G_SPAWN_SEARCH_PATH |
|
||||||
|
+ G_SPAWN_STDOUT_TO_DEV_NULL |
|
||||||
|
+ G_SPAWN_STDERR_TO_DEV_NULL),
|
||||||
|
NULL,
|
||||||
|
NULL,
|
||||||
|
&pid,
|
Loading…
Reference in New Issue
Block a user