Hello community, here is the log from the commit of package libLASi for openSUSE:Factory checked in at 2013-12-19 12:16:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libLASi (Old) and /work/SRC/openSUSE:Factory/.libLASi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libLASi" Changes: -------- --- /work/SRC/openSUSE:Factory/libLASi/libLASi.changes 2013-08-10 18:16:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libLASi.new/libLASi.changes 2013-12-19 12:16:27.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Dec 12 02:57:04 UTC 2013 - [email protected] + +- Added use-recommended-freetype-include.patch -- Freetype upstream + recommends using their macros together with ft2build include. + Positive sideeffect is that this patch makes it build with both + freetype2 2.5.1, and older version + +------------------------------------------------------------------- New: ---- use-recommended-freetype-include.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libLASi.spec ++++++ --- /var/tmp/diff_new_pack.Eq6iAc/_old 2013-12-19 12:16:28.000000000 +0100 +++ /var/tmp/diff_new_pack.Eq6iAc/_new 2013-12-19 12:16:28.000000000 +0100 @@ -24,6 +24,9 @@ Group: Development/Libraries/C and C++ Url: http://unifont.org/lasi/ Source: http://download.sourceforge.net/lasi/%{name}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM use-recommended-freetype-include.patch -- Freetype upstream recommends using their macros together with +# ft2build include. Positive sideeffect is that this patch makes it build with both freetype2 2.5.1, and older versions +Patch0: use-recommended-freetype-include.patch BuildRequires: cmake >= 2.4.5 BuildRequires: doxygen BuildRequires: fdupes @@ -99,6 +102,7 @@ %prep %setup -q +%patch0 -p0 %build export CFLAGS="%{optflags}" ++++++ use-recommended-freetype-include.patch ++++++ --- include/LASi.h.orig 2011-09-21 14:09:55.000000000 -0500 +++ include/LASi.h 2013-11-27 05:49:26.000000000 -0600 @@ -11,7 +11,8 @@ #include <sstream> #include <map> #include <pango/pango.h> -#include <freetype/ftglyph.h> +#include <ft2build.h> +#include FT_GLYPH_H class FreetypeGlyphMgr; class ContextMgr; --- src/drawGlyph.cpp.orig 2011-09-21 14:09:55.000000000 -0500 +++ src/drawGlyph.cpp 2013-11-27 05:47:16.000000000 -0600 @@ -6,7 +6,8 @@ */ #include <ostream> -#include <freetype/ftoutln.h> +#include <ft2build.h> +#include FT_OUTLINE_H #include <algorithm> #include <LASi.h> #include <config.h> --- src/glyphMgr.cpp.orig 2011-09-21 14:09:55.000000000 -0500 +++ src/glyphMgr.cpp 2013-11-27 05:49:04.000000000 -0600 @@ -10,8 +10,7 @@ #include <ft2build.h> #include FT_FREETYPE_H - -#include <freetype/ftglyph.h> +#include FT_GLYPH_H #include <cassert> #include "util.h" --- src/glyphMgr.h.orig 2011-09-21 14:09:55.000000000 -0500 +++ src/glyphMgr.h 2013-11-27 05:48:18.000000000 -0600 @@ -15,8 +15,7 @@ #include <ft2build.h> #include FT_FREETYPE_H - -#include <freetype/ftglyph.h> +#include FT_GLYPH_H /** Manage FT_Glyph by insuring that FT_Glyph is handled correctly. */ --- src/util.h.orig 2011-09-21 14:09:55.000000000 -0500 +++ src/util.h 2013-11-27 05:48:46.000000000 -0600 @@ -18,7 +18,7 @@ #include <ft2build.h> #include FT_FREETYPE_H -#include <freetype/ftglyph.h> +#include FT_GLYPH_H std::ostream& operator<<(std::ostream&, const FT_Library); std::ostream& operator<<(std::ostream&, const FT_Face); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
