This patch fixes SLiM so it really waits for the X server to be ready
before attempting to connect to it.  Indeed, the X server notices that
its parent process has a handler for SIGUSR1, and consequently sends it
SIGUSR1 when it's ready to accept connections.

The problem was that SLiM doesn't pay attention to SIGUSR1.  So in practice,
if X starts slowly, then SLiM gets ECONNREFUSED a couple of time on
/tmp/.X11-unix/X0, then goes on trying to connect to localhost:6000,
where nobody answers; eventually, it times out and tries again on
/tmp/.X11-unix/X0, and finally it shows up on the screen.

Patch by L. Courtès.

--- slim-1.3.6/app.cpp	2014-02-05 15:27:20.000000000 +0100
+++ slim-1.3.6/app.cpp	2014-02-09 22:42:04.000000000 +0100
@@ -119,7 +119,9 @@ void CatchSignal(int sig) {
 	exit(ERR_EXIT);
 }
 
+static volatile int got_sigusr1 = 0;
 void User1Signal(int sig) {
+	got_sigusr1 = 1;
 	signal(sig, User1Signal);
 }
 
@@ -884,6 +886,7 @@ int App::WaitForServer() {
 	int	ncycles	 = 120;
 	int	cycles;
 
+	while (!got_sigusr1);
 	for(cycles = 0; cycles < ncycles; cycles++) {
 		if((Dpy = XOpenDisplay(DisplayName))) {
 			XSetIOErrorHandler(xioerror);
39f18dd33dab3f9bee29b9a08c6829'>refs</a><a class='active' href='/guix/log/tests/guix-shell-export-manifest.sh'>log</a><a href='/guix/tree/tests/guix-shell-export-manifest.sh?id=907590b67139f18dd33dab3f9bee29b9a08c6829'>tree</a><a href='/guix/commit/tests/guix-shell-export-manifest.sh?id=907590b67139f18dd33dab3f9bee29b9a08c6829'>commit</a><a href='/guix/diff/tests/guix-shell-export-manifest.sh?id=907590b67139f18dd33dab3f9bee29b9a08c6829'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/guix-shell-export-manifest.sh'>
<input type='hidden' name='id' value='907590b67139f18dd33dab3f9bee29b9a08c6829'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=907590b67139f18dd33dab3f9bee29b9a08c6829'>root</a>/<a href='/guix/log/tests?id=907590b67139f18dd33dab3f9bee29b9a08c6829'>tests</a>/<a href='/guix/log/tests/guix-shell-export-manifest.sh?id=907590b67139f18dd33dab3f9bee29b9a08c6829'>guix-shell-export-manifest.sh</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/guix-shell-export-manifest.sh?id=907590b67139f18dd33dab3f9bee29b9a08c6829&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2024-12-14 01:28:49 +0100'>2024-12-14</span></td><td><a href='/guix/commit/tests/guix-shell-export-manifest.sh?id=84de473132218f313b2e71342ff209b8d9db3e80'>tests: guix-shell-export-manifest: Fix pyproject-build-system python test.</a><span class='msg-avail'>...<span class='msg-tooltip'>This is a follow-up to commit
    fdc0fefd46a45b70784a4e3f8900cbe593426a9e
    build-system/pyproject: Use python-sans-pip-wrapper as default-python.

* tests/guix-shell-export-manifest.sh: Grep for python-sans-pip-wrapper, which
is the python now used by the pyproject-build-system.

Change-Id: I5f44e07544f80973fa6b306b2dcdf42ac3b56ad6
</span></span></td><td>Janneke Nieuwenhuizen</td></tr>