build fix following the freetype2 update

3 files changed, 37 insertions, 8 deletions

diff --git a/x11/wxGTK24/distinfo b/x11/wxGTK24/distinfo
index ddcc17a9c4c..d672f626f05 100644
--- a/x11/wxGTK24/distinfo
+++ b/x11/wxGTK24/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2012/02/16 20:26:18 hans Exp $
+$NetBSD: distinfo,v 1.16 2014/03/22 16:50:29 spz Exp $
 
 SHA1 (wxGTK-2.4.2.tar.bz2) = 3f1ebacaaf8eb5510c14ee10bafbc5f225be842c
 RMD160 (wxGTK-2.4.2.tar.bz2) = 8076d1ba31c9b23becb241cbad5a83763fee776e
@@ -11,7 +11,7 @@ SHA1 (patch-ae) = 81c2e33fbdd4a715da5a14ef3ae0a377d0d9aec2
 SHA1 (patch-af) = 81cddc6dcdf986317f7d62f027515cae6ef2c855
 SHA1 (patch-ag) = ccdaca4030c08aefa922367019e0c9249b810456
 SHA1 (patch-ah) = 24cc32f7eda53f4704422363902f72239eda2253
-SHA1 (patch-ai) = c5d301c2cb45397329d9a817d9278707a2d3b97f
+SHA1 (patch-ai) = cb52e7e1ab21eb13f01eb3a551fbd5087cf1d927
 SHA1 (patch-aj) = 9f74442617e6a869c5ff253591bba3f9da3a9e0c
 SHA1 (patch-ak) = 3f26086c8f16ac972db89c21f665c187570937cc
 SHA1 (patch-al) = bceed88db708c83afca0fe3adb5c923f9bc661b0
@@ -20,5 +20,6 @@ SHA1 (patch-an) = a9d276244cac87fa00a3c3338179e68084b72b1d
 SHA1 (patch-ao) = 3ee66e4bdef6ede5e715fc951f48887e90d0d13a
 SHA1 (patch-ap) = b1217506bfffe9ed7a282c960a99921c61d76dbd
 SHA1 (patch-aq) = 72cc09c94ca6911859f3b40f01e13f0f95d07141
+SHA1 (patch-contrib_src_canvas_canvas.cpp) = 471fcc0a24526781c0fda74af703886e96ce0bab
 SHA1 (patch-src_gtk_menu.cpp) = ca3ec1f3f797430a1d16ebc391ba88fb4534121e
 SHA1 (patch-src_gtk_settings.cpp) = 05d472af6916e41b5fabebcb29f818222cab0406
diff --git a/x11/wxGTK24/patches/patch-ai b/x11/wxGTK24/patches/patch-ai
index 695aab3aeb6..352e31013d4 100644
--- a/x11/wxGTK24/patches/patch-ai
+++ b/x11/wxGTK24/patches/patch-ai
@@ -1,8 +1,20 @@
-$NetBSD: patch-ai,v 1.1 2006/06/19 21:16:19 joerg Exp $
+$NetBSD: patch-ai,v 1.2 2014/03/22 16:50:29 spz Exp $
 
---- src/generic/dcpsg.cpp.orig	2006-06-19 20:01:50.000000000 +0000
+make it deal gracefully with various freetype versions
+
+--- src/generic/dcpsg.cpp.orig	2003-09-21 11:31:45.000000000 +0000
 +++ src/generic/dcpsg.cpp
-@@ -1146,8 +1146,13 @@ struct _OutlineInfo {
+@@ -1132,7 +1132,8 @@ void wxPostScriptDC::SetBrush( const wxB
+ 
+ #include "wx/fontutil.h"
+ #include <pango/pangoft2.h>
+-#include <freetype/ftglyph.h>
++#include <ft2build.h>
++#include FT_GLYPH_H
+ 
+ #ifndef FT_Outline_Decompose
+   FT_EXPORT( FT_Error )  FT_Outline_Decompose(
+@@ -1146,8 +1147,13 @@ struct _OutlineInfo {
    FILE *file;
  };
  
@@ -16,7 +28,7 @@ $NetBSD: patch-ai,v 1.1 2006/06/19 21:16:19 joerg Exp $
  {
    OutlineInfo *outline_info = (OutlineInfo*)user_data;
    fprintf(outline_info->file, "%d %d moveto\n",
-@@ -1156,8 +1161,13 @@ static int paps_move_to( FT_Vector* to,
+@@ -1156,8 +1162,13 @@ static int paps_move_to( FT_Vector* to,
    return 0;
  }
  
@@ -30,7 +42,7 @@ $NetBSD: patch-ai,v 1.1 2006/06/19 21:16:19 joerg Exp $
  {
    OutlineInfo *outline_info = (OutlineInfo*)user_data;
    fprintf(outline_info->file, "%d %d lineto\n",
-@@ -1166,9 +1176,15 @@ static int paps_line_to( FT_Vector*  to,
+@@ -1166,9 +1177,15 @@ static int paps_line_to( FT_Vector*  to,
    return 0;
  }
  
@@ -46,7 +58,7 @@ $NetBSD: patch-ai,v 1.1 2006/06/19 21:16:19 joerg Exp $
  {
    OutlineInfo *outline_info = (OutlineInfo*)user_data;
    fprintf(outline_info->file, "%d %d %d %d conicto\n",
-@@ -1179,10 +1195,17 @@ static int paps_conic_to( FT_Vector*  co
+@@ -1179,10 +1196,17 @@ static int paps_conic_to( FT_Vector*  co
    return 0;
  }
  
diff --git a/x11/wxGTK24/patches/patch-contrib_src_canvas_canvas.cpp b/x11/wxGTK24/patches/patch-contrib_src_canvas_canvas.cpp
new file mode 100644
index 00000000000..62036ec958a
--- /dev/null
+++ b/x11/wxGTK24/patches/patch-contrib_src_canvas_canvas.cpp
@@ -0,0 +1,16 @@
+$NetBSD: patch-contrib_src_canvas_canvas.cpp,v 1.1 2014/03/22 16:50:29 spz Exp $
+
+make it deal gracefully with both freetype 2.4.* and 2.5.*
+
+--- contrib/src/canvas/canvas.cpp.orig	2003-09-21 11:32:40.000000000 +0000
++++ contrib/src/canvas/canvas.cpp
+@@ -32,7 +32,8 @@
+ #endif
+ 
+ #if wxUSE_FREETYPE
+-    #include <freetype/freetype.h>
++    #include <ft2build.h>
++    #include FT_FREETYPE_H
+ #endif
+ 
+ //#define CANVASDEBUG