This patch from upstream revision 10588. --- fltk-1.3.3/src/Xutf8.h +++ fltk-1.3.3/src/Xutf8.h @@ -25,6 +25,7 @@ #include #include #include +#include typedef struct { int nb_font; @@ -98,8 +99,8 @@ XUtf8FontStruct *font_set, unsigned int ucs); -int -XGetUtf8FontAndGlyph( +FL_EXPORT int +fl_XGetUtf8FontAndGlyph( XUtf8FontStruct *font_set, unsigned int ucs, XFontStruct **fnt, --- fltk-1.3.3/src/gl_draw.cxx +++ fltk-1.3.3/src/gl_draw.cxx @@ -114,7 +114,7 @@ for (int i = 0; i < 0x400; i++) { XFontStruct *font = NULL; unsigned short id; - XGetUtf8FontAndGlyph(gl_fontsize->font, ii, &font, &id); + fl_XGetUtf8FontAndGlyph(gl_fontsize->font, ii, &font, &id); if (font) glXUseXFont(font->fid, id, 1, gl_fontsize->listbase+ii); ii++; } --- fltk-1.3.3/src/xutf8/utf8Wrap.c +++ fltk-1.3.3/src/xutf8/utf8Wrap.c @@ -816,10 +816,10 @@ /** get the X font and glyph ID of a UCS char **/ /*****************************************************************************/ int -XGetUtf8FontAndGlyph(XUtf8FontStruct *font_set, - unsigned int ucs, - XFontStruct **fnt, - unsigned short *id) { +fl_XGetUtf8FontAndGlyph(XUtf8FontStruct *font_set, + unsigned int ucs, + XFontStruct **fnt, + unsigned short *id) { /* int x; */ int *encodings; /* encodings array */ 75dd6f14a3b135e5e691806df996e6ad'>diff
AgeCommit message (Expand)Author
2024-02-05linux-container: Inherit essential services....Currently it's not possible to set `essential-services' when building operating systems for containers, since `container-essential-services' always uses the defaults. It's possible to reference `essential-services' from the operating system that's passed in, but since it's thunked, the operating system needs to be defined in two passes to avoid an infinite loop. * gnu/system/linux-container.scm (container-essential-services): Use operating-system-essential-services instead of the defaults to allow overriding the base services. (containerized-operating-system): Update accordingly. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Change-Id: I81452487ef1ad01d3fa874c26d93a67d58ce6062 Leo Nikkilä
2023-06-24linux-container: Pass '--disable-chroot' to 'guix-daemon'....This allows for the use of Guix within a non-privileged Docker container produced by 'guix system image -t docker'. * gnu/system/linux-container.scm (containerized-operating-system): Change 'guix-configuration' to add "--disable-chroot". Ludovic Courtès
2023-06-09linux-container: Adjust to 'modify-services' semantic change....This is a followup to dbbc7e946131ba257728f1d05b96c4339b7ee88b: 'nscd-service-type' isn't necessarily present in OS, so we cannot use the 'modify-services' as it would now error out. This was happening with the "guix system docker-image" test in 'tests/guix-system.sh'. * gnu/system/linux-container.scm (containerized-operating-system): Use 'filter-map' instead of 'remove' + 'modify-services'. Ludovic Courtès
2023-03-26linux-container: Remove hosts-service-type when network is shared....Fixes <https://issues.guix.gnu.org/61627>. * gnu/system/linux-container.scm (container-essential-services): When shared-network? is true, remove the hosts-service-type service kind. Pierre Langlois