diff options
| author | joerg <joerg@pkgsrc.org> | 2006-06-19 21:16:19 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-06-19 21:16:19 +0000 |
| commit | 1418238a13ba9dc8592747166cbaae82f503fc04 (patch) | |
| tree | 9e274b20751a6ba7c2dcab6978847a6dab8c87c2 /x11 | |
| parent | 6eec49fe54bc4773d2fd7cbbb57b317eb9ef1b10 (diff) | |
| download | pkgsrc-1418238a13ba9dc8592747166cbaae82f503fc04.tar.gz | |
Fix build with FreeType 2.2.1.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/wxGTK24/distinfo | 4 | ||||
| -rw-r--r-- | x11/wxGTK24/patches/patch-ai | 66 |
2 files changed, 68 insertions, 2 deletions
diff --git a/x11/wxGTK24/distinfo b/x11/wxGTK24/distinfo index 6a09f89784f..f5c8b73336b 100644 --- a/x11/wxGTK24/distinfo +++ b/x11/wxGTK24/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2005/11/07 17:58:00 joerg Exp $ +$NetBSD: distinfo,v 1.5 2006/06/19 21:16:19 joerg Exp $ SHA1 (wxGTK-2.4.2.tar.bz2) = 3f1ebacaaf8eb5510c14ee10bafbc5f225be842c RMD160 (wxGTK-2.4.2.tar.bz2) = 8076d1ba31c9b23becb241cbad5a83763fee776e @@ -11,4 +11,4 @@ SHA1 (patch-ae) = 81c2e33fbdd4a715da5a14ef3ae0a377d0d9aec2 SHA1 (patch-af) = 81cddc6dcdf986317f7d62f027515cae6ef2c855 SHA1 (patch-ag) = ccdaca4030c08aefa922367019e0c9249b810456 SHA1 (patch-ah) = 24cc32f7eda53f4704422363902f72239eda2253 -SHA1 (patch-ai) = 98ca97a1d3d6e58f744d3be9ccd4dfcca904be07 +SHA1 (patch-ai) = c5d301c2cb45397329d9a817d9278707a2d3b97f diff --git a/x11/wxGTK24/patches/patch-ai b/x11/wxGTK24/patches/patch-ai new file mode 100644 index 00000000000..695aab3aeb6 --- /dev/null +++ b/x11/wxGTK24/patches/patch-ai @@ -0,0 +1,66 @@ +$NetBSD: patch-ai,v 1.1 2006/06/19 21:16:19 joerg Exp $ + +--- src/generic/dcpsg.cpp.orig 2006-06-19 20:01:50.000000000 +0000 ++++ src/generic/dcpsg.cpp +@@ -1146,8 +1146,13 @@ struct _OutlineInfo { + FILE *file; + }; + ++#if (FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 2) || FREETYPE_MAJOR >= 2 ++static int paps_move_to( const FT_Vector* to, ++ void *user_data) ++#else + static int paps_move_to( FT_Vector* to, + void *user_data) ++#endif + { + 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, + return 0; + } + ++#if (FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 2) || FREETYPE_MAJOR >= 2 ++static int paps_line_to( const FT_Vector* to, ++ void *user_data) ++#else + static int paps_line_to( FT_Vector* to, + void *user_data) ++#endif + { + 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, + return 0; + } + ++#if (FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 2) || FREETYPE_MAJOR >= 2 ++static int paps_conic_to( const FT_Vector* control, ++ const FT_Vector* to, ++ void *user_data) ++#else + static int paps_conic_to( FT_Vector* control, + FT_Vector* to, + void *user_data) ++#endif + { + 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 + return 0; + } + ++#if (FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 2) || FREETYPE_MAJOR >= 2 ++static int paps_cubic_to( const FT_Vector* control1, ++ const FT_Vector* control2, ++ const FT_Vector* to, ++ void *user_data) ++#else + static int paps_cubic_to( FT_Vector* control1, + FT_Vector* control2, + FT_Vector* to, + void *user_data) ++#endif + { + OutlineInfo *outline_info = (OutlineInfo*)user_data; + fprintf(outline_info->file, |