Hello community, here is the log from the commit of package fltk for openSUSE:Factory checked in at 2015-01-30 06:11:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fltk (Old) and /work/SRC/openSUSE:Factory/.fltk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fltk" Changes: -------- --- /work/SRC/openSUSE:Factory/fltk/fltk.changes 2015-01-22 21:48:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.fltk.new/fltk.changes 2015-01-30 06:11:22.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Jan 26 12:33:38 UTC 2015 - [email protected] + +- Add fltk-1.3.3-do-not-use-internal-ABI.patch: do not use internal + function Fl_XFont_On_Demand::value(), which changes ABI based on + the configuration. Add a fl_core_font() getter for the same. + +------------------------------------------------------------------- New: ---- fltk-1.3.3-do-not-use-internal-ABI.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fltk.spec ++++++ --- /var/tmp/diff_new_pack.HP08ku/_old 2015-01-30 06:11:23.000000000 +0100 +++ /var/tmp/diff_new_pack.HP08ku/_new 2015-01-30 06:11:23.000000000 +0100 @@ -30,6 +30,8 @@ Patch0: fltk-1.3.2-do_not_add_unneeded_extra_dependencies.patch # PATCH-FIX-OPENSUSE fltk-1.3.2-verbose_build.patch [email protected] -- Make the build verbose so the post build checks can verify the CFLAGS Patch2: fltk-1.3.2-verbose_build.patch +# PATCH-FIX-UPSTREAM fltk-1.3.3-do-not-use-internal-ABI.patch [email protected] -- Do not use internal functions +Patch3: fltk-1.3.3-do-not-use-internal-ABI.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: doxygen BuildRequires: gcc-c++ @@ -102,6 +104,7 @@ %setup -q %patch0 %patch2 +%patch3 -p0 %build %configure \ ++++++ fltk-1.3.3-do-not-use-internal-ABI.patch ++++++ 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); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
