diff options
| author | markd <markd@pkgsrc.org> | 2013-12-11 23:49:52 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2013-12-11 23:49:52 +0000 |
| commit | 6e3e5cc9ecb1989b179e590e995594680b4bae9e (patch) | |
| tree | 2a7f1b86b0bb94f53d085de9f74864cc0cd68abe /fonts/ttmkfdir2 | |
| parent | 5fb1fce4cd637643b60d164643f93605f316c621 (diff) | |
| download | pkgsrc-6e3e5cc9ecb1989b179e590e995594680b4bae9e.tar.gz | |
One final fixup for freetype2. Fixes build with freetype 2.5.x.
Diffstat (limited to 'fonts/ttmkfdir2')
| -rw-r--r-- | fonts/ttmkfdir2/distinfo | 4 | ||||
| -rw-r--r-- | fonts/ttmkfdir2/patches/patch-ab | 20 |
2 files changed, 17 insertions, 7 deletions
diff --git a/fonts/ttmkfdir2/distinfo b/fonts/ttmkfdir2/distinfo index 29b5971ad54..9767facba40 100644 --- a/fonts/ttmkfdir2/distinfo +++ b/fonts/ttmkfdir2/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.10 2010/03/03 14:30:00 dmcmahill Exp $ +$NetBSD: distinfo,v 1.11 2013/12/11 23:49:52 markd Exp $ SHA1 (ttmkfdir2.20021109.tar.bz2) = bee1944ce3e5b6c4503a14e6429737cc558a24c0 RMD160 (ttmkfdir2.20021109.tar.bz2) = 878fb57f80e7223ebb3f4214ed58621a9087e404 Size (ttmkfdir2.20021109.tar.bz2) = 701900 bytes SHA1 (patch-aa) = ae2cb207635678d68d010e54de6ad6905fc3e38b -SHA1 (patch-ab) = 82363c15471b835082c50488c167d11e68262944 +SHA1 (patch-ab) = ceca1a96bc91c514abaf3be5450cb07f4573a641 SHA1 (patch-ac) = c29cd845647d67102a89476d931e5ee6bae63078 SHA1 (patch-ad) = 586a00c9b8ec5346b88f641fb80ebecc6d9b0beb SHA1 (patch-ae) = 8544a176af1c079405371789955391b400f0154e diff --git a/fonts/ttmkfdir2/patches/patch-ab b/fonts/ttmkfdir2/patches/patch-ab index 21274bba1ed..afe307a5e0e 100644 --- a/fonts/ttmkfdir2/patches/patch-ab +++ b/fonts/ttmkfdir2/patches/patch-ab @@ -1,8 +1,18 @@ -$NetBSD: patch-ab,v 1.3 2007/11/15 06:36:45 rillig Exp $ +$NetBSD: patch-ab,v 1.4 2013/12/11 23:49:52 markd Exp $ --- ttf.cpp.orig 2002-11-07 06:30:04.000000000 +0100 +++ ttf.cpp 2007-11-15 07:05:27.304109000 +0100 -@@ -137,7 +137,12 @@ Face::Face (const std::string &filename) +@@ -3,7 +3,8 @@ + #include <cctype> + #include <cstring> + +-#include "freetype/tttables.h" ++#include <ft2build.h> ++#include FT_TRUETYPE_TABLES_H + #include "ttmkfdir.h" + #include "ttf.h" + #include "ttos2val.h" +@@ -137,7 +138,12 @@ Face::Face (const std::string &filename) /* * find all the encodings that are based on this cmap. */ @@ -15,7 +25,7 @@ $NetBSD: patch-ab,v 1.3 2007/11/15 06:36:45 rillig Exp $ std::pair<MI, MI> bounds = Encodings::instance()->equal_range (key); /* -@@ -226,7 +231,7 @@ Face::FontFamilyName (void) const +@@ -226,7 +232,7 @@ Face::FontFamilyName (void) const for (i = 0; i < n; i++) { if ((fterror = FT_Get_Sfnt_Name (face, i, &NamePtr)) != FT_Err_Ok) { std::cout << "Warning: Can't SFNT name : " << FileName << "(" << fterror << ")" << std::endl; @@ -24,7 +34,7 @@ $NetBSD: patch-ab,v 1.3 2007/11/15 06:36:45 rillig Exp $ }; platform = NamePtr.platform_id; encoding = NamePtr.encoding_id; -@@ -522,7 +527,7 @@ Face::Weight (void) const +@@ -522,7 +528,7 @@ Face::Weight (void) const { const char *result; @@ -33,7 +43,7 @@ $NetBSD: patch-ab,v 1.3 2007/11/15 06:36:45 rillig Exp $ return result; } else if ((result = OS2Weight ()) != 0) { return result; -@@ -603,7 +608,7 @@ Face::Width (void) const +@@ -603,7 +609,7 @@ Face::Width (void) const { const char *result; |