diff options
| author | joerg <joerg@pkgsrc.org> | 2006-06-20 12:54:48 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-06-20 12:54:48 +0000 |
| commit | 4b35e55d66645b5af80ce7ffd20d9708ddd235ff (patch) | |
| tree | f5bc9d2259f22417a43dd49b1b39c2320567feaa /graphics/wxsvg | |
| parent | c5aa45db0a6bd273434a25b9ee219a0cd5aef8b7 (diff) | |
| download | pkgsrc-4b35e55d66645b5af80ce7ffd20d9708ddd235ff.tar.gz | |
Fix build with FreeType 2.2+
Diffstat (limited to 'graphics/wxsvg')
| -rw-r--r-- | graphics/wxsvg/distinfo | 3 | ||||
| -rw-r--r-- | graphics/wxsvg/patches/patch-aa | 54 |
2 files changed, 56 insertions, 1 deletions
diff --git a/graphics/wxsvg/distinfo b/graphics/wxsvg/distinfo index 2729d0017d4..aec60b5378a 100644 --- a/graphics/wxsvg/distinfo +++ b/graphics/wxsvg/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2006/01/24 03:42:28 xtraeme Exp $ +$NetBSD: distinfo,v 1.2 2006/06/20 12:54:48 joerg Exp $ SHA1 (wxsvg-1.0b5.tar.gz) = f3535f5336445e6b0d9cb1783958df2e1a9a4c6f RMD160 (wxsvg-1.0b5.tar.gz) = a59dfedf643365ec578bfa484b95f9ca30645014 Size (wxsvg-1.0b5.tar.gz) = 668735 bytes +SHA1 (patch-aa) = f57ed0c1ce39dc45d79d349e3b48f417e8d200db diff --git a/graphics/wxsvg/patches/patch-aa b/graphics/wxsvg/patches/patch-aa new file mode 100644 index 00000000000..9386e7b1d54 --- /dev/null +++ b/graphics/wxsvg/patches/patch-aa @@ -0,0 +1,54 @@ +$NetBSD: patch-aa,v 1.1 2006/06/20 12:54:48 joerg Exp $ + +--- src/freetype/SVGCanvasTextFreetype.cpp.orig 2006-06-20 12:31:40.000000000 +0000 ++++ src/freetype/SVGCanvasTextFreetype.cpp +@@ -165,7 +165,11 @@ void wxSVGCanvasTextFreetype::RenderLine + } + } + ++#if (FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 2) || FREETYPE_MAJOR >= 2 ++gint moveto(const FT_Vector* to, gpointer data) ++#else + gint moveto(FT_Vector* to, gpointer data) ++#endif + { + wxSVGCanvasTextFreetype* canvasText = (wxSVGCanvasTextFreetype*) data; + +@@ -181,7 +185,11 @@ gint moveto(FT_Vector* to, gpointer data + return 0; + } + ++#if (FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 2) || FREETYPE_MAJOR >= 2 ++static gint lineto (const FT_Vector* to, gpointer data) ++#else + static gint lineto (FT_Vector* to, gpointer data) ++#endif + { + wxSVGCanvasTextFreetype* canvasText = (wxSVGCanvasTextFreetype*) data; + if (!canvasText->m_endpath) +@@ -194,7 +202,11 @@ static gint lineto (FT_Vector* to, gpoin + return 0; + } + ++#if (FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 2) || FREETYPE_MAJOR >= 2 ++static gint conicto(const FT_Vector* ftcontrol, const FT_Vector* to, gpointer data) ++#else + static gint conicto(FT_Vector* ftcontrol, FT_Vector* to, gpointer data) ++#endif + { + wxSVGCanvasTextFreetype* canvasText = (wxSVGCanvasTextFreetype*) data; + if (!canvasText->m_endpath) +@@ -209,8 +221,13 @@ static gint conicto(FT_Vector* ftcontrol + return 0; + } + ++#if (FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 2) || FREETYPE_MAJOR >= 2 ++static gint cubicto(const FT_Vector* ftcontrol1, const FT_Vector* ftcontrol2, ++ const FT_Vector* to, gpointer data) ++#else + static gint cubicto(FT_Vector* ftcontrol1, FT_Vector* ftcontrol2, + FT_Vector* to, gpointer data) ++#endif + { + wxSVGCanvasTextFreetype* canvasText = (wxSVGCanvasTextFreetype*) data; + if (!canvasText->m_endpath) |