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

Accepting request 843130 from home:dimstar:Factory

Browse Source 
Resubmit after tifan reviewed it

OBS-URL: https://build.opensuse.org/request/show/843130
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=464
This commit is contained in:
Yifan Jiang 2020-10-21 07:02:12 +00:00 committed by Git OBS Bridge
parent e135536741
commit 2b4591480e
2 changed files with 43 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
gdm-suse-xsession.patch
View File

@ -1,53 +1,61 @@
Index: gdm-3.36.2/data/Init.in diff --git a/data/Init.in b/data/Init.in
=================================================================== index ec6fd395..4b8ed8ce 100644
--- gdm-3.36.2.orig/data/Init.in --- a/data/Init.in
+++ gdm-3.36.2/data/Init.in +++ b/data/Init.in
@@ -1,4 +1,9 @@ @@ -1,4 +1,11 @@
#!/bin/sh #!/bin/sh
+ +
+if test -x /etc/X11/xdm/Xsetup; then +if test -x /etc/X11/xdm/Xsetup; then
+ exec /etc/X11/xdm/Xsetup + exec /etc/X11/xdm/Xsetup
+elif test -x /usr/etc/X11/xdm/Xsetup; then
+ exec /usr/etc/X11/xdm/Xsetup
+fi +fi
+ +
# Stolen from the debian kdm setup, aren't I sneaky # Stolen from the debian kdm setup, aren't I sneaky
# Plus a lot of fun stuff added # Plus a lot of fun stuff added
# -George # -George
Index: gdm-3.36.2/data/PostSession.in diff --git a/data/PostSession.in b/data/PostSession.in
=================================================================== index c52d3c26..4d94b3e7 100755
--- gdm-3.36.2.orig/data/PostSession.in --- a/data/PostSession.in
+++ gdm-3.36.2/data/PostSession.in +++ b/data/PostSession.in
@@ -1,3 +1,7 @@ @@ -1,3 +1,9 @@
#!/bin/sh #!/bin/sh
+if test -x /etc/X11/xdm/Xreset; then +if test -x /etc/X11/xdm/Xreset; then
+ exec /etc/X11/xdm/Xreset + exec /etc/X11/xdm/Xreset
+elif test -x /usr/etc/X11/xdm/Xreset; then
+ exec /usr/etc/X11/xdm/Xreset
+fi +fi
+ +
exit 0 exit 0
Index: gdm-3.36.2/data/Xsession.in diff --git a/data/PreSession.in b/data/PreSession.in
=================================================================== index cfabee75..306a905e 100755
--- gdm-3.36.2.orig/data/Xsession.in --- a/data/PreSession.in
+++ gdm-3.36.2/data/Xsession.in +++ b/data/PreSession.in
@@ -1,4 +1,9 @@ @@ -6,4 +6,10 @@
#!@XSESSION_SHELL@
+
+if test -x /etc/X11/xdm/Xsession; then
+ exec /etc/X11/xdm/Xsession $1 $GDM_LANG
+fi
+
#
# This is SORT OF LIKE an X session, but not quite. You get a command as the
# first argument (it could be multiple words, so run it with "eval"). As a
Index: gdm-3.36.2/data/PreSession.in
===================================================================
--- gdm-3.36.2.orig/data/PreSession.in
+++ gdm-3.36.2/data/PreSession.in
@@ -6,4 +6,8 @@
# #
# Note that output goes into the .xsession-errors file for easy debugging # Note that output goes into the .xsession-errors file for easy debugging
# #
+if test -x /etc/X11/xdm/Xstartup; then +if test -x /etc/X11/xdm/Xstartup; then
+ exec /etc/X11/xdm/Xstartup + exec /etc/X11/xdm/Xstartup
+elif test -x /usr/etc/X11/xdm/Xstartup; then
+ exec /usr/etc/X11/xdm/Xstartup
+fi +fi
+ +
PATH="@X_PATH@:$PATH" PATH="@X_PATH@:$PATH"
diff --git a/data/Xsession.in b/data/Xsession.in
index 9d79558c..bcefdd73 100755
--- a/data/Xsession.in
+++ b/data/Xsession.in
@@ -1,4 +1,11 @@
#!@XSESSION_SHELL@
+
+if test -x /etc/X11/xdm/Xsession; then
+ exec /etc/X11/xdm/Xsession $1 $GDM_LANG
+elif test -x /usr/etc/X11/xdm/Xsession; then
+ exec /usr/etc/X11/xdm/Xsession $1 $GDM_LANG
+fi
+
#
# This is SORT OF LIKE an X session, but not quite. You get a command as the
# first argument (it could be multiple words, so run it with "eval"). As a

6
gdm.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Oct 20 20:10:53 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
- Update gdm-suse-xsession.patch: Handle the fact that xdm moved
its files from /etc to /usr/etc (boo#1177918).
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Sep 16 09:17:43 UTC 2020 - Stefan Dirsch <sndirsch@suse.com> Wed Sep 16 09:17:43 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>