Update koffice to version 1.5.1

Major Improvements in this release are:
* Improved OASIS OpenDocument Support, especially in KSpread
* Rotating large images and scaling of images now works correctly in Krita
* Various other bugfixes

Known issues:
* Two issues with Kexi forms. Forms may not appear in Kexi (1.0.0 version
  was affected as well). No existing data or design can be lost, though.
  SUSE and Debian packages are not affected. Please read the details.
* Krita crashes when saving an image containing exif information to .kra
  twice

5 files changed, 46 insertions, 14 deletions

diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile
index a5b93637a74..de7a95e88f9 100644
--- a/misc/koffice/Makefile
+++ b/misc/koffice/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.81 2006/05/18 20:30:00 wiz Exp $
+# $NetBSD: Makefile,v 1.82 2006/05/24 12:54:45 markd Exp $
 
-DISTNAME=	koffice-1.5.0
-PKGREVISION=	1
+DISTNAME=	koffice-1.5.1
 CATEGORIES=	misc kde
-MASTER_SITES=	${MASTER_SITE_KDE:=koffice-1.5.0/src/}
+MASTER_SITES=	${MASTER_SITE_KDE:=koffice-1.5.1/src/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	markd@NetBSD.org
@@ -12,8 +11,6 @@ COMMENT=	KDE Office Suite
 
 CONFLICTS+=	koffice3-[0-9]*
 
-BROKEN_IN=	pkgsrc-2006Q1
-
 # to unpack krita/plugins/convolutionfilters properly on NetBSD 1.6
 ## EXTRACT_USING=		gtar
 
diff --git a/misc/koffice/PLIST b/misc/koffice/PLIST
index c6cc2f94377..4eda4281b4b 100644
--- a/misc/koffice/PLIST
+++ b/misc/koffice/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2006/05/15 11:03:17 markd Exp $
+@comment $NetBSD: PLIST,v 1.20 2006/05/24 12:54:45 markd Exp $
 bin/karbon
 bin/kchart
 bin/kexi
@@ -136,6 +136,7 @@ include/kexiutils/kexiutils_export.h
 include/kexiutils/tristate.h
 include/kexiutils/utils.h
 include/kexiutils/validator.h
+include/kis_abstract_colorspace.h
 include/kis_adjustment_layer.h
 include/kis_alpha_mask.h
 include/kis_annotation.h
@@ -145,8 +146,12 @@ include/kis_background.h
 include/kis_basic_histogram_producers.h
 include/kis_boundary.h
 include/kis_brush.h
+include/kis_button_event.h
+include/kis_button_press_event.h
+include/kis_button_release_event.h
 include/kis_canvas_controller.h
 include/kis_canvas_observer.h
+include/kis_canvas_painter.h
 include/kis_canvas_subject.h
 include/kis_channelinfo.h
 include/kis_cmb_composite.h
@@ -154,6 +159,7 @@ include/kis_cmb_idlist.h
 include/kis_color.h
 include/kis_color_cup.h
 include/kis_colorspace.h
+include/kis_colorspace_factory_registry.h
 include/kis_command.h
 include/kis_composite_op.h
 include/kis_config.h
@@ -163,6 +169,7 @@ include/kis_doc.h
 include/kis_doc_iface.h
 include/kis_double_click_event.h
 include/kis_double_widget.h
+include/kis_event.h
 include/kis_exif_info.h
 include/kis_exif_value.h
 include/kis_f16half_base_colorspace.h
@@ -198,6 +205,7 @@ include/kis_iteratorpixeltrait.h
 include/kis_iterators_pixel.h
 include/kis_label_zoom.h
 include/kis_layer.h
+include/kis_layer_visitor.h
 include/kis_layerbox.h
 include/kis_layerlist.h
 include/kis_matrix_widget.ui.h
@@ -207,8 +215,10 @@ include/kis_multi_bool_filter_widget.h
 include/kis_multi_double_filter_widget.h
 include/kis_multi_integer_filter_widget.h
 include/kis_nameserver.h
+include/kis_opengl_image_context.h
 include/kis_paint_device.h
 include/kis_paint_device_iface.h
+include/kis_paint_layer.h
 include/kis_painter.h
 include/kis_paintop.h
 include/kis_paintop_box.h
@@ -349,7 +359,6 @@ lib/kde3/kritahistogramdocker.la
 lib/kde3/kritaimageenhancement.la
 lib/kde3/kritaimagesize.la
 lib/kde3/kritaoilpaintfilter.la
-lib/kde3/kritaperftest.la
 lib/kde3/kritapixelizefilter.la
 lib/kde3/kritaraindropsfilter.la
 lib/kde3/kritargbplugin.la
@@ -3934,7 +3943,6 @@ share/kde/apps/kritaplugins/imageseparate.rc
 share/kde/apps/kritaplugins/imagesize.rc
 share/kde/apps/kritaplugins/kritafiltersgallery.rc
 share/kde/apps/kritaplugins/kritahistogramdocker.rc
-share/kde/apps/kritaplugins/perftest.rc
 share/kde/apps/kritaplugins/rotateimage.rc
 share/kde/apps/kritaplugins/screenshot-krita.rc
 share/kde/apps/kritaplugins/scripting.rc
@@ -4529,7 +4537,6 @@ share/kde/services/kritaimageenhancement.desktop
 share/kde/services/kritaimagesize.desktop
 share/kde/services/kritaoilpaintfilter.desktop
 share/kde/services/kritapart.desktop
-share/kde/services/kritaperftest.desktop
 share/kde/services/kritapixelizefilter.desktop
 share/kde/services/kritaraindropsfilter.desktop
 share/kde/services/kritargbplugin.desktop
diff --git a/misc/koffice/distinfo b/misc/koffice/distinfo
index aae2295a3eb..f77df8d4744 100644
--- a/misc/koffice/distinfo
+++ b/misc/koffice/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.30 2006/04/12 12:37:35 markd Exp $
+$NetBSD: distinfo,v 1.31 2006/05/24 12:54:45 markd Exp $
 
-SHA1 (koffice-1.5.0.tar.bz2) = e8886c8dd438d5522a7b2fe514024543e33436d5
-RMD160 (koffice-1.5.0.tar.bz2) = d3539bf2d6ed9be51e34f5533f0c4c17dfbc7cf0
-Size (koffice-1.5.0.tar.bz2) = 35981152 bytes
+SHA1 (koffice-1.5.1.tar.bz2) = d97c4f8eae3e22b7c119454f763a6ce88713edff
+RMD160 (koffice-1.5.1.tar.bz2) = 3fb67d50554c081104080d3230ba10f022f4a990
+Size (koffice-1.5.1.tar.bz2) = 36010120 bytes
 SHA1 (patch-ab) = 6f253484f6c09877cca6b1d1d7610725c895e13a
 SHA1 (patch-af) = a79564e57f2ef8eb43e8c1e23bb6a8e3d2a1d110
 SHA1 (patch-ag) = f0ad29395bbf52f70dd96f65c291fdb2ff0c6083
@@ -12,3 +12,5 @@ SHA1 (patch-aj) = 2cbe0c00dbb0b3b52f15caaf5b925bc68e1f55b8
 SHA1 (patch-ak) = 6aebf5300ffcb3d1adcfa274f080c63b0c3a4270
 SHA1 (patch-al) = 806334757d3ebca4515738e87454a30d9dd26e53
 SHA1 (patch-am) = f0a9ace27553df24aa50bf8ccb485ece5b372c8c
+SHA1 (patch-an) = 14a18f5e8f63aece0387c1ca6d29fa5db88b6ab3
+SHA1 (patch-ao) = 141495350a1078cbf3315ac9c556f983741719aa
diff --git a/misc/koffice/patches/patch-an b/misc/koffice/patches/patch-an
new file mode 100644
index 00000000000..ad0064dbd45
--- /dev/null
+++ b/misc/koffice/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.5 2006/05/24 12:54:45 markd Exp $
+
+--- krita/plugins/filters/cimg/Makefile.in.orig	2006-05-12 07:20:35.000000000 +1200
++++ krita/plugins/filters/cimg/Makefile.in
+@@ -562,7 +562,7 @@ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+-KDE_CXXFLAGS = $(USE_EXCEPTIONS) -D_POSIX_C_SOURCE=199309L
++KDE_CXXFLAGS = $(USE_EXCEPTIONS)
+ kde_services_DATA = kritacimg.desktop
+ 
+ # all_includes must remain last!
diff --git a/misc/koffice/patches/patch-ao b/misc/koffice/patches/patch-ao
new file mode 100644
index 00000000000..69a06e0edb3
--- /dev/null
+++ b/misc/koffice/patches/patch-ao
@@ -0,0 +1,13 @@
+$NetBSD: patch-ao,v 1.3 2006/05/24 12:54:45 markd Exp $
+
+--- krita/plugins/filters/cimg/CImg.h.orig	2006-05-11 06:28:04.000000000 +1200
++++ krita/plugins/filters/cimg/CImg.h
+@@ -65,7 +65,7 @@
+ #if defined(sun)         || defined(__sun)      || defined(linux)       || defined(__linux) \
+  || defined(__linux__)   || defined(__CYGWIN__) || defined(BSD)         || defined(__FreeBSD__) \
+  || defined(__OPENBSD__) || defined(__MACOSX__) || defined(__APPLE__)   || defined(sgi) \
+- || defined(__sgi)
++ || defined(__sgi) || defined(__NetBSD__)
+ // Unix (Linux,Solaris,BSD,Irix,...)
+ #define cimg_OS            1
+ #ifndef cimg_display_type