Fix freetype path by applying patch from upstream (Closes: #733399)

diff --git a/debian/changelog b/debian/changelog
index 8f92182639ad7badc919c263b88a462b37dd2cce..88f069e58047080a9b514830aeeec04d5a373c76 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ lilypond (2.16.2-3) UNRELEASED; urgency=low
     (closes: #693238)
   * Breaks/Replaces lilypond-doc in html packages to stop problems on
     wheezy upgrade. (Closes: #718013)
+  * Fix freetype path by applying patch from upstream (Closes: #733399)
 
  -- Don Armstrong <don@debian.org>  Mon, 11 Nov 2013 09:57:06 -0800
 

diff --git a/debian/patches/fix_freetype_inclusions b/debian/patches/fix_freetype_inclusions
new file mode 100644 (file)
index 0000000..faabd1a
--- /dev/null
+++ b/debian/patches/fix_freetype_inclusions
@@ -0,0 +1,56 @@
+--- a/lily/freetype.cc
++++ b/lily/freetype.cc
+@@ -20,6 +20,9 @@
+ #include "freetype.hh"
+ #include "warn.hh"
+ 
++#include FT_OUTLINE_H
++#include FT_BBOX_H
++
+ FT_Library freetype2_library;
+ 
+ void
+--- a/lily/freetype-error.cc
++++ b/lily/freetype-error.cc
+@@ -31,7 +31,7 @@
+   const char *err_msg;
+ } ft_errors[] =
+ 
+-#include <freetype/fterrors.h>
++#include FT_ERRORS_H
+ 
+   ;
+ 
+--- a/lily/open-type-font.cc
++++ b/lily/open-type-font.cc
+@@ -23,7 +23,7 @@
+ 
+ using namespace std;
+ 
+-#include <freetype/tttables.h>
++#include FT_TRUETYPE_TABLES_H
+ 
+ #include "dimensions.hh"
+ #include "international.hh"
+--- a/lily/pango-font.cc
++++ b/lily/pango-font.cc
+@@ -22,7 +22,7 @@
+ #define PANGO_ENABLE_BACKEND
+ 
+ #include <pango/pangoft2.h>
+-#include <freetype/ftxf86.h>
++#include FT_XFREE86_H
+ 
+ #include <map>
+ #include <cstdio>
+--- a/lily/ttf.cc
++++ b/lily/ttf.cc
+@@ -20,7 +20,7 @@
+ #include <cstdio>
+ #include "freetype.hh"
+ 
+-#include <freetype/tttables.h>
++#include FT_TRUETYPE_TABLES_H
+ 
+ #include "international.hh"
+ #include "memory-stream.hh"

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..a329a4a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix_freetype_inclusions