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 */
3fc0894c3cce1b929e53a9c05839cab83036'>tree</a><a class='active' href='/guix/commit/gnu?id=0c383fc0894c3cce1b929e53a9c05839cab83036'>commit</a><a href='/guix/diff/gnu?id=0c383fc0894c3cce1b929e53a9c05839cab83036'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu'>
<input type='hidden' name='id' value='0c383fc0894c3cce1b929e53a9c05839cab83036'/><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/commit/?id=0c383fc0894c3cce1b929e53a9c05839cab83036'>root</a>/<a href='/guix/commit/gnu?id=0c383fc0894c3cce1b929e53a9c05839cab83036'>gnu</a></div><div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='id' value='0c383fc0894c3cce1b929e53a9c05839cab83036'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'>
<tr><th>author</th><td>Nicolas Goaziou &lt;mail@nicolasgoaziou.fr&gt;</td><td class='right'>2021-02-10 17:17:48 +0100</td></tr>
<tr><th>committer</th><td>Nicolas Goaziou &lt;mail@nicolasgoaziou.fr&gt;</td><td class='right'>2021-02-13 11:50:31 +0100</td></tr>
<tr><th>commit</th><td colspan='2' class='oid'><a href='/guix/commit/gnu?id=0c383fc0894c3cce1b929e53a9c05839cab83036'>0c383fc0894c3cce1b929e53a9c05839cab83036</a> (<a href='/guix/patch/gnu?id=0c383fc0894c3cce1b929e53a9c05839cab83036'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='oid'><a href='/guix/tree/?id=0c383fc0894c3cce1b929e53a9c05839cab83036'>54e64ad70c3dfd32e4593b2a8ad86a2e788b17ec</a> /<a href='/guix/tree/gnu?id=0c383fc0894c3cce1b929e53a9c05839cab83036'>gnu</a></td></tr>
<tr><th>parent</th><td colspan='2' class='oid'><a href='/guix/commit/gnu?id=564a85a0ab7fc469b4fb54766881793114b5ae0d'>564a85a0ab7fc469b4fb54766881793114b5ae0d</a> (<a href='/guix/diff/gnu?id=0c383fc0894c3cce1b929e53a9c05839cab83036&amp;id2=564a85a0ab7fc469b4fb54766881793114b5ae0d'>diff</a>)</td></tr><tr><th>download</th><td colspan='2' class='oid'><a href='/guix/snapshot/guix-0c383fc0894c3cce1b929e53a9c05839cab83036.tar.gz'>guix-0c383fc0894c3cce1b929e53a9c05839cab83036.tar.gz</a><br/><a href='/guix/snapshot/guix-0c383fc0894c3cce1b929e53a9c05839cab83036.zip'>guix-0c383fc0894c3cce1b929e53a9c05839cab83036.zip</a><br/></td></tr></table>
<div class='commit-subject'>gnu: Add rust-getset-0.1.</div><div class='commit-msg'>* gnu/packages/crates-io.scm (rust-getset-0.1): New variable.
</div><div class='diffstat-header'><a href='/guix/diff/?id=0c383fc0894c3cce1b929e53a9c05839cab83036'>Diffstat</a> (limited to 'gnu')</div><table summary='diffstat' class='diffstat'>