mirror of
https://https.git.savannah.gnu.org/git/guix.git/
synced 2025-07-13 10:30:43 +02:00
cbd2db9895
* gnu/packages/patches/xinit-startx-mcookie-path.patch: New file. * gnu/local.mk (dist_patch_DATA): Register patch. * gnu/packages/xorg.scm (xinit)[source]: Add patch. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
23 lines
900 B
Diff
23 lines
900 B
Diff
This patch fixes two bugs in upstream mcookie detection: 1) If mcookie is not
|
|
detected, we still need to set HAS_COOKIE_HANDLER and MK_COOKIE, and 2) the
|
|
value for MK_COOKIE must be a string in order to disallow further preprocessor
|
|
expansions.
|
|
|
|
In particular for 2, if we fail to surround the path in quotes, our path
|
|
contains the token "linux", which gcc further expands, creating an invalid
|
|
path.
|
|
|
|
--- a/configure.ac 2025-03-08 16:48:34.476791744 +0900
|
|
+++ b/configure.ac 2025-03-08 16:48:30.208791623 +0900
|
|
@@ -157,8 +157,10 @@
|
|
fi
|
|
fi
|
|
if test "x$MCOOKIE" != x ; then
|
|
- STARTX_COOKIE_FLAGS='-DHAS_COOKIE_MAKER -DMK_COOKIE="$(MCOOKIE)"'
|
|
+ STARTX_COOKIE_FLAGS='-DHAS_COOKIE_MAKER -DMK_COOKIE="'"'"'$(MCOOKIE)'"'"'"'
|
|
AC_MSG_NOTICE([startx will depend on "$MCOOKIE" to generate xauth cookies])
|
|
+else
|
|
+ STARTX_COOKIE_FLAGS='-DHAS_COOKIE_MAKER -DMK_COOKIE='
|
|
fi
|
|
AC_SUBST(STARTX_COOKIE_FLAGS)
|
|
|