From: Danny Milosavljevic <dannym@scratchpost.org>
Date: Thu, 2 Apr 2022 12:10:00 +0200
Subject: Make xterm use libxcursor directly

Fixes <https://issues.guix.gnu.org/54654>.

This patch makes xterm use libxcursor directly.
Without it, libx11 would try to dlopen("libXcursor.so.1") and fail.

--- xterm-370/misc.c.orig	2022-04-02 11:52:26.225131854 +0200
+++ xterm-370/misc.c	2022-04-02 12:06:13.091482385 +0200
@@ -79,6 +79,9 @@
 #ifdef HAVE_LIBXPM
 #include <X11/xpm.h>
 #endif
+#ifdef HAVE_LIB_XCURSOR
+#include <X11/Xcursor/Xcursor.h>
+#endif
 
 #ifdef HAVE_LANGINFO_CODESET
 #include <langinfo.h>
@@ -866,7 +869,14 @@
 		 * 0, 2 a shape, 3 a mask for 2, etc.  <X11/cursorfont.h>
 		 * contains defined names for each shape.
 		 */
-		c = XCreateGlyphCursor(dpy,
+		c = XcursorTryShapeCursor(dpy,
+				       myFont.fs->fid, /* source_font */
+				       myFont.fs->fid, /* mask_font */
+				       c_index + 0, /* source_char */
+				       c_index + 1, /* mask_char */
+				       &foreground,
+				       &background);
+		if (c == None) c = XCreateGlyphCursor(dpy,
 				       myFont.fs->fid,	/* source_font */
 				       myFont.fs->fid,	/* mask_font */
 				       c_index + 0,	/* source_char */
</a><a href='/guix/tree/gnu/packages/dav.scm?id=22530b2645d64658e4b7dea8801f5604dfd395a0'>tree</a><a href='/guix/commit/gnu/packages/dav.scm?id=22530b2645d64658e4b7dea8801f5604dfd395a0'>commit</a><a href='/guix/diff/gnu/packages/dav.scm?id=22530b2645d64658e4b7dea8801f5604dfd395a0'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/dav.scm'>
<input type='hidden' name='id' value='22530b2645d64658e4b7dea8801f5604dfd395a0'/><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=22530b2645d64658e4b7dea8801f5604dfd395a0'>root</a>/<a href='/guix/log/gnu?id=22530b2645d64658e4b7dea8801f5604dfd395a0'>gnu</a>/<a href='/guix/log/gnu/packages?id=22530b2645d64658e4b7dea8801f5604dfd395a0'>packages</a>/<a href='/guix/log/gnu/packages/dav.scm?id=22530b2645d64658e4b7dea8801f5604dfd395a0'>dav.scm</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/gnu/packages/dav.scm?id=22530b2645d64658e4b7dea8801f5604dfd395a0&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-07-07 14:46:29 +0300'>2022-07-07</span></td><td><a href='/guix/commit/gnu/packages/dav.scm?id=4ddf903872dce121ace3f4d5102dac50b0924a96'>gnu: radicale: Update to 3.1.7.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/dav.scm (radicale): Update to 3.1.7.
</span></span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2022-06-26 22:10:38 -0400'>2022-06-26</span></td><td><a href='/guix/commit/gnu/packages/dav.scm?id=ed210c1b8ff95003645499a4b48279a68c4685cf'>gnu: python-setuptools-scm: Move to (gnu packages python-build).</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/python-xyz.scm (python-setuptools-scm): Move from here...
* gnu/packages/python-build.scm (python-setuptools-scm): ... to here.
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2022-04-03 12:49:07 +0200'>2022-04-03</span></td><td><a href='/guix/commit/gnu/packages/dav.scm?id=3471b8fae2327ce0ba9276719cfa3c5bec3a57e9'>gnu: radicale: Update to 3.1.5.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/dav.scm (radicale): Update to 3.1.5.
[source]: tags have a leading "v" now.
[arguments]: disable tests temporarily.

Tested-by: Jonathan Brielmaier &lt;jonathan.brielmaier@web.de&gt;
</span></span></td><td>Jonathan Brielmaier</td></tr>
<tr><td><span title='2021-12-13 17:48:25 +0100'>2021-12-13</span></td><td><a href='/guix/commit/gnu/packages/dav.scm?id=8394619baceb118df92e355377fd543bb1aa501a'>gnu: Simplify package inputs.</a><span class='msg-avail'>...<span class='msg-tooltip'>This commit was obtained by running:

  ./pre-inst-env guix style

without any additional argument.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-11-25 14:10:45 -0500'>2021-11-25</span></td><td><a href='/guix/commit/gnu/packages/dav.scm?id=b2022a09eb511422b8fc4562ae52f0647dd175ce'>gnu: vdirsyncer: Update to 0.18.0.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/dav.scm (vdirsyncer): Update to 0.18.0.

Signed-off-by: Leo Famulari &lt;leo@famulari.name&gt;
</span></span></td><td>Tanguy Le Carrour</td></tr>