# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1476552105 -7200
# Node ID e1759a3c14eca3856a61c07476de936984f9bb11
# Parent  acb8ffc53deb8d4205ec6e71681f3e83600453c0
fltk: add Fl_XFont_On_Demand.patch

diff -r acb8ffc53deb -r e1759a3c14ec fltk/receipt
--- a/fltk/receipt	Sat Oct 15 18:21:21 2016 +0200
+++ b/fltk/receipt	Sat Oct 15 19:21:45 2016 +0200
@@ -14,7 +14,7 @@
 DEPENDS="expat fontconfig freetype libpng jpeg xorg-libX11 xorg-libXau xorg-libXdmcp \
 xorg-libXext xorg-libXft xorg-libXrender zlib gcc-lib-base mesa libglu-mesa"
 BUILD_DEPENDS="jpeg-dev libpng-dev libglu-mesa libglu-mesa-dev mesa mesa-dev \
-xorg-libXinerama-dev"
+xorg-libXinerama-dev xorg-libXft-dev"
 
 # Handle SliTaz arch
 case "$SLITAZ_ARCH" in
@@ -34,6 +34,7 @@
 # Rules to configure and make the package.
 compile_rules()
 {
+	patch -p0 < $stuff/Fl_XFont_On_Demand.patch
 	./configure ${ARCH_ARGS} \
 		--enable-shared \
 		--enable-xft \
diff -r acb8ffc53deb -r e1759a3c14ec fltk/stuff/Fl_XFont_On_Demand.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fltk/stuff/Fl_XFont_On_Demand.patch	Sat Oct 15 19:21:45 2016 +0200
@@ -0,0 +1,42 @@
+Index: src/fl_font.cxx
+===================================================================
+--- src/fl_font.cxx	(revision 10503)
++++ src/fl_font.cxx	(revision 10504)
+@@ -55,6 +55,12 @@
+ #  include "fl_font_x.cxx"
+ #endif // WIN32
+ 
++#if ! (defined(WIN32) || defined(__APPLE__))
++XFontStruct *fl_X_core_font()
++{
++  return fl_xfont.value();
++}
++#endif
+ 
+ double fl_width(const char* c) {
+   if (c) return fl_width(c, (int) strlen(c));
+Index: src/gl_draw.cxx
+===================================================================
+--- src/gl_draw.cxx	(revision 10503)
++++ src/gl_draw.cxx	(revision 10504)
+@@ -81,7 +81,7 @@
+  * then sorting through them at draw time (for normal X rendering) to find which one can
+  * render the current glyph... But for now, just use the first font in the list for GL...
+  */
+-    XFontStruct *font = fl_xfont;
++    XFontStruct *font = fl_X_core_font();
+     int base = font->min_char_or_byte2;
+     int count = font->max_char_or_byte2-base+1;
+     fl_fontsize->listbase = glGenLists(256);
+Index: FL/x.H
+===================================================================
+--- FL/x.H	(revision 10503)
++++ FL/x.H	(revision 10504)
+@@ -132,6 +132,7 @@
+   XFontStruct *ptr;
+ };
+ extern FL_EXPORT Fl_XFont_On_Demand fl_xfont;
++extern FL_EXPORT XFontStruct* fl_X_core_font();
+ 
+ // this object contains all X-specific stuff about a window:
+ // Warning: this object is highly subject to change!