cope with freetype >= 2.5.1 include madness

This commit is contained in:
Nils Philippsen 2014-02-13 12:12:37 +01:00
parent fb62603a5d
commit 2bec4bab0c
2 changed files with 47 additions and 0 deletions

View File

@ -0,0 +1,39 @@
From e7fdd16c6f5bde5ca53a5c1e429e2d6074d9b45b Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Thu, 13 Feb 2014 12:04:17 +0100
Subject: [PATCH] patch: freetype-include-madness
Squashed commit of the following:
commit 529499204591258106b359be24f03f734201b8ba
Author: Michael Natterer <mitch@gimp.org>
Date: Fri Nov 29 21:57:46 2013 +0100
Bug 719560 - Build failure with freetype 2.5.1
Apply patch from su-v that fixes the freetype include to
the madness devised and recommended by freetype.
(cherry picked from commit 6c73f28b6d87a2afd11974552a075bffec52347f)
---
app/text/gimpfont.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/app/text/gimpfont.c b/app/text/gimpfont.c
index aa5f3ba..d052c6d 100644
--- a/app/text/gimpfont.c
+++ b/app/text/gimpfont.c
@@ -27,7 +27,9 @@
#define PANGO_ENABLE_ENGINE 1 /* Argh */
#include <pango/pango-ot.h>
-#include <freetype/tttables.h>
+
+#include <ft2build.h>
+#include FT_TRUETYPE_TABLES_H
#include "text-types.h"
--
1.8.5.3

View File

@ -212,6 +212,10 @@ Patch1: gimp-2.8.2-cm-system-monitor-profile-by-default.patch
# Upstream commit 0ffb3b6753aad00512349bba31bf5113054c6a0e
Patch2: gimp-2.8.10-CVE-2013-1913,1978.patch
# Cope with freetype >= 2.5.1 include madness
# Upstream commit 71c144c972d5582522b6d13a4194169916186c7a
Patch3: gimp-2.8.10-freetype-include-madness.patch
# use external help browser directly if help browser plug-in is not built
Patch100: gimp-2.8.6-external-help-browser.patch
@ -303,6 +307,7 @@ EOF
%patch1 -p1 -b .cm-system-monitor-profile-by-default
%patch2 -p1 -b .CVE-2013-1913,1978
%patch3 -p1 -b .freetype-include-madness
%if ! %{with helpbrowser}
%patch100 -p1 -b .external-help-browser
@ -654,6 +659,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%endif
%changelog
* Thu Feb 13 2014 Nils Philippsen <nils@redhat.com> - 2:2.8.10-5
- cope with freetype >= 2.5.1 include madness
* Wed Feb 12 2014 Nils Philippsen <nils@redhat.com> - 2:2.8.10-5
- remove BRs contained in the minimal build environment
- group BRs into libraries and tools