diff options
| author | Feng Shu <tumashu@163.com> | 2023-12-14 09:28:44 +0800 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2023-12-23 11:17:49 +0100 |
| commit | 2c8cdb05502cacaf603da231796ccafa59671117 (patch) | |
| tree | e5156e112a2d061ce589725ab6b1647ddf4de1a3 /gnu/packages/patches/slim-sigusr1.patch | |
| parent | 3320c9704353cea29ae34662f3975bf6b58c87f9 (diff) | |
gnu: slim: Update to 1.4.0.
* gnu/packages/display-managers.scm (slim)[version]: Update to 1.4.0.
[inputs]: Remove input label.
[arguments]: Use gexp and remove fix-0-pointer-comparison.
[home-pages]: Update to slim-fork's url.
* gnu/packages/patches/slim-config.patch: Port to slim-1.4.0.
* gnu/packages/patches/slim-display.patch: Port to slim-1.4.0.
* gnu/packages/patches/slim-reset.patch: Deleted, no ablilty to port this
patch for big change in v1.4.0.
* gnu/packages/patches/slim-session.patch: Deleted. seem to work without this
patch, further observation is needed.
* gnu/packages/patches/slim-sigusr1.patch: Deleted, fixed in upstream.
* gnu/local.mk: Remove slim-reset.patch, slim-session.patch, slim-sigur1.patch.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu/packages/patches/slim-sigusr1.patch')
| -rw-r--r-- | gnu/packages/patches/slim-sigusr1.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/gnu/packages/patches/slim-sigusr1.patch b/gnu/packages/patches/slim-sigusr1.patch deleted file mode 100644 index 344b02933e..0000000000 --- a/gnu/packages/patches/slim-sigusr1.patch +++ /dev/null @@ -1,33 +0,0 @@ -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); |