From 3602daba968a0e16ff8817cb961f23cd54730acc Mon Sep 17 00:00:00 2001
From: kwm <kwm@FreeBSD.org>
Date: Tue, 24 Dec 2013 21:22:21 +0000
Subject: Update freetype to 2.5.2.

Remove patch to add -I/usr/local/include in freetype-config --cflags. If
ports need extra headers they should look for them, and not get them via
a side-effect.

Freetype had a header resuffle in 2.5.1, patch ports to use the new header
style.

Thanks go to bdrewery for the two exp-runs and rakuco for helping me with
some troublesome cmake ports.

PR:		ports/184587
---
 print/lilypond/files/patch-lily_freetype-error.cc | 12 ++++++++++++
 print/lilypond/files/patch-lily_open-type-font.cc | 12 ++++++++++++
 print/lilypond/files/patch-lily_pango-font.cc     | 12 ++++++++++++
 print/lilypond/files/patch-lily_ttf.cc            | 12 ++++++++++++
 4 files changed, 48 insertions(+)
 create mode 100644 print/lilypond/files/patch-lily_freetype-error.cc
 create mode 100644 print/lilypond/files/patch-lily_open-type-font.cc
 create mode 100644 print/lilypond/files/patch-lily_pango-font.cc
 create mode 100644 print/lilypond/files/patch-lily_ttf.cc

(limited to 'print/lilypond/files')

diff --git a/print/lilypond/files/patch-lily_freetype-error.cc b/print/lilypond/files/patch-lily_freetype-error.cc
new file mode 100644
index 000000000000..d729c4536253
--- /dev/null
+++ b/print/lilypond/files/patch-lily_freetype-error.cc
@@ -0,0 +1,12 @@
+--- lily/freetype-error.cc.orig	2013-12-16 15:18:38.000000000 +0100
++++ lily/freetype-error.cc	2013-12-16 15:19:06.000000000 +0100
+@@ -31,7 +31,8 @@
+   const char *err_msg;
+ } ft_errors[] =
+ 
+-#include <freetype/fterrors.h>
++#include <ft2build.h>
++#include FT_ERRORS_H
+ 
+   ;
+ 
diff --git a/print/lilypond/files/patch-lily_open-type-font.cc b/print/lilypond/files/patch-lily_open-type-font.cc
new file mode 100644
index 000000000000..78d55522b016
--- /dev/null
+++ b/print/lilypond/files/patch-lily_open-type-font.cc
@@ -0,0 +1,12 @@
+--- lily/open-type-font.cc.orig	2013-12-16 15:54:16.000000000 +0100
++++ lily/open-type-font.cc	2013-12-16 15:54:45.000000000 +0100
+@@ -23,7 +23,8 @@
+ 
+ using namespace std;
+ 
+-#include <freetype/tttables.h>
++#include <ft2build.h>
++#include FT_TRUETYPE_TABLES_H
+ 
+ #include "dimensions.hh"
+ #include "international.hh"
diff --git a/print/lilypond/files/patch-lily_pango-font.cc b/print/lilypond/files/patch-lily_pango-font.cc
new file mode 100644
index 000000000000..227a0444fd58
--- /dev/null
+++ b/print/lilypond/files/patch-lily_pango-font.cc
@@ -0,0 +1,12 @@
+--- lily/pango-font.cc.orig	2013-12-16 15:49:55.000000000 +0100
++++ lily/pango-font.cc	2013-12-16 15:50:46.000000000 +0100
+@@ -22,7 +22,8 @@
+ #define PANGO_ENABLE_BACKEND
+ 
+ #include <pango/pangoft2.h>
+-#include <freetype/ftxf86.h>
++#include <ft2build.h>
++#include FT_XFREE86_H
+ 
+ #include <map>
+ #include <cstdio>
diff --git a/print/lilypond/files/patch-lily_ttf.cc b/print/lilypond/files/patch-lily_ttf.cc
new file mode 100644
index 000000000000..0211987989dc
--- /dev/null
+++ b/print/lilypond/files/patch-lily_ttf.cc
@@ -0,0 +1,12 @@
+--- lily/ttf.cc.orig	2013-12-16 15:48:08.000000000 +0100
++++ lily/ttf.cc	2013-12-16 15:48:37.000000000 +0100
+@@ -20,7 +20,8 @@
+ #include <cstdio>
+ #include "freetype.hh"
+ 
+-#include <freetype/tttables.h>
++#include <ft2build.h>
++#include FT_TRUETYPE_TABLES_H
+ 
+ #include "international.hh"
+ #include "memory-stream.hh"
-- 
cgit