parent
e623a6a54c
commit
8a3d023a4b
|
@ -1,42 +0,0 @@
|
||||||
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!
|
|
|
@ -1,9 +1,10 @@
|
||||||
# Template file for 'fltk'
|
# Template file for 'fltk'
|
||||||
pkgname=fltk
|
pkgname=fltk
|
||||||
version=1.3.3
|
version=1.3.4
|
||||||
revision=5
|
revision=1
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--enable-threads --enable-xft --enable-shared"
|
configure_args="--enable-threads --enable-xft --enable-shared"
|
||||||
|
hostmakedepends="man-db"
|
||||||
makedepends="libjpeg-turbo-devel libpng-devel MesaLib-devel alsa-lib-devel
|
makedepends="libjpeg-turbo-devel libpng-devel MesaLib-devel alsa-lib-devel
|
||||||
freetype-devel libXinerama-devel libXft-devel"
|
freetype-devel libXinerama-devel libXft-devel"
|
||||||
short_desc="Cross-platform C++ GUI toolkit"
|
short_desc="Cross-platform C++ GUI toolkit"
|
||||||
|
@ -11,7 +12,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||||
license="LGPL-2.1"
|
license="LGPL-2.1"
|
||||||
homepage="http://www.fltk.org/"
|
homepage="http://www.fltk.org/"
|
||||||
distfiles="http://fltk.org/pub/fltk/${version}/fltk-${version}-source.tar.gz"
|
distfiles="http://fltk.org/pub/fltk/${version}/fltk-${version}-source.tar.gz"
|
||||||
checksum=f8398d98d7221d40e77bc7b19e761adaf2f1ef8bb0c30eceb7beb4f2273d0d97
|
checksum=c8ab01c4e860d53e11d40dc28f98d2fe9c85aaf6dbb5af50fd6e66afec3dc58f
|
||||||
|
|
||||||
pre_build() {
|
pre_build() {
|
||||||
sed -i '/DIRS =/s,test,,' Makefile
|
sed -i '/DIRS =/s,test,,' Makefile
|
||||||
|
|
Loading…
Reference in New Issue