Control: tags -1 + patch

Dear maintainer,
here’s a patch I created and tested.

I didn’t prepare a NMU patch as I don’t have enough knowledge about
patching with source-format 1.0 and CDBS.

Best Regards,
-- Juhani Numminen
Description: Fix build failure with freetype 2.5.1
Author: Juhani Numminen <juhaninummin...@gmail.com>
Bug-Debian: http://bugs.debian.org/733405

--- a/include/LASi.h
+++ b/include/LASi.h
@@ -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;

--- a/src/drawGlyph.cpp
+++ b/src/drawGlyph.cpp
@@ -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>

--- a/src/drawGlyph.h
+++ b/src/drawGlyph.h
@@ -10,7 +10,8 @@
 
 #include <iostream>
 #include <pango/pango.h>
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
 
 /** Generate the Postscript commands to draw the glyph
   * using the font in pPangoCtx.

--- a/src/glyphMgr.cpp
+++ b/src/glyphMgr.cpp
@@ -11,7 +11,7 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H
 
-#include <freetype/ftglyph.h>
+#include FT_GLYPH_H
 
 #include <cassert>
 #include "util.h"

--- a/src/glyphMgr.h
+++ b/src/glyphMgr.h
@@ -16,7 +16,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.
  */

--- a/src/util.h
+++ b/src/util.h
@@ -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);

Reply via email to