10 files changed, 17 insertions, 108 deletions

diff --git a/editors/koffice-kde4/Makefile b/editors/koffice-kde4/Makefile
index 4648c3942bcc..4615d9031b83 100644
--- a/editors/koffice-kde4/Makefile
+++ b/editors/koffice-kde4/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	koffice
-PORTVERSION=	1.6.2
-PORTREVISION=	3
+PORTVERSION=	1.6.3
+PORTREVISION=	0
 PORTEPOCH=	2
 CATEGORIES=	editors kde
 MASTER_SITES=	${MASTER_SITE_KDE}
diff --git a/editors/koffice-kde4/distinfo b/editors/koffice-kde4/distinfo
index a851f75e77e8..b18e7ef7d61e 100644
--- a/editors/koffice-kde4/distinfo
+++ b/editors/koffice-kde4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/koffice/koffice-1.6.2.tar.bz2) = 74ef62a5f8f766fe8192d5b7d65a3928
-SHA256 (KDE/koffice/koffice-1.6.2.tar.bz2) = fa5ca02eba02219d34c3c6efff92bf767060b4b1343da56eb63139661d53f380
-SIZE (KDE/koffice/koffice-1.6.2.tar.bz2) = 57049103
+MD5 (KDE/koffice/koffice-1.6.3.tar.bz2) = 386d388094734f9759977c3267098e30
+SHA256 (KDE/koffice/koffice-1.6.3.tar.bz2) = c3975f0a59f50aaa5547f1709b6fad54f746fd06815859b374676b426dce12cb
+SIZE (KDE/koffice/koffice-1.6.3.tar.bz2) = 56829391
diff --git a/editors/koffice-kde4/files/patch-filters_krita_tiff-kis_tiff_reader.h b/editors/koffice-kde4/files/patch-filters_krita_tiff-kis_tiff_reader.h
deleted file mode 100644
index 21642547bfec..000000000000
--- a/editors/koffice-kde4/files/patch-filters_krita_tiff-kis_tiff_reader.h
+++ /dev/null
@@ -1,25 +0,0 @@
---- filters/krita/tiff/kis_tiff_reader.h	2006/10/15 22:49:50	595862
-+++ filters/krita/tiff/kis_tiff_reader.h	2007/05/26 10:45:29	668416
-@@ -20,15 +20,15 @@
- #ifndef _KIS_TIFF_READER_H_
- #define _KIS_TIFF_READER_H_
- 
-+// On some platforms, tiffio.h #defines NULL in a bad
-+// way for C++, as (void *)0 instead of using the correct
-+// C++ value 0. Include stdio.h first to get the right one.
-+#include <stdio.h>
- #include <tiffio.h>
- 
--/*#include <stdio.h>
--
--#include <qvaluevector.h>
--
--#include <kio/job.h>
--
--#include <kis_progress_subject.h> */
-+// #include <qvaluevector.h>
-+// #include <kio/job.h>
-+// #include <kis_progress_subject.h>
- 
- #include <kis_paint_device.h>
- 
diff --git a/editors/koffice-kde4/files/patch-kexi_examples-build_kexi_file.sh b/editors/koffice-kde4/files/patch-kexi_examples-build_kexi_file.sh
deleted file mode 100644
index 1fb0916c33a0..000000000000
--- a/editors/koffice-kde4/files/patch-kexi_examples-build_kexi_file.sh
+++ /dev/null
@@ -1,15 +0,0 @@
---- kexi/examples/build_kexi_file.sh.orig	Mon Mar  5 01:50:05 2007
-+++ kexi/examples/build_kexi_file.sh	Mon Mar  5 01:50:31 2007
-@@ -7,9 +7,9 @@
- # Only .kexi file that is older than .sql file is recreated.
- # ksqlite is needed on the $PATH.
- 
--KEXISQL3PATH=../3rdparty/kexisql3/src/.libs/
--PATH=$PATH:$KEXISQL3PATH
--LD_LIBRARY_PATH=$KEXISQL3PATH:$KEXISQL3PATH
-+export KEXISQL3PATH=../3rdparty/kexisql3/src/.libs/
-+export PATH=$PATH:$KEXISQL3PATH
-+export LD_LIBRARY_PATH=$KEXISQL3PATH:$KEXISQL3PATH
- which ksqlite > /dev/null || exit 1
- 
- [ $# -lt 1 ] && echo "Missing .sql filename." && exit 1
diff --git a/editors/koffice-kde4/files/patch-kexi_kexidb_drivers_pqxx-pqxxconnection.cpp b/editors/koffice-kde4/files/patch-kexi_kexidb_drivers_pqxx-pqxxconnection.cpp
deleted file mode 100644
index 3b6ac0bea559..000000000000
--- a/editors/koffice-kde4/files/patch-kexi_kexidb_drivers_pqxx-pqxxconnection.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- kexi/kexidb/drivers/pqxx/pqxxconnection.cpp.orig	Sun Feb 11 16:58:22 2007
-+++ kexi/kexidb/drivers/pqxx/pqxxconnection.cpp	Sun Feb 11 16:58:53 2007
-@@ -277,7 +277,7 @@
- 		//		m_trans = new pqxx::nontransaction(*m_pqxxsql);
- //		KexiDBDrvDbg << "About to execute" << endl;
- 		//Create a result object through the transaction
--		d->res = new pqxx::result(m_trans->data->exec(statement.utf8()));
-+		d->res = new pqxx::result(m_trans->data->exec(statement.utf8().data()));
- //		KexiDBDrvDbg << "Executed" << endl;
- 		//Commit the transaction
- 		if (implicityStarted) {
diff --git a/editors/koffice-kde4/files/patch-kexi_kexidb_drivers_pqxx-pqxxconnection_p.h b/editors/koffice-kde4/files/patch-kexi_kexidb_drivers_pqxx-pqxxconnection_p.h
deleted file mode 100644
index bc0531bfb527..000000000000
--- a/editors/koffice-kde4/files/patch-kexi_kexidb_drivers_pqxx-pqxxconnection_p.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- kexi/kexidb/drivers/pqxx/pqxxconnection_p.h.orig	Sun Feb 11 16:52:10 2007
-+++ kexi/kexidb/drivers/pqxx/pqxxconnection_p.h	Sun Feb 11 16:54:21 2007
-@@ -31,7 +31,7 @@
- #define PQXXSQLCONNECTIONINTERNAL_H
- 
- #include <kexidb/connection_p.h>
--#include <pqxx/all.h>
-+#include <pqxx/pqxx>
- 
- namespace KexiDB
- {
diff --git a/editors/koffice-kde4/files/patch-kexi_kexidb_drivers_pqxx-pqxxcursor.cpp b/editors/koffice-kde4/files/patch-kexi_kexidb_drivers_pqxx-pqxxcursor.cpp
deleted file mode 100644
index 65ded10e000d..000000000000
--- a/editors/koffice-kde4/files/patch-kexi_kexidb_drivers_pqxx-pqxxcursor.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- kexi/kexidb/drivers/pqxx/pqxxcursor.cpp.orig	Sun Feb 11 16:45:47 2007
-+++ kexi/kexidb/drivers/pqxx/pqxxcursor.cpp	Sun Feb 11 16:50:26 2007
-@@ -155,7 +155,7 @@
- 			m_implicityStarted = true;
- 		}
- 
--		m_res = new pqxx::result(((pqxxSqlConnection*)connection())->m_trans->data->exec(m_sql.utf8()));
-+		m_res = new pqxx::result(((pqxxSqlConnection*)connection())->m_trans->data->exec(m_sql.utf8().data()));
- 		((pqxxSqlConnection*)connection())
- 			->drv_commitTransaction(((pqxxSqlConnection*)connection())->m_trans);
- //		my_conn->m_trans->commit();
diff --git a/editors/koffice-kde4/files/patch-kexi_kexidb_drivers_pqxx-pqxxdriver.cpp b/editors/koffice-kde4/files/patch-kexi_kexidb_drivers_pqxx-pqxxdriver.cpp
deleted file mode 100644
index bd06c9436ff7..000000000000
--- a/editors/koffice-kde4/files/patch-kexi_kexidb_drivers_pqxx-pqxxdriver.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
---- kexi/kexidb/drivers/pqxx/pqxxdriver.cpp.orig	Sun Feb 11 16:38:08 2007
-+++ kexi/kexidb/drivers/pqxx/pqxxdriver.cpp	Sun Feb 11 17:29:18 2007
-@@ -133,14 +133,14 @@
- //
- QString pqxxSqlDriver::escapeString( const QString& str) const
- {
--    return QString(pqxx::Quote(str.ascii()).c_str());
-+    return "'"+QString(pqxx::sqlesc(str.ascii()).c_str())+"'";
- }
- 
- //==================================================================================
- //
- QCString pqxxSqlDriver::escapeString( const QCString& str) const
- {
--    return QCString(pqxx::Quote(QString(str).ascii()).c_str());
-+    return "'"+QCString(pqxx::sqlesc(QString(str).ascii()).c_str())+"'";
- }
- 
- //==================================================================================
diff --git a/editors/koffice-kde4/files/patch-kexi_migration_pqxx-pqxxmigrate.h b/editors/koffice-kde4/files/patch-kexi_migration_pqxx-pqxxmigrate.h
deleted file mode 100644
index 8a7fc161aabe..000000000000
--- a/editors/koffice-kde4/files/patch-kexi_migration_pqxx-pqxxmigrate.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- kexi/migration/pqxx/pqxxmigrate.h.orig	Sun Feb 11 17:15:12 2007
-+++ kexi/migration/pqxx/pqxxmigrate.h	Sun Feb 11 17:15:38 2007
-@@ -26,7 +26,7 @@
- #include <kexidb/field.h>
- #include <kexidb/connection.h>
- 
--#include <pqxx/all.h>
-+#include <pqxx/pqxx>
- 
- namespace KexiMigration
- {
diff --git a/editors/koffice-kde4/pkg-plist b/editors/koffice-kde4/pkg-plist
index 43968f2c3adf..06bb37f70af4 100644
--- a/editors/koffice-kde4/pkg-plist
+++ b/editors/koffice-kde4/pkg-plist
@@ -141,6 +141,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
@@ -201,6 +202,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
@@ -226,6 +228,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
@@ -238,6 +241,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
@@ -270,6 +274,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
@@ -569,6 +574,9 @@ lib/kde3/kritascripting.so
 lib/kde3/kritaselectiontools.a
 lib/kde3/kritaselectiontools.la
 lib/kde3/kritaselectiontools.so
+lib/kde3/kritaselectopaque.a
+lib/kde3/kritaselectopaque.la
+lib/kde3/kritaselectopaque.so
 lib/kde3/kritaseparatechannels.a
 lib/kde3/kritaseparatechannels.la
 lib/kde3/kritaseparatechannels.so
@@ -1276,6 +1284,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
@@ -3926,6 +3935,7 @@ share/apps/kritaplugins/modify_selection.rc
 share/apps/kritaplugins/rotateimage.rc
 share/apps/kritaplugins/screenshot-krita.rc
 share/apps/kritaplugins/scripting.rc
+share/apps/kritaplugins/selectopaque.rc
 share/apps/kritaplugins/shearimage.rc
 share/apps/kritaplugins/substrate.rc
 share/apps/kritaplugins/wetplugin.rc
@@ -4382,6 +4392,7 @@ share/doc/HTML/en/koffice/TODO
 share/doc/HTML/en/koffice/common
 share/doc/HTML/en/koffice/index.cache.bz2
 share/doc/HTML/en/koffice/index.docbook
+share/doc/HTML/en/koffice/koffice.desktop
 share/doc/HTML/en/koshell/common
 share/doc/HTML/en/koshell/index.cache.bz2
 share/doc/HTML/en/koshell/index.docbook
@@ -5375,6 +5386,7 @@ share/services/kritaroundcornersfilter.desktop
 share/services/kritascreenshot.desktop
 share/services/kritascripting.desktop
 share/services/kritaselectiontools.desktop
+share/services/kritaselectopaque.desktop
 share/services/kritaseparatechannels.desktop
 share/services/kritashearimage.desktop
 share/services/kritasmalltilesfilter.desktop