Update koffice to 1.6.3

Bug fixes to many components and some new features added to kexi.

6 files changed, 20 insertions, 47 deletions

diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile
index 81986520bf7..507f6214ad9 100644
--- a/misc/koffice/Makefile
+++ b/misc/koffice/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.93 2007/02/27 18:21:08 veego Exp $
+# $NetBSD: Makefile,v 1.94 2007/06/08 12:50:14 markd Exp $
 
-DISTNAME=	koffice-1.6.2
+DISTNAME=	koffice-1.6.3
 CATEGORIES=	misc kde
-MASTER_SITES=	${MASTER_SITE_KDE:=koffice-1.6.2/src/}
+MASTER_SITES=	${MASTER_SITE_KDE:=koffice-1.6.3/src/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	markd@NetBSD.org
diff --git a/misc/koffice/PLIST b/misc/koffice/PLIST
index 56cb0da4b27..7dc20c1a7aa 100644
--- a/misc/koffice/PLIST
+++ b/misc/koffice/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2007/02/27 12:04:28 markd Exp $
+@comment $NetBSD: PLIST,v 1.26 2007/06/08 12:50:14 markd Exp $
 bin/karbon
 bin/kchart
 bin/kexi
@@ -142,6 +142,7 @@ include/kexidb/lookupfieldschema.h
 include/kexidb/migratemanager.h
 include/kexidb/msghandler.h
 include/kexidb/object.h
+include/kexidb/parser.h
 include/kexidb/preparedstatement.h
 include/kexidb/queryschema.h
 include/kexidb/queryschemaparameter.h
@@ -202,6 +203,7 @@ include/kis_filter_config_widget.h
 include/kis_filter_configuration.h
 include/kis_filter_manager.h
 include/kis_filter_registry.h
+include/kis_filter_strategy.h
 include/kis_filters_listview.h
 include/kis_generic_registry.h
 include/kis_global.h
@@ -227,6 +229,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
@@ -239,6 +242,7 @@ 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
@@ -271,6 +275,7 @@ include/kis_tool_paint.h
 include/kis_tool_registry.h
 include/kis_tool_types.h
 include/kis_transaction.h
+include/kis_transform_worker.h
 include/kis_types.h
 include/kis_u16_base_colorspace.h
 include/kis_u8_base_colorspace.h
@@ -400,6 +405,7 @@ lib/kde3/kritaroundcornersfilter.la
 lib/kde3/kritascreenshot.la
 lib/kde3/kritascripting.la
 lib/kde3/kritaselectiontools.la
+lib/kde3/kritaselectopaque.la
 lib/kde3/kritaseparatechannels.la
 lib/kde3/kritashearimage.la
 lib/kde3/kritasmalltilesfilter.la
@@ -620,6 +626,7 @@ share/applications/kde/kchart.desktop
 share/applications/kde/kexi.desktop
 share/applications/kde/kformula.desktop
 share/applications/kde/kivio.desktop
+share/applications/kde/koffice.desktop
 share/applications/kde/koshell.desktop
 share/applications/kde/kplato.desktop
 share/applications/kde/kpresenter.desktop
@@ -732,6 +739,7 @@ share/doc/kde/HTML/en/koffice/TODO
 share/doc/kde/HTML/en/koffice/common
 share/doc/kde/HTML/en/koffice/index.cache.bz2
 share/doc/kde/HTML/en/koffice/index.docbook
+share/doc/kde/HTML/en/koffice/koffice.desktop
 share/doc/kde/HTML/en/koshell/common
 share/doc/kde/HTML/en/koshell/index.cache.bz2
 share/doc/kde/HTML/en/koshell/index.docbook
@@ -4228,6 +4236,7 @@ share/kde/apps/kritaplugins/modify_selection.rc
 share/kde/apps/kritaplugins/rotateimage.rc
 share/kde/apps/kritaplugins/screenshot-krita.rc
 share/kde/apps/kritaplugins/scripting.rc
+share/kde/apps/kritaplugins/selectopaque.rc
 share/kde/apps/kritaplugins/shearimage.rc
 share/kde/apps/kritaplugins/substrate.rc
 share/kde/apps/kritaplugins/wetplugin.rc
@@ -4717,6 +4726,7 @@ share/kde/services/kritaroundcornersfilter.desktop
 share/kde/services/kritascreenshot.desktop
 share/kde/services/kritascripting.desktop
 share/kde/services/kritaselectiontools.desktop
+share/kde/services/kritaselectopaque.desktop
 share/kde/services/kritaseparatechannels.desktop
 share/kde/services/kritashearimage.desktop
 share/kde/services/kritasmalltilesfilter.desktop
diff --git a/misc/koffice/distinfo b/misc/koffice/distinfo
index 47c8ede4828..4ffd75522b3 100644
--- a/misc/koffice/distinfo
+++ b/misc/koffice/distinfo
@@ -1,14 +1,9 @@
-$NetBSD: distinfo,v 1.40 2007/02/28 11:02:46 markd Exp $
+$NetBSD: distinfo,v 1.41 2007/06/08 12:50:14 markd Exp $
 
-SHA1 (koffce-xpdf-CVE-2007-0104.diff) = bef37ffafbae9a509363f7bc63806ab7162576b9
-RMD160 (koffce-xpdf-CVE-2007-0104.diff) = 1ea990a06dfdc709362a6cb0fbb69851da86a3d6
-Size (koffce-xpdf-CVE-2007-0104.diff) = 3185 bytes
-SHA1 (koffice-1.6.2.tar.bz2) = a6a0dcc254f7a7f90d7e5b31f6ebecd54800f211
-RMD160 (koffice-1.6.2.tar.bz2) = fb4ef5870870d80481a4a9d2864199428f495460
-Size (koffice-1.6.2.tar.bz2) = 57049103 bytes
+SHA1 (koffice-1.6.3.tar.bz2) = de84214dec913eac1d47dab04dd93f3d81729fd3
+RMD160 (koffice-1.6.3.tar.bz2) = e474ba48fa983fafb61ad58fb79cddda69ec6908
+Size (koffice-1.6.3.tar.bz2) = 56829391 bytes
 SHA1 (patch-ab) = f2e9067f24d1de2e3c9f139727c33ecaf6dc8503
-SHA1 (patch-ac) = 9681410530872d5389f00567f50c4baab9eb8ff2
-SHA1 (patch-ad) = 7fde81d4c149f03d503bbf028f9d9e64d949de6f
 SHA1 (patch-af) = a79564e57f2ef8eb43e8c1e23bb6a8e3d2a1d110
 SHA1 (patch-ag) = f0ad29395bbf52f70dd96f65c291fdb2ff0c6083
 SHA1 (patch-ah) = 094eaa1ff9a5f38adc2bf2f74965b0e47ccd2843
diff --git a/misc/koffice/l10n.mk b/misc/koffice/l10n.mk
index 4885c263585..3df26426a5f 100644
--- a/misc/koffice/l10n.mk
+++ b/misc/koffice/l10n.mk
@@ -1,4 +1,4 @@
-# $NetBSD: l10n.mk,v 1.2 2007/02/27 12:04:28 markd Exp $
+# $NetBSD: l10n.mk,v 1.3 2007/06/08 12:50:14 markd Exp $
 #
 
 # This file provides useful defaults for the l10n packages of koffice.
@@ -12,7 +12,7 @@
 #	The full name of the language (e.g. German, Brasilian)
 #
 
-KOFFICE_VERSION?=	1.6.2
+KOFFICE_VERSION?=	1.6.3
 
 DISTNAME=	koffice-l10n-${KOFFICE_LANGCODE}-${KOFFICE_VERSION}
 CATEGORIES=	misc kde
diff --git a/misc/koffice/patches/patch-ac b/misc/koffice/patches/patch-ac
deleted file mode 100644
index 5f874959674..00000000000
--- a/misc/koffice/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.10 2007/01/14 11:31:44 markd Exp $
-
---- kchart/kdchart/kdchart_export.h.orig	2007-01-13 14:18:02.000000000 +1300
-+++ kchart/kdchart/kdchart_export.h
-@@ -4,7 +4,7 @@
- #include <qglobal.h>
- 
- #if 1
--#include <../../lib/kofficecore/koffice_export.h>
-+#include <koffice_export.h>
- #else
- 
- #if defined(Q_OS_WIN32) && defined(KDCHART_DLL)
diff --git a/misc/koffice/patches/patch-ad b/misc/koffice/patches/patch-ad
deleted file mode 100644
index 3893191525d..00000000000
--- a/misc/koffice/patches/patch-ad
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ad,v 1.11 2007/02/28 11:02:46 markd Exp $
-
-kde svn revisions 633235 and 633840
-
---- kexi/examples/build_kexi_file.sh.orig	2007-02-13 01:23:28.000000000 +1300
-+++ kexi/examples/build_kexi_file.sh
-@@ -8,8 +8,10 @@
- # ksqlite is needed on the $PATH.
- 
- KEXISQL3PATH=../3rdparty/kexisql3/src/.libs/
--PATH=$PATH:$KEXISQL3PATH
--LD_LIBRARY_PATH=$KEXISQL3PATH:$KEXISQL3PATH
-+PATH=$KEXISQL3PATH:$PATH
-+export PATH
-+LD_LIBRARY_PATH=$KEXISQL3PATH:$LD_LIBRARY_PATH
-+export LD_LIBRARY_PATH
- which ksqlite > /dev/null || exit 1
- 
- [ $# -lt 1 ] && echo "Missing .sql filename." && exit 1