From 126507e0594d93b12b0f5eeeba4d6e022495b59c Mon Sep 17 00:00:00 2001 From: markd Date: Thu, 1 Jun 2006 14:19:08 +0000 Subject: Update to KDE 3.5.3 Changes: * KPDF o Fix bug parsing some TOCs o Fix display of some JBIG2 files o Enable print action when opening files using drag and drop * KGhostView o Fix KGhostView .desktop files * Kuickshow o Fix remote browsing of http-urls o Don't display non-existing files --- graphics/kdegraphics3/Makefile | 4 +-- graphics/kdegraphics3/PLIST | 3 +- graphics/kdegraphics3/distinfo | 11 +++----- graphics/kdegraphics3/patches/patch-aa | 31 --------------------- graphics/kdegraphics3/patches/patch-ab | 33 ---------------------- graphics/kdegraphics3/patches/patch-ac | 50 ---------------------------------- 6 files changed, 7 insertions(+), 125 deletions(-) delete mode 100644 graphics/kdegraphics3/patches/patch-aa delete mode 100644 graphics/kdegraphics3/patches/patch-ab delete mode 100644 graphics/kdegraphics3/patches/patch-ac diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile index 4bfb8dcbe1e..c8148a2db14 100644 --- a/graphics/kdegraphics3/Makefile +++ b/graphics/kdegraphics3/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.66 2006/05/31 13:37:46 tron Exp $ +# $NetBSD: Makefile,v 1.67 2006/06/01 14:19:08 markd Exp $ DISTNAME= kdegraphics-${_KDE_VERSION} -PKGREVISION= 2 CATEGORIES= graphics COMMENT= Graphics programs for the KDE integrated X11 desktop @@ -11,7 +10,6 @@ USE_DIRS+= xdg-1.1 USE_TOOLS+= gs:run pkg-config BUILDLINK_API_DEPENDS.lcms+= lcms>=1.12 -BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.2.1 REPLACE_PERL+= kghostview/update-to-xt-names.pl diff --git a/graphics/kdegraphics3/PLIST b/graphics/kdegraphics3/PLIST index 94c719d0619..db870500389 100644 --- a/graphics/kdegraphics3/PLIST +++ b/graphics/kdegraphics3/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.27 2006/03/30 03:02:01 markd Exp $ +@comment $NetBSD: PLIST,v 1.28 2006/06/01 14:19:08 markd Exp $ bin/kcolorchooser bin/kcoloredit bin/kdvi @@ -1139,6 +1139,7 @@ share/kde/services/kfile_tga.desktop share/kde/services/kfile_tiff.desktop share/kde/services/kfile_xbm.desktop share/kde/services/kfile_xpm.desktop +share/kde/services/kghostview_part.desktop share/kde/services/kpdf_part.desktop share/kde/services/ksvglibartcanvas.desktop share/kde/services/ksvgplugin.desktop diff --git a/graphics/kdegraphics3/distinfo b/graphics/kdegraphics3/distinfo index e0b418a91d1..5056e6dd852 100644 --- a/graphics/kdegraphics3/distinfo +++ b/graphics/kdegraphics3/distinfo @@ -1,8 +1,5 @@ -$NetBSD: distinfo,v 1.38 2006/05/31 13:37:46 tron Exp $ +$NetBSD: distinfo,v 1.39 2006/06/01 14:19:08 markd Exp $ -SHA1 (kdegraphics-3.5.2.tar.bz2) = 80703d46fd90b7ab95f92d7b7c411a04f431d13b -RMD160 (kdegraphics-3.5.2.tar.bz2) = cf2fce91b76af7d570b20f336ba551c5c3bd767f -Size (kdegraphics-3.5.2.tar.bz2) = 7288264 bytes -SHA1 (patch-aa) = 1137db0fde9dae7fad9099ab9fa3c8ec01c8bde6 -SHA1 (patch-ab) = 41408791d39ff30b59f8a1b86938d2ecee7a78ed -SHA1 (patch-ac) = dabde5401c4341e9722703e63b6a2425f971cf19 +SHA1 (kdegraphics-3.5.3.tar.bz2) = 7ea559a592bfcd914cc9c1ef923bcc63f2db7c2c +RMD160 (kdegraphics-3.5.3.tar.bz2) = 9c3ee5d1f7e767eb2be854fd0e3a9b0ac90d81bf +Size (kdegraphics-3.5.3.tar.bz2) = 7300366 bytes diff --git a/graphics/kdegraphics3/patches/patch-aa b/graphics/kdegraphics3/patches/patch-aa deleted file mode 100644 index e18b486a286..00000000000 --- a/graphics/kdegraphics3/patches/patch-aa +++ /dev/null @@ -1,31 +0,0 @@ -$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 deleted file mode 100644 index 91c1cbd0542..00000000000 --- a/graphics/kdegraphics3/patches/patch-ab +++ /dev/null @@ -1,33 +0,0 @@ -$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 deleted file mode 100644 index 43f5132c249..00000000000 --- a/graphics/kdegraphics3/patches/patch-ac +++ /dev/null @@ -1,50 +0,0 @@ -$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 - -+#include -+ -+#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(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(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(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(obj); - Affine &affine = glyph->affine(); -- cgit v1.2.3