[Pkg-mono-svn-commits] [libgdiplus] 01/02: Add debian/patches/use_freetype_macros.patch, cherry-picked from upstream 180c02e0f2a2016eba8520b456ca929e9dcf03db, as a workaround to the FTBFS on FreeType 2.5+ (Closes: #732274)

[Jo Shields]

This is an automated email from the git hooks/post-receive script.

directhex pushed a commit to branch master
in repository libgdiplus.

commit 01b42b221da47bd6fbe75b51a9a182d3c51a4f2f
Author: Jo Shields <directhex at apebox.org>
Date:   Mon Dec 16 14:20:38 2013 +0000

    Add debian/patches/use_freetype_macros.patch, cherry-picked from upstream 180c02e0f2a2016eba8520b456ca929e9dcf03db, as a workaround to the FTBFS on FreeType 2.5+ (Closes: #732274)
---
 debian/patches/series                    |  1 +
 debian/patches/use_freetype_macros.patch | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b7f3336
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+use_freetype_macros.patch
diff --git a/debian/patches/use_freetype_macros.patch b/debian/patches/use_freetype_macros.patch
new file mode 100644
index 0000000..bd359f4
--- /dev/null
+++ b/debian/patches/use_freetype_macros.patch
@@ -0,0 +1,26 @@
+commit 180c02e0f2a2016eba8520b456ca929e9dcf03db
+Author: Jo Shields <directhex at apebox.org>
+Date:   Mon Dec 16 09:24:57 2013 +0000
+
+    Use FreeType macros for tttables.h inclusion
+    
+    As of FreeType 2.1.6 (November 2003), using #include to include Freetype libraries directly is not supported.
+    
+    This has come to a head, as in FreeType 2.5.0, the location of headers has been moved around, breaking building of libgdiplus.
+    
+    This slight change uses the "official" way to include the required header file, without breaking building on older versions of the library.
+
+diff --git a/src/gdiplus-private.h b/src/gdiplus-private.h
+index 59edf9e..dfccc02 100644
+--- a/src/gdiplus-private.h
++++ b/src/gdiplus-private.h
+@@ -30,7 +30,8 @@
+ #include <stdio.h>
+ #include <math.h>
+ #include <glib.h>
+-#include <freetype/tttables.h>
++#include <ft2build.h>
++#include FT_TRUETYPE_TABLES_H
+ #include <pthread.h>
+ #include <unistd.h>
+ 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mono/packages/libgdiplus.git