Build with freetype 2.5.x

4 files changed, 35 insertions, 2 deletions

diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo
index 272425a974b..1a77f09eadd 100644
--- a/graphics/gimp/distinfo
+++ b/graphics/gimp/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.79 2013/12/01 11:58:44 adam Exp $
+$NetBSD: distinfo,v 1.80 2013/12/15 08:25:38 markd Exp $
 
 SHA1 (gimp-2.8.10.tar.bz2) = 6d3c98fcc86f42b0a825a5c62d5d3a5e1c83f48b
 RMD160 (gimp-2.8.10.tar.bz2) = c5364c49af2c695bc3d0bd97e792bf3ad75b1175
@@ -8,6 +8,7 @@ SHA1 (patch-ab) = 37820b9e03702248294f0030ffbd09e7f14f3dcb
 SHA1 (patch-ad) = 7863678d59ccf54e2ce61a4ac4b883fb9eb5fb82
 SHA1 (patch-app_Makefile.in) = 1677fa436f76d0b83bf048447fc025584a255e68
 SHA1 (patch-app_config_Makefile.in) = c5376f98649255b163cf9af448b5931d7675526c
+SHA1 (patch-app_text_gimpfont.c) = 723af05dc0d80a2ca20b2aee60f81e15bc5e71d1
 SHA1 (patch-devel-docs_app_Makefile.in) = 89aec477783899cc6a5ac765d567d73f79474d5e
 SHA1 (patch-plug-ins_common_file-mng.c) = 8ed244997cdef7125e1aa5da4d0fac5068ad5159
 SHA1 (patch-plug-ins_script-fu_script-fu-server.c) = c424b1a8e345ec3d0763ac2cf1f8535da9e10797
diff --git a/graphics/gimp/patches/patch-app_text_gimpfont.c b/graphics/gimp/patches/patch-app_text_gimpfont.c
new file mode 100644
index 00000000000..3c061b9a820
--- /dev/null
+++ b/graphics/gimp/patches/patch-app_text_gimpfont.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-app_text_gimpfont.c,v 1.1 2013/12/15 08:25:38 markd Exp $
+
+Build with freetype 2.5.x
+
+--- app/text/gimpfont.c.orig	2012-05-08 06:05:46.000000000 +0000
++++ app/text/gimpfont.c
+@@ -27,7 +27,7 @@
+ 
+ #define PANGO_ENABLE_ENGINE  1   /* Argh */
+ #include <pango/pango-ot.h>
+-#include <freetype/tttables.h>
++#include FT_TRUETYPE_TABLES_H
+ 
+ #include "text-types.h"
+ 
diff --git a/graphics/inkscape/distinfo b/graphics/inkscape/distinfo
index 945a9b56105..92f73ce55f7 100644
--- a/graphics/inkscape/distinfo
+++ b/graphics/inkscape/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.47 2013/08/04 16:06:21 adam Exp $
+$NetBSD: distinfo,v 1.48 2013/12/15 08:29:07 markd Exp $
 
 SHA1 (inkscape-0.48.4.tar.bz2) = 5f26f6ad191d1e7c2a9fb69a438722beb172224c
 RMD160 (inkscape-0.48.4.tar.bz2) = b089ced7694a9803fac8588d93e7e6239c71d3e8
@@ -24,6 +24,7 @@ SHA1 (patch-src_dom_io_domstream.cpp) = 6b525b8e730e4497afdf1da0ae27f0dc69bfad40
 SHA1 (patch-src_dom_io_domstream.h) = 9325fc9d211eb3349628a736283ed0c475399a8b
 SHA1 (patch-src_extension_internal_pdfinput_pdf-parser.cpp) = 02742a022a8a55852d7f0a39969153bf7f24f17e
 SHA1 (patch-src_extension_internal_pdfinput_pdf-parser.h) = 9e9e76049b9fdcc5192e225b4b477a104902894b
+SHA1 (patch-src_libnrtype_FontFactory.h) = 282e6ea4da7bb40c5ba8c861fdbe303259d3e864
 SHA1 (patch-src_libvpsc_csolve__VPSC.h) = 33aa27678fa9e802af6ab95b9ea28b69d822c4cb
 SHA1 (patch-src_ui_dialog_inkscape-preferences.cpp) = f95af6d326ddf7512b67f68efe0b23bc3ebe651e
 SHA1 (patch-src_ui_widget_registered-widget.h) = a5c16bcd28a015959121ed8b92423762f182a71b
diff --git a/graphics/inkscape/patches/patch-src_libnrtype_FontFactory.h b/graphics/inkscape/patches/patch-src_libnrtype_FontFactory.h
new file mode 100644
index 00000000000..c76a09cdabf
--- /dev/null
+++ b/graphics/inkscape/patches/patch-src_libnrtype_FontFactory.h
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_libnrtype_FontFactory.h,v 1.1 2013/12/15 08:29:07 markd Exp $
+
+Build with freetype 2.5.x
+
+--- src/libnrtype/FontFactory.h.orig	2011-07-08 18:25:09.468790000 +0000
++++ src/libnrtype/FontFactory.h
+@@ -31,7 +31,8 @@
+ #include <pango/pangowin32.h>
+ #else
+ #include <pango/pangoft2.h>
+-#include <freetype/freetype.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ #endif
+ 
+ namespace Glib