diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2006-10-14 08:54:54 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2006-10-14 08:54:54 +0000 |
| commit | 29747f458a1eb2ce23b4594b09d0256dd62760b8 (patch) | |
| tree | 1b71ba5d9ffdd308b6c18130f7c116f5bab5dc12 /chinese/xttmgr | |
| parent | - Add goocanvas (diff) | |
Chase the GNOME X11BASE to LOCALBASE move, and fix the build with the
new freetype2 where needed.
Submitted by: mezz, ahze, pav, and many others
Approved by: portmgr (implicit, kris)
Diffstat (limited to 'chinese/xttmgr')
| -rw-r--r-- | chinese/xttmgr/files/patch-xttmgr.c | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/chinese/xttmgr/files/patch-xttmgr.c b/chinese/xttmgr/files/patch-xttmgr.c new file mode 100644 index 000000000000..a44e6b2dfa9e --- /dev/null +++ b/chinese/xttmgr/files/patch-xttmgr.c @@ -0,0 +1,57 @@ +--- xttmgr.c.orig Sat Oct 7 11:34:31 2006 ++++ xttmgr.c Sat Oct 7 11:34:10 2006 +@@ -7,7 +7,6 @@ + #include <ft2build.h> + #include FT_FREETYPE_H + #include FT_MODULE_H +-#include FT_INTERNAL_OBJECTS_H + #include FT_TRUETYPE_IDS_H + #include FT_TRUETYPE_TABLES_H + #include FT_SFNT_NAMES_H +@@ -269,7 +268,7 @@ int main( int argc, char *argv[] ) + static int Check_Font_Face( char *filename ) + { + FT_Face face; +- FT_ModuleRec* module; ++ int is_sfnt = 0; + + num_faces = 0; /* 先將 face 總數設為 0 */ + +@@ -278,16 +277,12 @@ static int Check_Font_Face( char *filena + return 1; + } + +- module = &face->driver->root; + num_faces = face->num_faces; /* 紀錄共有多少個 faces */ ++ is_sfnt = FT_IS_SFNT( face ); + FT_Done_Face( face ); + + /* 檢查該檔案是否是 TrueType 檔 */ +- if ( strncasecmp( module->clazz->module_name, "TrueType", 8 ) ) { +- return 1; +- } +- +- return 0; ++ return is_sfnt; + + } + +@@ -1305,7 +1300,6 @@ static int Font_Info( char *filename ) + FT_ULong face_idx; + FT_Int pos, num_encodings; + FT_CharMap charmap; +- FT_ModuleRec* module; + TT_OS2 *os2; + FT_UShort platform_id, encoding_id; + char *platform_name=NULL; +@@ -1366,8 +1360,8 @@ static int Font_Info( char *filename ) + printf( "Number of glyphs : %ld\n", face->num_glyphs ); + printf( "..........................................\n\n" ); + +- module = &face->driver->root; +- printf( "模組名稱 : %s\n", module->clazz->module_name ); ++ /*module = &face->driver->root; ++ printf( "模組名稱 : %s\n", module->clazz->module_name );*/ + + printf( "\nFace flags :\n" ); + |