summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2006-05-31 13:52:54 +0000
committertron <tron@pkgsrc.org>2006-05-31 13:52:54 +0000
commit581a7449383b07104e8c03feeadf68bd59d43e87 (patch)
treed4679cefa6f83d53b86e7c349bfbf96316d1844a /graphics
parent76a2b05a52fe67dd0b6e9cd4fa8e25fd9d07e099 (diff)
downloadpkgsrc-581a7449383b07104e8c03feeadf68bd59d43e87.tar.gz
Make this package build with version 2.2.1 or newer of the "freetype2"
package. Patch provided by Mark Davies. Bump package revision.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/kdegraphics3/patches/patch-aa31
-rw-r--r--graphics/kdegraphics3/patches/patch-ab33
-rw-r--r--graphics/kdegraphics3/patches/patch-ac50
3 files changed, 114 insertions, 0 deletions
diff --git a/graphics/kdegraphics3/patches/patch-aa b/graphics/kdegraphics3/patches/patch-aa
new file mode 100644
index 00000000000..e18b486a286
--- /dev/null
+++ b/graphics/kdegraphics3/patches/patch-aa
@@ -0,0 +1,31 @@
+$NetBSD: patch-aa,v 1.12 2006/05/31 13:52:54 tron Exp $
+
+--- ksvg/impl/libs/libtext2path/src/GlyphTracer.cpp.orig 2005-10-11 03:56:48.000000000 +1300
++++ ksvg/impl/libs/libtext2path/src/GlyphTracer.cpp
+@@ -36,22 +36,22 @@ GlyphTracer::~GlyphTracer()
+ delete m_outlineMethods;
+ }
+
+-void GlyphTracer::setMoveto(int (funcPtr)(FT_Vector *, void *))
++void GlyphTracer::setMoveto(FT_Outline_MoveToFunc funcPtr)
+ {
+ m_moveTo = funcPtr;
+ }
+
+-void GlyphTracer::setLineto(int (funcPtr)(FT_Vector *, void *))
++void GlyphTracer::setLineto(FT_Outline_LineToFunc funcPtr)
+ {
+ m_lineTo = funcPtr;
+ }
+
+-void GlyphTracer::setConicBezier(int (funcPtr)(FT_Vector *, FT_Vector *, void *))
++void GlyphTracer::setConicBezier(FT_Outline_ConicToFunc funcPtr)
+ {
+ m_conicBezier = funcPtr;
+ }
+
+-void GlyphTracer::setCubicBezier(int (funcPtr)(FT_Vector *, FT_Vector *, FT_Vector *, void *))
++void GlyphTracer::setCubicBezier(FT_Outline_CubicToFunc funcPtr)
+ {
+ m_cubicBezier = funcPtr;
+ }
diff --git a/graphics/kdegraphics3/patches/patch-ab b/graphics/kdegraphics3/patches/patch-ab
new file mode 100644
index 00000000000..91c1cbd0542
--- /dev/null
+++ b/graphics/kdegraphics3/patches/patch-ab
@@ -0,0 +1,33 @@
+$NetBSD: patch-ab,v 1.9 2006/05/31 13:52:54 tron Exp $
+
+--- ksvg/impl/libs/libtext2path/src/GlyphTracer.h.orig 2005-10-11 03:56:48.000000000 +1300
++++ ksvg/impl/libs/libtext2path/src/GlyphTracer.h
+@@ -43,20 +43,20 @@ namespace T2P
+ virtual void closePath(Glyph *glyph) = 0;
+
+ // FreeType glyph tracing functions
+- void setMoveto(int (funcPtr)(FT_Vector *, void *));
+- void setLineto(int (funcPtr)(FT_Vector *, void *));
+- void setConicBezier(int (funcPtr)(FT_Vector *, FT_Vector *, void *));
+- void setCubicBezier(int (funcPtr)(FT_Vector *, FT_Vector *, FT_Vector *, void *));
++ void setMoveto(FT_Outline_MoveToFunc funcPtr);
++ void setLineto(FT_Outline_LineToFunc funcPtr);
++ void setConicBezier(FT_Outline_ConicToFunc funcPtr);
++ void setCubicBezier(FT_Outline_CubicToFunc funcPtr);
+
+ FT_Outline_Funcs *outlineFuncs();
+
+ private:
+ FT_Outline_Funcs *m_outlineMethods;
+
+- int (*m_moveTo)(FT_Vector *, void *);
+- int (*m_lineTo)(FT_Vector *, void *);
+- int (*m_conicBezier)(FT_Vector *, FT_Vector *, void *);
+- int (*m_cubicBezier)(FT_Vector *, FT_Vector *, FT_Vector *, void *);
++ FT_Outline_MoveToFunc m_moveTo;
++ FT_Outline_LineToFunc m_lineTo;
++ FT_Outline_ConicToFunc m_conicBezier;
++ FT_Outline_CubicToFunc m_cubicBezier;
+ };
+ }
+
diff --git a/graphics/kdegraphics3/patches/patch-ac b/graphics/kdegraphics3/patches/patch-ac
new file mode 100644
index 00000000000..43f5132c249
--- /dev/null
+++ b/graphics/kdegraphics3/patches/patch-ac
@@ -0,0 +1,50 @@
+$NetBSD: patch-ac,v 1.6 2006/05/31 13:52:54 tron Exp $
+
+--- ksvg/plugin/backends/libart/GlyphTracerLibart.cpp.orig 2005-10-11 03:56:46.000000000 +1300
++++ ksvg/plugin/backends/libart/GlyphTracerLibart.cpp
+@@ -29,9 +29,17 @@
+
+ #include <libart_lgpl/art_bpath.h>
+
++#include <config.h>
++
++#if 1 /* def HAVE_FREETYPE_2_2_x */
++ #define FT_VECTOR_PARAMETER const FT_Vector
++#else
++ #define FT_VECTOR_PARAMETER FT_Vector
++#endif
++
+ using namespace T2P;
+
+-int traceMoveto(FT_Vector *to, void *obj)
++int traceMoveto(FT_VECTOR_PARAMETER *to, void *obj)
+ {
+ Glyph *glyph = reinterpret_cast<Glyph *>(obj);
+ Affine &affine = glyph->affine();
+@@ -52,7 +60,7 @@ int traceMoveto(FT_Vector *to, void *obj
+ return 0;
+ }
+
+-int traceLineto(FT_Vector *to, void *obj)
++int traceLineto(FT_VECTOR_PARAMETER *to, void *obj)
+ {
+ Glyph *glyph = reinterpret_cast<Glyph *>(obj);
+ Affine &affine = glyph->affine();
+@@ -73,7 +81,7 @@ int traceLineto(FT_Vector *to, void *obj
+ return 0;
+ }
+
+-int traceConicBezier(FT_Vector *control, FT_Vector *to, void *obj)
++int traceConicBezier(FT_VECTOR_PARAMETER *control, FT_VECTOR_PARAMETER *to, void *obj)
+ {
+ Glyph *glyph = reinterpret_cast<Glyph *>(obj);
+ Affine &affine = glyph->affine();
+@@ -102,7 +110,7 @@ int traceConicBezier(FT_Vector *control,
+ return 0;
+ }
+
+-int traceCubicBezier(FT_Vector *control1, FT_Vector *control2, FT_Vector *to, void *obj)
++int traceCubicBezier(FT_VECTOR_PARAMETER *control1, FT_VECTOR_PARAMETER *control2, FT_VECTOR_PARAMETER *to, void *obj)
+ {
+ Glyph *glyph = reinterpret_cast<Glyph *>(obj);
+ Affine &affine = glyph->affine();