From 65eeff79fff8a1bfdf67ca51d147384f46f4d5c0 Mon Sep 17 00:00:00 2001
From: Nicolás Reynolds <fauno@endefensadelsl.org>
Date: Fri, 27 Dec 2013 23:55:53 +0000
Subject: Fri Dec 27 23:54:04 UTC 2013

---
 ...-7705e46966bfa05015fb9fb20c68da844ab88028.patch | 63 ++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 community/lilypond/lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch

(limited to 'community/lilypond/lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch')

diff --git a/community/lilypond/lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch b/community/lilypond/lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch
new file mode 100644
index 000000000..ad0c3d4fe
--- /dev/null
+++ b/community/lilypond/lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch
@@ -0,0 +1,63 @@
+From: Werner Lemberg <wl@gnu.org>
+Date: Thu, 5 Dec 2013 14:01:48 +0000 (+0100)
+Subject: Issue 3694: Use standard inclusion scheme for FreeType headers.
+X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=commitdiff_plain;h=7705e46966bfa05015fb9fb20c68da844ab88028;hp=88435714e762229ebe2715bcf6863eb89c1f8dff
+
+Issue 3694: Use standard inclusion scheme for FreeType headers.
+
+The most recent FreeType release (2.5.1) has changed locations for header
+files.  Using the standard way, this is not visible to applications.
+---
+
+diff --git a/lily/freetype-error.cc b/lily/freetype-error.cc
+index 00e5cae..88af76c 100644
+--- a/lily/freetype-error.cc
++++ b/lily/freetype-error.cc
+@@ -31,7 +31,7 @@ const struct Freetype_error_message
+   const char *err_msg;
+ } ft_errors[] =
+ 
+-#include <freetype/fterrors.h>
++#include FT_ERRORS_H
+ 
+   ;
+ 
+diff --git a/lily/open-type-font.cc b/lily/open-type-font.cc
+index df6a744..837a1f2 100644
+--- 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 "freetype.hh"
+diff --git a/lily/pango-font.cc b/lily/pango-font.cc
+index ee986fc..b148a5b 100644
+--- 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>
+diff --git a/lily/ttf.cc b/lily/ttf.cc
+index eaeb67a..6d7f97b 100644
+--- 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"
-- 
cgit v1.2.3-54-g00ecf