diff options
| author | drochner <drochner@pkgsrc.org> | 2006-05-31 18:01:49 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2006-05-31 18:01:49 +0000 |
| commit | 032f7e69cef3677283173a4b8d98176f62d69140 (patch) | |
| tree | bffdc68c5303e50ed6dd4c1b24bd004ee46469b6 /graphics | |
| parent | ede033624743e96f0122e20706e48af8fd172333 (diff) | |
| download | pkgsrc-032f7e69cef3677283173a4b8d98176f62d69140.tar.gz | |
add a patch from freetype to make it build with 2.2.1
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/inkscape/distinfo | 3 | ||||
| -rw-r--r-- | graphics/inkscape/patches/patch-ab | 51 |
2 files changed, 53 insertions, 1 deletions
diff --git a/graphics/inkscape/distinfo b/graphics/inkscape/distinfo index 6c17d74b1f4..b9ae5f40367 100644 --- a/graphics/inkscape/distinfo +++ b/graphics/inkscape/distinfo @@ -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 --git a/graphics/inkscape/patches/patch-ab b/graphics/inkscape/patches/patch-ab new file mode 100644 index 00000000000..ff33f5a09f9 --- /dev/null +++ b/graphics/inkscape/patches/patch-ab @@ -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; |