[pkgsrc/trunk]: pkgsrc/graphics/inkscape add a patch from freetype to make it...

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/09ca70ebb1ef
branches:  trunk
changeset: 513596:09ca70ebb1ef
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Wed May 31 18:01:49 2006 +0000

description:
add a patch from freetype to make it build with 2.2.1

diffstat:

 graphics/inkscape/distinfo         |   3 +-
 graphics/inkscape/patches/patch-ab |  51 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 1 deletions(-)

diffs (67 lines):

diff -r 8fc2dec9cd35 -r 09ca70ebb1ef graphics/inkscape/distinfo
--- a/graphics/inkscape/distinfo        Wed May 31 18:00:33 2006 +0000
+++ b/graphics/inkscape/distinfo        Wed May 31 18:01:49 2006 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.10 2006/03/07 04:15:22 joerg Exp $
+$NetBSD: distinfo,v 1.11 2006/05/31 18:01:49 drochner Exp $
 
 SHA1 (inkscape-0.43.tar.bz2) = b7e93f2ceea795ee434f70261ba19e67985fc292
 RMD160 (inkscape-0.43.tar.bz2) = bcb41e008a3c1a9f5d4f7ee793de5b92f106044e
 Size (inkscape-0.43.tar.bz2) = 6244558 bytes
 SHA1 (patch-aa) = 769d88d8aca1f462cdeff40e44fa3577fdf4b681
+SHA1 (patch-ab) = 5507abac121e9607f2a63823c730917467fb0f52
diff -r 8fc2dec9cd35 -r 09ca70ebb1ef graphics/inkscape/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/inkscape/patches/patch-ab        Wed May 31 18:01:49 2006 +0000
@@ -0,0 +1,51 @@
+$NetBSD: patch-ab,v 1.3 2006/05/31 18:01:49 drochner Exp $
+
+--- src/libnrtype/FontInstance.cpp.orig        2005-09-26 07:22:49.000000000 +0200
++++ src/libnrtype/FontInstance.cpp
+@@ -24,11 +24,11 @@
+ #include "RasterFont.h"
+ 
+ /* Freetype 2 */
+-# include <freetype/ftoutln.h>
+-# include <freetype/ftbbox.h>
+-# include <freetype/internal/tttypes.h>
+-# include <freetype/internal/ftstream.h>
+-# include <freetype/tttags.h>
++# include <ft2build.h>
++# include FT_OUTLINE_H
++# include FT_BBOX_H
++# include FT_TRUETYPE_TAGS_H
++# include FT_TRUETYPE_TABLES_H
+ # include <pango/pangoft2.h>
+ 
+ 
+@@ -423,10 +423,10 @@ void font_instance::LoadGlyph(int glyph_
+                       }
+                       if ( theFace->glyph->format == ft_glyph_format_outline ) {
+                               FT_Outline_Funcs ft2_outline_funcs = {
+-                                      ft2_move_to,
+-                                      ft2_line_to,
+-                                      ft2_conic_to,
+-                                      ft2_cubic_to,
++                                      (FT_Outline_MoveToFunc)  ft2_move_to,
++                                      (FT_Outline_LineToFunc)  ft2_line_to,
++                                      (FT_Outline_ConicToFunc) ft2_conic_to,
++                                      (FT_Outline_CubicToFunc) ft2_cubic_to,
+                                       0, 0
+                               };
+                               n_g.outline=new Path;
+@@ -474,12 +474,12 @@ bool font_instance::FontSlope(double &ru
+ 
+     theFace=pango_ft2_font_get_face(pFont);
+ 
+-      if ( theFace->units_per_EM == 0 ) return false; // bitmap font
+-      
+       if ( pFont == NULL ) return false;
+       
+       if ( theFace == NULL ) return false;
+ 
++    if ( !FT_IS_SCALABLE(theFace) ) return false;  // bitmap font
++
+     TT_HoriHeader *hhea = (TT_HoriHeader*)FT_Get_Sfnt_Table(theFace, ft_sfnt_hhea);
+     if (hhea == NULL) return false;
+     run = hhea->caret_Slope_Run;