Update to KDE 3.4

5 files changed, 44 insertions, 66 deletions

diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index f91ebd314522..0ea2067488f4 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	kdegraphics
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	2
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -17,12 +16,14 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Graphics utilities for the KDE3 integrated X11 desktop
 
+BUILD_DEPENDS=	kpsewhich:${PORTSDIR}/print/teTeX-base
 LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2 \
 		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 		freetype:${PORTSDIR}/print/freetype2 \
 		fribidi:${PORTSDIR}/converters/fribidi \
 		glut:${PORTSDIR}/graphics/libglut \
-		lcms:${PORTSDIR}/graphics/lcms
+		lcms:${PORTSDIR}/graphics/lcms \
+		paper:${PORTSDIR}/print/libpaper
 RUN_DEPENDS=	pdfinfo:${PORTSDIR}/graphics/xpdf
 
 CONFLICTS=	kolourpaint-[0-9]*
@@ -35,7 +36,6 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 WANT_GNOME=	yes
 USE_GHOSTSCRIPT=yes
-_NO_KDE_CLOSURE=yes
 
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
diff --git a/graphics/kdegraphics3/distinfo b/graphics/kdegraphics3/distinfo
index 8aa0a9e4d516..58228ba1eed3 100644
--- a/graphics/kdegraphics3/distinfo
+++ b/graphics/kdegraphics3/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdegraphics-3.3.2.tar.bz2) = 03092b8be2f7054d71895b8fd58ad26e
-SIZE (KDE/kdegraphics-3.3.2.tar.bz2) = 6234394
+MD5 (KDE/kdegraphics-3.4.0.tar.bz2) = 5a0a32e314422e2ce051290c08390367
+SIZE (KDE/kdegraphics-3.4.0.tar.bz2) = 6667685
diff --git a/graphics/kdegraphics3/files/patch-post-3.3.2-kdegraphics-3.diff b/graphics/kdegraphics3/files/patch-post-3.3.2-kdegraphics-3.diff
deleted file mode 100644
index a222921858bb..000000000000
--- a/graphics/kdegraphics3/files/patch-post-3.3.2-kdegraphics-3.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-*** kpdf/xpdf/XRef.cc.orig	Wed Jan 12 17:10:53 2005
---- kpdf/xpdf/XRef.cc	Wed Jan 12 17:11:22 2005
-***************
-*** 793,798 ****
---- 793,801 ----
-  	} else {
-  	  keyLength = 5;
-  	}
-+ 	if (keyLength > 16) {
-+ 	  keyLength = 16;
-+ 	}
-  	permFlags = permissions.getInt();
-  	if (encVersion >= 1 && encVersion <= 2 &&
-  	    encRevision >= 2 && encRevision <= 3) {
diff --git a/graphics/kdegraphics3/files/patch-post-3.3.2-kdegraphics.diff b/graphics/kdegraphics3/files/patch-post-3.3.2-kdegraphics.diff
deleted file mode 100644
index 417710a8de2c..000000000000
--- a/graphics/kdegraphics3/files/patch-post-3.3.2-kdegraphics.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -b -p -u -r1.4.4.1 -r1.4.4.2
---- kpdf/xpdf/Gfx.cc	2 Sep 2004 21:30:18 -0000	1.4.4.1
-+++ kpdf/xpdf/Gfx.cc	22 Dec 2004 12:05:50 -0000	1.4.4.2
-@@ -2654,7 +2654,9 @@ void Gfx::doImage(Object *ref, Stream *s
-     haveMask = gFalse;
-     dict->lookup("Mask", &maskObj);
-     if (maskObj.isArray()) {
--      for (i = 0; i < maskObj.arrayGetLength(); ++i) {
-+      for (i = 0;
-+	   i < maskObj.arrayGetLength() && i < 2*gfxColorMaxComps;
-+	   ++i) {
- 	maskObj.arrayGet(i, &obj1);
- 	maskColors[i] = obj1.getInt();
- 	obj1.free();
-diff -b -p -u -r1.3.4.1 -r1.3.4.2
---- kpdf/xpdf/GfxState.cc	2 Sep 2004 21:30:18 -0000	1.3.4.1
-+++ kpdf/xpdf/GfxState.cc	22 Dec 2004 12:05:50 -0000	1.3.4.2
-@@ -708,6 +708,11 @@ GfxColorSpace *GfxICCBasedColorSpace::pa
-   }
-   nCompsA = obj2.getInt();
-   obj2.free();
-+  if (nCompsA > gfxColorMaxComps) {
-+    error(-1, "ICCBased color space with too many (%d > %d) components",
-+	  nCompsA, gfxColorMaxComps);
-+    nCompsA = gfxColorMaxComps;
-+  }
-   if (dict->lookup("Alternate", &obj2)->isNull() ||
-       !(altA = GfxColorSpace::parse(&obj2))) {
-     switch (nCompsA) {
-@@ -1054,7 +1059,7 @@ GfxColorSpace *GfxDeviceNColorSpace::par
-   }
-   nCompsA = obj1.arrayGetLength();
-   if (nCompsA > gfxColorMaxComps) {
--    error(-1, "DeviceN color space with more than %d > %d components",
-+    error(-1, "DeviceN color space with too many (%d > %d) components",
- 	  nCompsA, gfxColorMaxComps);
-     nCompsA = gfxColorMaxComps;
-   }
diff --git a/graphics/kdegraphics3/pkg-plist b/graphics/kdegraphics3/pkg-plist
index 29d708f3fe0f..a2d64b30f3f8 100644
--- a/graphics/kdegraphics3/pkg-plist
+++ b/graphics/kdegraphics3/pkg-plist
@@ -175,6 +175,8 @@ include/ksvg/ksvg_plugin.h
 include/libtext2path-0.1/BezierPath.h
 include/libtext2path-0.1/Glyph.h
 include/libtext2path-0.1/GlyphTracer.h
+lib/kde3/emptymultipagepart.la
+lib/kde3/emptymultipagepart.so
 lib/kde3/gsthumbnail.la
 lib/kde3/gsthumbnail.so
 lib/kde3/kcm_kgamma.la
@@ -187,8 +189,6 @@ lib/kde3/kcm_kviewgeneralconfig.la
 lib/kde3/kcm_kviewgeneralconfig.so
 lib/kde3/kcm_kviewpluginsconfig.la
 lib/kde3/kcm_kviewpluginsconfig.so
-lib/kde3/kcm_kviewpresenterconfig.la
-lib/kde3/kcm_kviewpresenterconfig.so
 lib/kde3/kcm_kviewviewerpluginsconfig.la
 lib/kde3/kcm_kviewviewerpluginsconfig.so
 lib/kde3/kded_daemonwatcher.la
@@ -199,6 +199,8 @@ lib/kde3/kfaxpart.la
 lib/kde3/kfaxpart.so
 lib/kde3/kfile_bmp.la
 lib/kde3/kfile_bmp.so
+lib/kde3/kfile_dds.la
+lib/kde3/kfile_dds.so
 lib/kde3/kfile_dvi.la
 lib/kde3/kfile_dvi.so
 lib/kde3/kfile_exr.la
@@ -225,6 +227,8 @@ lib/kde3/kfile_tiff.la
 lib/kde3/kfile_tiff.so
 lib/kde3/kfile_xbm.la
 lib/kde3/kfile_xbm.so
+lib/kde3/kfile_xpm.la
+lib/kde3/kfile_xpm.so
 lib/kde3/kio_mrml.la
 lib/kde3/kio_mrml.so
 lib/kde3/kview.la
@@ -278,6 +282,8 @@ lib/libkpovmodeler.so.0
 lib/libksvg.la
 lib/libksvg.so
 lib/libksvg.so.0
+lib/libphotobook.la
+lib/libphotobook.so
 lib/libtext2path.la
 lib/libtext2path.so
 lib/libtext2path.so.0
@@ -297,7 +303,10 @@ share/applications/kde/ksnapshot.desktop
 share/applications/kde/kview.desktop
 share/applnk/Graphics/kruler.desktop
 share/apps/kcoloredit/kcoloreditui.rc
+share/apps/kconf_update/kghostview.upd
+share/apps/kconf_update/update-to-xt-names.pl
 share/apps/kdvi/kdvi_part.rc
+share/apps/kdvi/kviewshell.rc
 share/apps/kdvi/tips
 share/apps/kfax/kfax_part.rc
 share/apps/kfax/kfaxui.rc
@@ -332,7 +341,6 @@ share/apps/kiconedit/pics/grayscale.png
 share/apps/kiconedit/pics/grid.png
 share/apps/kiconedit/pics/kdepalette.png
 share/apps/kiconedit/pics/line.png
-share/apps/kiconedit/pics/newwin.png
 share/apps/kiconedit/pics/paintbrush-cursor.xpm
 share/apps/kiconedit/pics/pointer.png
 share/apps/kiconedit/pics/rectangle.png
@@ -341,6 +349,7 @@ share/apps/kiconedit/pics/selectrect.png
 share/apps/kiconedit/pics/source.png
 share/apps/kiconedit/pics/standard.png
 share/apps/kiconedit/pics/transform.png
+share/apps/kiconedit/pics/window_new.png
 share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_brush.png
 share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_color_picker.png
 share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_color_washer.png
@@ -378,8 +387,8 @@ share/apps/kolourpaint/pics/tool_spraycan_17x17.png
 share/apps/kolourpaint/pics/tool_spraycan_29x29.png
 share/apps/kolourpaint/pics/tool_spraycan_9x9.png
 share/apps/konqueror/servicemenus/mrml-servicemenu.desktop
-share/apps/kpdf/kpdf_shell.rc
-share/apps/kpdfpart/kpdf_part.rc
+share/apps/kpdf/shell.rc
+share/apps/kpdfpart/part.rc
 share/apps/kpovmodeler/baseinsertrules.xml
 share/apps/kpovmodeler/examples/includes/inlined/chars.kpm
 share/apps/kpovmodeler/examples/includes/inlined/finish.kpm
@@ -760,6 +769,11 @@ share/apps/kviewviewer/kpartplugins/kviewbrowser.rc
 share/apps/kviewviewer/kviewpopup.rc
 share/apps/kviewviewer/kviewviewer.rc
 share/apps/kviewviewer/kviewviewer_ro.rc
+share/apps/photobookui.rc
+share/config.kcfg/kdvi.kcfg
+share/config.kcfg/kghostview.kcfg
+share/config.kcfg/kpdf.kcfg
+share/config.kcfg/kviewshell.kcfg
 share/doc/HTML/en/kcoloredit/common
 share/doc/HTML/en/kcoloredit/index.cache.bz2
 share/doc/HTML/en/kcoloredit/index.docbook
@@ -789,6 +803,7 @@ share/doc/HTML/en/kolourpaint/common
 share/doc/HTML/en/kolourpaint/eraser_shapes.png
 share/doc/HTML/en/kolourpaint/fcc_std_text.png
 share/doc/HTML/en/kolourpaint/fcc_trans_text.png
+share/doc/HTML/en/kolourpaint/fill_color_similarity.png
 share/doc/HTML/en/kolourpaint/fill_style.png
 share/doc/HTML/en/kolourpaint/image_balance.png
 share/doc/HTML/en/kolourpaint/image_emboss.png
@@ -810,6 +825,7 @@ share/doc/HTML/en/kolourpaint/rotate_image_30.png
 share/doc/HTML/en/kolourpaint/rotate_selection_30.png
 share/doc/HTML/en/kolourpaint/selections_opaque_transparent.png
 share/doc/HTML/en/kolourpaint/spraycan_patterns.png
+share/doc/HTML/en/kolourpaint/text_zoom_grid.png
 share/doc/HTML/en/kolourpaint/tool_brush.png
 share/doc/HTML/en/kolourpaint/tool_color_picker.png
 share/doc/HTML/en/kolourpaint/tool_color_washer.png
@@ -907,24 +923,30 @@ share/doc/HTML/en/kview/snapshot7.png
 share/doc/HTML/en/kview/snapshot8.png
 share/doc/HTML/en/kview/snapshot9.png
 share/icons/crystalsvg/128x128/apps/kghostview.png
+share/icons/crystalsvg/128x128/apps/kpdf.png
 share/icons/crystalsvg/16x16/apps/kcolorchooser.png
 share/icons/crystalsvg/16x16/apps/kcoloredit.png
 share/icons/crystalsvg/16x16/apps/kdvi.png
 share/icons/crystalsvg/16x16/apps/kfax.png
 share/icons/crystalsvg/16x16/apps/kghostview.png
 share/icons/crystalsvg/16x16/apps/kiconedit.png
+share/icons/crystalsvg/16x16/apps/kpdf.png
 share/icons/crystalsvg/16x16/apps/kpovmodeler.png
 share/icons/crystalsvg/16x16/apps/kruler.png
 share/icons/crystalsvg/16x16/apps/ksnapshot.png
 share/icons/crystalsvg/16x16/apps/kview.png
 share/icons/crystalsvg/16x16/apps/kviewshell.png
+share/icons/crystalsvg/16x16/apps/photobook.png
 share/icons/crystalsvg/16x16/mimetypes/kpovmodeler_doc.png
 share/icons/crystalsvg/22x22/apps/kcolorchooser.png
+share/icons/crystalsvg/22x22/apps/kpdf.png
+share/icons/crystalsvg/22x22/apps/photobook.png
 share/icons/crystalsvg/32x32/apps/kcoloredit.png
 share/icons/crystalsvg/32x32/apps/kdvi.png
 share/icons/crystalsvg/32x32/apps/kfax.png
 share/icons/crystalsvg/32x32/apps/kghostview.png
 share/icons/crystalsvg/32x32/apps/kiconedit.png
+share/icons/crystalsvg/32x32/apps/kpdf.png
 share/icons/crystalsvg/32x32/apps/kpovmodeler.png
 share/icons/crystalsvg/32x32/apps/kruler.png
 share/icons/crystalsvg/32x32/apps/ksnapshot.png
@@ -935,33 +957,38 @@ share/icons/crystalsvg/48x48/apps/kdvi.png
 share/icons/crystalsvg/48x48/apps/kfax.png
 share/icons/crystalsvg/48x48/apps/kghostview.png
 share/icons/crystalsvg/48x48/apps/kiconedit.png
+share/icons/crystalsvg/48x48/apps/kpdf.png
+share/icons/crystalsvg/48x48/apps/kpovmodeler.png
 share/icons/crystalsvg/48x48/apps/kruler.png
 share/icons/crystalsvg/48x48/apps/ksnapshot.png
 share/icons/crystalsvg/48x48/apps/kview.png
 share/icons/crystalsvg/48x48/apps/kviewshell.png
+share/icons/crystalsvg/48x48/mimetypes/kpovmodeler_doc.png
 share/icons/crystalsvg/64x64/apps/kghostview.png
+share/icons/crystalsvg/64x64/apps/kpdf.png
+share/icons/crystalsvg/scalable/apps/kdvi.svgz
+share/icons/crystalsvg/scalable/apps/ksnapshot.svgz
 share/icons/hicolor/16x16/apps/kgamma.png
 share/icons/hicolor/16x16/apps/kolourpaint.png
-share/icons/hicolor/16x16/apps/kpdf.png
 share/icons/hicolor/32x32/apps/kgamma.png
 share/icons/hicolor/32x32/apps/kolourpaint.png
-share/icons/hicolor/32x32/apps/kpdf.png
 share/icons/hicolor/48x48/apps/kgamma.png
 share/icons/hicolor/48x48/apps/kolourpaint.png
-share/icons/hicolor/48x48/apps/kpdf.png
 share/icons/locolor/16x16/apps/kcoloredit.png
 share/icons/locolor/16x16/apps/kpovmodeler.png
 share/icons/locolor/32x32/apps/kcoloredit.png
 share/icons/locolor/32x32/apps/kpovmodeler.png
 share/mimelnk/text/mrml.desktop
+share/services/emptymultipage.desktop
 share/services/gsthumbnail.desktop
 share/services/kconfiguredialog/kviewcanvasconfig.desktop
 share/services/kconfiguredialog/kviewgeneralconfig.desktop
 share/services/kconfiguredialog/kviewpluginsconfig.desktop
-share/services/kconfiguredialog/kviewpresenterconfig.desktop
 share/services/kconfiguredialog/kviewviewerpluginsconfig.desktop
 share/services/kded/daemonwatcher.desktop
+share/services/kdvimultipage.desktop
 share/services/kfile_bmp.desktop
+share/services/kfile_dds.desktop
 share/services/kfile_dvi.desktop
 share/services/kfile_exr.desktop
 share/services/kfile_ico.desktop
@@ -975,6 +1002,7 @@ share/services/kfile_rgb.desktop
 share/services/kfile_tga.desktop
 share/services/kfile_tiff.desktop
 share/services/kfile_xbm.desktop
+share/services/kfile_xpm.desktop
 share/services/kpdf_part.desktop
 share/services/ksvglibartcanvas.desktop
 share/services/ksvgplugin.desktop
@@ -982,9 +1010,11 @@ share/services/kviewcanvas.desktop
 share/services/kviewviewer.desktop
 share/services/mrml.protocol
 share/services/mrml_part.desktop
+share/services/photobook.desktop
 share/services/svgthumbnail.desktop
 share/servicetypes/kimageviewer.desktop
 share/servicetypes/kimageviewercanvas.desktop
+share/servicetypes/kmultipage.desktop
 share/servicetypes/ksvgrenderer.desktop
 @dirrm share/services/kconfiguredialog
 @dirrm share/doc/HTML/en/kview