add missing exported symbol for FlightGear to build [release 1.3.3-2mamba;Sat Mar 21 2015]

This commit is contained in:
Silvan Calarco 2024-01-06 04:16:08 +01:00
parent 0934008a13
commit 4894a45015
2 changed files with 50 additions and 1 deletions

View File

@ -0,0 +1,44 @@
Index: FL/x.H
===================================================================
--- FL/x.H (revision 10476)
+++ FL/x.H (working copy)
@@ -132,6 +132,7 @@
XFontStruct *ptr;
};
extern FL_EXPORT Fl_XFont_On_Demand fl_xfont;
+extern FL_EXPORT XFontStruct* fl_core_font();
// this object contains all X-specific stuff about a window:
// Warning: this object is highly subject to change!
Index: src/fl_font.cxx
===================================================================
--- src/fl_font.cxx (revision 10476)
+++ src/fl_font.cxx (working copy)
@@ -55,6 +55,14 @@
# include "fl_font_x.cxx"
#endif // WIN32
+#ifdef WIN32
+#elif defined(__APPLE__)
+#else
+XFontStruct *fl_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 10476)
+++ src/gl_draw.cxx (working copy)
@@ -84,7 +84,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_core_font();
int base = font->min_char_or_byte2;
int count = font->max_char_or_byte2-base+1;
fl_fontsize->listbase = glGenLists(256);

View File

@ -1,6 +1,6 @@
Name: libfltk
Version: 1.3.3
Release: 1mamba
Release: 2mamba
Summary: A cross-platform C++ GUI toolkit
Group: System/Libraries
Vendor: openmamba
@ -9,6 +9,7 @@ Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: http://www.fltk.org/index.php
Source: http://fltk.org/pub/fltk/%{version}/fltk-%{version}-source.tar.gz
Patch0: %{name}-1.1.9-gcc44.patch
Patch1: libfltk-1.3.3-font_missing_export.patch
License: GPL
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
@ -61,6 +62,7 @@ This package contains the Checkers and Sudoku FLTK games.
%prep
%setup -q -n fltk-%{version}
#%patch0 -p1
%patch1 -p0
%build
%configure \
@ -133,6 +135,9 @@ install -d %{buildroot}%{_datadir}/applications
%{_mandir}/man6/checkers.*
%changelog
* Sat Mar 21 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 1.3.3-2mamba
- add missing exported symbol for FlightGear to build
* Sun Dec 28 2014 Automatic Build System <autodist@mambasoft.it> 1.3.3-1mamba
- automatic version update by autodist