Update to KDE 3.5.5 / KOffice 1.6.1

Approved by:	portmgr

4 files changed, 273 insertions, 65 deletions

diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index 6f27fc720383..9cb07045d1ed 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice
-PORTVERSION=	1.5.2
+PORTVERSION=	1.6.1
 PORTEPOCH=	2
 CATEGORIES=	editors kde
 MASTER_SITES=	${MASTER_SITE_KDE}
@@ -16,15 +16,16 @@ DIST_SUBDIR=	KDE/koffice
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Office Suite for KDE3
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libpqxx.a:${PORTSDIR}/databases/postgresql-libpqxx \
-		Magick-config:${PORTSDIR}/graphics/ImageMagick
-LIB_DEPENDS=	art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl \
+BUILD_DEPENDS=	${LOCALBASE}/lib/libpqxx.a:${PORTSDIR}/databases/postgresql-libpqxx
+LIB_DEPENDS=	GraphicsMagick++:${PORTSDIR}/graphics/GraphicsMagick \
+		art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl \
 		aspell:${PORTSDIR}/textproc/aspell \
 		exif.12:${PORTSDIR}/graphics/libexif \
 		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 		freetype:${PORTSDIR}/print/freetype2 \
 		lcms:${PORTSDIR}/graphics/lcms \
 		paper:${PORTSDIR}/print/libpaper \
+		poppler-qt:${PORTSDIR}/graphics/poppler-qt \
 		wpd-0.8:${PORTSDIR}/textproc/libwpd \
 		wv2:${PORTSDIR}/textproc/wv2 \
 		xml2:${PORTSDIR}/textproc/libxml2 \
@@ -46,7 +47,9 @@ USE_PGSQL=	yes
 .include <bsd.port.pre.mk>
 
 CONFIGURE_ARGS+=--with-pgsqlincdir=${LOCALBASE}/include \
-		--with-pgsqllibdir=${LOCALBASE}/lib
+		--with-pgsqllibdir=${LOCALBASE}/lib \
+		--with-pqxx-includes=${LOCALBASE}/include \
+		--with-pqxx-libraries=${LOCALBASE}/lib
 
 .if ${OSVERSION} < 500035
 EXTRA_PATCHES=	${PATCHDIR}/extrapatch-kexi-main-keximainwindowimpl.cpp
@@ -63,6 +66,14 @@ post-configure:
 		${WRKSRC}/kchart/kdchart/Makefile \
 		${WRKSRC}/kexi/kexidb/drivers/pqxx/Makefile \
 		${WRKSRC}/kexi/migration/pqxx/Makefile
+	${REINPLACE_CMD} -e 's|round(|rint(|g' \
+		${WRKSRC}/krita/plugins/filters/levelfilter/kgradientslider.cc
+	${REINPLACE_CMD} -e 's|-O[s23]||g' -e 's|-O|-O0|g' \
+		${WRKSRC}/krita/plugins/filters/cimg/Makefile
+	${REINPLACE_CMD} -e 's|xor|^|g' \
+		${WRKSRC}/kspread/kspread_style.cc
+	${REINPLACE_CMD} -e 's|trunc(|rint(|g' \
+		${WRKSRC}/kchart/kdchart/KDChartAxesPainter.cpp
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/editors/calligra/distinfo b/editors/calligra/distinfo
index 746a0be2c24d..04ee84201ab5 100644
--- a/editors/calligra/distinfo
+++ b/editors/calligra/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/koffice/koffice-1.5.2.tar.bz2) = cbe9deeb7c811a6bb5a954989b25c1f2
-SHA256 (KDE/koffice/koffice-1.5.2.tar.bz2) = d57d8a7611337f2678a7e28b100b9ab64148bf5483c01dbd204529f07b148611
-SIZE (KDE/koffice/koffice-1.5.2.tar.bz2) = 35878218
+MD5 (KDE/koffice/koffice-1.6.1.tar.bz2) = f7b90b46b79019edc60761a6bff2d387
+SHA256 (KDE/koffice/koffice-1.6.1.tar.bz2) = 5505a6c54009dd0cb75a3770c3daa476154958f92692ca0748b1842d9cd6e728
+SIZE (KDE/koffice/koffice-1.6.1.tar.bz2) = 56999028
diff --git a/editors/calligra/files/patch-kexi_kexidb-preparedstatement.cpp b/editors/calligra/files/patch-kexi_kexidb-preparedstatement.cpp
deleted file mode 100644
index 2f0cd77eaa23..000000000000
--- a/editors/calligra/files/patch-kexi_kexidb-preparedstatement.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- kexi/kexidb/preparedstatement.cpp.orig	Thu May 25 15:55:54 2006
-+++ kexi/kexidb/preparedstatement.cpp	Thu May 25 16:02:59 2006
-@@ -104,7 +104,7 @@
- 		}
- 		s.append(")");
- 		s.prepend(QCString("INSERT INTO ") + table->name().latin1()
--			+ (allTableFieldsUsed ? "" : (" (" + namesList + ")"))
-+			+ (allTableFieldsUsed ? QCString("") : (" (" + namesList + ")"))
- 			+ " VALUES (");
- 	}
- 	return s;
diff --git a/editors/calligra/pkg-plist b/editors/calligra/pkg-plist
index 00888ba57513..23edb3d4c816 100644
--- a/editors/calligra/pkg-plist
+++ b/editors/calligra/pkg-plist
@@ -19,19 +19,25 @@ bin/kudesigner
 bin/kugar
 bin/kword
 include/KDChartAxisParams.h
+include/KDChartAxisParamsWrapper.h
 include/KDChartCustomBox.h
+include/KDChartCustomBoxWrapper.h
 include/KDChartDataIntern.h
 include/KDChartDataRegion.h
 include/KDChartEnums.h
 include/KDChartGlobal.h
 include/KDChartListTable.h
+include/KDChartObjectFactory.h
 include/KDChartParams.h
+include/KDChartParamsWrapper.h
 include/KDChartPropertySet.h
 include/KDChartTable.h
 include/KDChartTableBase.h
+include/KDChartTableDataWrapper.h
 include/KDChartTextPiece.h
 include/KDChartVectorTable.h
 include/KDChartWidget.h
+include/KDChartWrapperFactory.h
 include/KDFrame.h
 include/KDFrameProfileSection.h
 include/KoApplication.h
@@ -126,12 +132,15 @@ include/kexidb/object.h
 include/kexidb/parser.h
 include/kexidb/preparedstatement.h
 include/kexidb/queryschema.h
+include/kexidb/queryschemaparameter.h
 include/kexidb/relationship.h
 include/kexidb/schemadata.h
 include/kexidb/tableschema.h
 include/kexidb/transaction.h
 include/kexiutils/identifier.h
 include/kexiutils/kexiutils_export.h
+include/kexiutils/longlongvalidator.h
+include/kexiutils/styleproxy.h
 include/kexiutils/tristate.h
 include/kexiutils/utils.h
 include/kexiutils/validator.h
@@ -146,7 +155,6 @@ 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
@@ -204,7 +212,6 @@ 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
@@ -217,7 +224,6 @@ 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
@@ -225,6 +231,7 @@ include/kis_paintop_registry.h
 include/kis_palette.h
 include/kis_palette_widget.h
 include/kis_pattern.h
+include/kis_perspective_math.h
 include/kis_point.h
 include/kis_previewdialog.h
 include/kis_previewwidget.h
@@ -233,8 +240,10 @@ include/kis_progress_display_interface.h
 include/kis_progress_subject.h
 include/kis_rect.h
 include/kis_resource.h
+include/kis_scale_visitor.h
 include/kis_selection.h
 include/kis_shared_ptr_vector.h
+include/kis_substrate.h
 include/kis_tileddatamanager.h
 include/kis_tool.h
 include/kis_tool_controller.h
@@ -259,7 +268,6 @@ include/kobirdeyepanel.h
 include/koffice_export.h
 include/kofficeversion.h
 include/kopalettemanager.h
-include/kross/api/argument.h
 include/kross/api/callable.h
 include/kross/api/class.h
 include/kross/api/dict.h
@@ -433,6 +441,15 @@ lib/kde3/krita_rgb_f32_plugin.so
 lib/kde3/krita_rgb_u16_plugin.a
 lib/kde3/krita_rgb_u16_plugin.la
 lib/kde3/krita_rgb_u16_plugin.so
+lib/kde3/krita_ycbcr_u16_plugin.a
+lib/kde3/krita_ycbcr_u16_plugin.la
+lib/kde3/krita_ycbcr_u16_plugin.so
+lib/kde3/krita_ycbcr_u8_plugin.a
+lib/kde3/krita_ycbcr_u8_plugin.la
+lib/kde3/krita_ycbcr_u8_plugin.so
+lib/kde3/kritablurfilter.a
+lib/kde3/kritablurfilter.la
+lib/kde3/kritablurfilter.so
 lib/kde3/kritabumpmap.a
 lib/kde3/kritabumpmap.la
 lib/kde3/kritabumpmap.so
@@ -469,6 +486,12 @@ lib/kde3/kritaembossfilter.so
 lib/kde3/kritaexample.a
 lib/kde3/kritaexample.la
 lib/kde3/kritaexample.so
+lib/kde3/kritaextensioncolorsfilters.a
+lib/kde3/kritaextensioncolorsfilters.la
+lib/kde3/kritaextensioncolorsfilters.so
+lib/kde3/kritafastcolortransfer.a
+lib/kde3/kritafastcolortransfer.la
+lib/kde3/kritafastcolortransfer.so
 lib/kde3/kritafiltersgallery.a
 lib/kde3/kritafiltersgallery.la
 lib/kde3/kritafiltersgallery.so
@@ -487,6 +510,18 @@ lib/kde3/kritaimageenhancement.so
 lib/kde3/kritaimagesize.a
 lib/kde3/kritaimagesize.la
 lib/kde3/kritaimagesize.so
+lib/kde3/kritalenscorrectionfilter.a
+lib/kde3/kritalenscorrectionfilter.la
+lib/kde3/kritalenscorrectionfilter.so
+lib/kde3/kritalevelfilter.a
+lib/kde3/kritalevelfilter.la
+lib/kde3/kritalevelfilter.so
+lib/kde3/kritamodifyselection.a
+lib/kde3/kritamodifyselection.la
+lib/kde3/kritamodifyselection.so
+lib/kde3/kritanoisefilter.a
+lib/kde3/kritanoisefilter.la
+lib/kde3/kritanoisefilter.so
 lib/kde3/kritaoilpaintfilter.a
 lib/kde3/kritaoilpaintfilter.la
 lib/kde3/kritaoilpaintfilter.so
@@ -496,6 +531,9 @@ lib/kde3/kritapixelizefilter.so
 lib/kde3/kritaraindropsfilter.a
 lib/kde3/kritaraindropsfilter.la
 lib/kde3/kritaraindropsfilter.so
+lib/kde3/kritarandompickfilter.a
+lib/kde3/kritarandompickfilter.la
+lib/kde3/kritarandompickfilter.so
 lib/kde3/kritargbplugin.a
 lib/kde3/kritargbplugin.la
 lib/kde3/kritargbplugin.so
@@ -523,18 +561,27 @@ lib/kde3/kritashearimage.so
 lib/kde3/kritasmalltilesfilter.a
 lib/kde3/kritasmalltilesfilter.la
 lib/kde3/kritasmalltilesfilter.so
-lib/kde3/kritasmearybrush.a
-lib/kde3/kritasmearybrush.la
-lib/kde3/kritasmearybrush.so
 lib/kde3/kritasobelfilter.a
 lib/kde3/kritasobelfilter.la
 lib/kde3/kritasobelfilter.so
+lib/kde3/kritasubstrate.a
+lib/kde3/kritasubstrate.la
+lib/kde3/kritasubstrate.so
 lib/kde3/kritatoolcrop.a
 lib/kde3/kritatoolcrop.la
 lib/kde3/kritatoolcrop.so
+lib/kde3/kritatoolcurves.a
+lib/kde3/kritatoolcurves.la
+lib/kde3/kritatoolcurves.so
 lib/kde3/kritatoolfilter.a
 lib/kde3/kritatoolfilter.la
 lib/kde3/kritatoolfilter.so
+lib/kde3/kritatoolperspectivegrid.a
+lib/kde3/kritatoolperspectivegrid.la
+lib/kde3/kritatoolperspectivegrid.so
+lib/kde3/kritatoolperspectivetransform.a
+lib/kde3/kritatoolperspectivetransform.la
+lib/kde3/kritatoolperspectivetransform.so
 lib/kde3/kritatoolpolygon.a
 lib/kde3/kritatoolpolygon.la
 lib/kde3/kritatoolpolygon.so
@@ -550,6 +597,12 @@ lib/kde3/kritatoolstar.so
 lib/kde3/kritatooltransform.a
 lib/kde3/kritatooltransform.la
 lib/kde3/kritatooltransform.so
+lib/kde3/kritaunsharpfilter.a
+lib/kde3/kritaunsharpfilter.la
+lib/kde3/kritaunsharpfilter.so
+lib/kde3/kritawavefilter.a
+lib/kde3/kritawavefilter.la
+lib/kde3/kritawavefilter.so
 lib/kde3/kritawetplugin.a
 lib/kde3/kritawetplugin.la
 lib/kde3/kritawetplugin.so
@@ -562,6 +615,9 @@ lib/kde3/krosskexidb.so
 lib/kde3/krosskritacore.a
 lib/kde3/krosskritacore.la
 lib/kde3/krosskritacore.so
+lib/kde3/krosskspreadcore.a
+lib/kde3/krosskspreadcore.la
+lib/kde3/krosskspreadcore.so
 lib/kde3/krosspython.a
 lib/kde3/krosspython.la
 lib/kde3/krosspython.so
@@ -571,6 +627,9 @@ lib/kde3/krossruby.so
 lib/kde3/kspread.a
 lib/kde3/kspread.la
 lib/kde3/kspread.so
+lib/kde3/kspreadscripting.a
+lib/kde3/kspreadscripting.la
+lib/kde3/kspreadscripting.so
 lib/kde3/kthesaurus.a
 lib/kde3/kthesaurus.la
 lib/kde3/kthesaurus.so
@@ -790,21 +849,24 @@ lib/kde3/libkrita_openexr_import.so
 lib/kde3/libkrita_raw_import.a
 lib/kde3/libkrita_raw_import.la
 lib/kde3/libkrita_raw_import.so
+lib/kde3/libkritagmagickexport.a
+lib/kde3/libkritagmagickexport.la
+lib/kde3/libkritagmagickexport.so
+lib/kde3/libkritagmagickimport.a
+lib/kde3/libkritagmagickimport.la
+lib/kde3/libkritagmagickimport.so
 lib/kde3/libkritajpegexport.a
 lib/kde3/libkritajpegexport.la
 lib/kde3/libkritajpegexport.so
 lib/kde3/libkritajpegimport.a
 lib/kde3/libkritajpegimport.la
 lib/kde3/libkritajpegimport.so
-lib/kde3/libkritamagickexport.a
-lib/kde3/libkritamagickexport.la
-lib/kde3/libkritamagickexport.so
-lib/kde3/libkritamagickimport.a
-lib/kde3/libkritamagickimport.la
-lib/kde3/libkritamagickimport.so
 lib/kde3/libkritapart.a
 lib/kde3/libkritapart.la
 lib/kde3/libkritapart.so
+lib/kde3/libkritapdfimport.a
+lib/kde3/libkritapdfimport.la
+lib/kde3/libkritapdfimport.so
 lib/kde3/libkritapngexport.a
 lib/kde3/libkritapngexport.la
 lib/kde3/libkritapngexport.so
@@ -823,6 +885,9 @@ lib/kde3/libkspreadhtmlexport.so
 lib/kde3/libkspreadinsertcalendar.a
 lib/kde3/libkspreadinsertcalendar.la
 lib/kde3/libkspreadinsertcalendar.so
+lib/kde3/libkspreadkexiimport.a
+lib/kde3/libkspreadkexiimport.la
+lib/kde3/libkspreadkexiimport.so
 lib/kde3/libkspreadlatexexport.a
 lib/kde3/libkspreadlatexexport.la
 lib/kde3/libkspreadlatexexport.so
@@ -856,6 +921,9 @@ lib/kde3/libmswriteexport.so
 lib/kde3/libmswriteimport.a
 lib/kde3/libmswriteimport.la
 lib/kde3/libmswriteimport.so
+lib/kde3/libolefilter.a
+lib/kde3/libolefilter.la
+lib/kde3/libolefilter.so
 lib/kde3/liboodrawimport.a
 lib/kde3/liboodrawimport.la
 lib/kde3/liboodrawimport.so
@@ -886,9 +954,6 @@ lib/kde3/libpalmdocimport.so
 lib/kde3/libpdfimport.a
 lib/kde3/libpdfimport.la
 lib/kde3/libpdfimport.so
-lib/kde3/libpowerpointimport.a
-lib/kde3/libpowerpointimport.la
-lib/kde3/libpowerpointimport.so
 lib/kde3/libqproimport.a
 lib/kde3/libqproimport.la
 lib/kde3/libqproimport.so
@@ -989,43 +1054,43 @@ lib/libkdeinit_kword.so
 lib/libkexicore.a
 lib/libkexicore.la
 lib/libkexicore.so
-lib/libkexicore.so.1
+lib/libkexicore.so.2
 lib/libkexidatatable.a
 lib/libkexidatatable.la
 lib/libkexidatatable.so
-lib/libkexidatatable.so.1
+lib/libkexidatatable.so.2
 lib/libkexidb.a
 lib/libkexidb.la
 lib/libkexidb.so
-lib/libkexidb.so.0
+lib/libkexidb.so.2
 lib/libkexidbparser.a
 lib/libkexidbparser.la
 lib/libkexidbparser.so
-lib/libkexidbparser.so.1
+lib/libkexidbparser.so.2
 lib/libkexiextendedwidgets.a
 lib/libkexiextendedwidgets.la
 lib/libkexiextendedwidgets.so
-lib/libkexiextendedwidgets.so.1
+lib/libkexiextendedwidgets.so.2
 lib/libkexiformutils.a
 lib/libkexiformutils.la
 lib/libkexiformutils.so
-lib/libkexiformutils.so.1
+lib/libkexiformutils.so.2
 lib/libkexiguiutils.a
 lib/libkexiguiutils.la
 lib/libkexiguiutils.so
-lib/libkexiguiutils.so.1
+lib/libkexiguiutils.so.2
 lib/libkeximain.a
 lib/libkeximain.la
 lib/libkeximain.so
-lib/libkeximain.so.1
+lib/libkeximain.so.2
 lib/libkeximigrate.a
 lib/libkeximigrate.la
 lib/libkeximigrate.so
-lib/libkeximigrate.so.1
+lib/libkeximigrate.so.2
 lib/libkexirelationsview.a
 lib/libkexirelationsview.la
 lib/libkexirelationsview.so
-lib/libkexirelationsview.so.1
+lib/libkexirelationsview.so.2
 lib/libkexisql2.a
 lib/libkexisql2.la
 lib/libkexisql2.so
@@ -1037,11 +1102,11 @@ lib/libkexisql3.so.3
 lib/libkexiutils.a
 lib/libkexiutils.la
 lib/libkexiutils.so
-lib/libkexiutils.so.1
+lib/libkexiutils.so.2
 lib/libkformdesigner.a
 lib/libkformdesigner.la
 lib/libkformdesigner.so
-lib/libkformdesigner.so.1
+lib/libkformdesigner.so.2
 lib/libkformulalib.a
 lib/libkformulalib.la
 lib/libkformulalib.so
@@ -1073,7 +1138,7 @@ lib/libkopalette.so.1
 lib/libkoproperty.a
 lib/libkoproperty.la
 lib/libkoproperty.so
-lib/libkoproperty.so.0
+lib/libkoproperty.so.2
 lib/libkotext.a
 lib/libkotext.la
 lib/libkotext.so
@@ -1114,6 +1179,14 @@ lib/libkrita_rgb_u16.a
 lib/libkrita_rgb_u16.la
 lib/libkrita_rgb_u16.so
 lib/libkrita_rgb_u16.so.0
+lib/libkrita_ycbcr_u16.a
+lib/libkrita_ycbcr_u16.la
+lib/libkrita_ycbcr_u16.so
+lib/libkrita_ycbcr_u16.so.0
+lib/libkrita_ycbcr_u8.a
+lib/libkrita_ycbcr_u8.la
+lib/libkrita_ycbcr_u8.so
+lib/libkrita_ycbcr_u8.so.0
 lib/libkritacolor.a
 lib/libkritacolor.la
 lib/libkritacolor.so
@@ -1183,6 +1256,13 @@ lib/libkwordprivate.so
 lib/libkwordprivate.so.4
 share/applications/kde/kivio.desktop
 share/applications/kde/krita.desktop
+share/applnk/.hidden/krita_jpeg.desktop
+share/applnk/.hidden/krita_magick.desktop
+share/applnk/.hidden/krita_openexr.desktop
+share/applnk/.hidden/krita_pdf.desktop
+share/applnk/.hidden/krita_png.desktop
+share/applnk/.hidden/krita_raw.desktop
+share/applnk/.hidden/krita_tiff.desktop
 share/applnk/Office/KThesaurus.desktop
 share/applnk/Office/karbon.desktop
 share/applnk/Office/kchart.desktop
@@ -1191,12 +1271,6 @@ share/applnk/Office/kformula.desktop
 share/applnk/Office/koshell.desktop
 share/applnk/Office/kplato.desktop
 share/applnk/Office/kpresenter.desktop
-share/applnk/Office/krita_jpeg.desktop
-share/applnk/Office/krita_magick.desktop
-share/applnk/Office/krita_openexr.desktop
-share/applnk/Office/krita_png.desktop
-share/applnk/Office/krita_raw.desktop
-share/applnk/Office/krita_tiff.desktop
 share/applnk/Office/kspread.desktop
 share/applnk/Office/kudesigner.desktop
 share/applnk/Office/kugar.desktop
@@ -1373,13 +1447,21 @@ share/apps/kchart/pics/chart_hilo_normal.png
 share/apps/kchart/pics/chart_hilo_openclose.png
 share/apps/kchart/pics/chart_legend_bottom.png
 share/apps/kchart/pics/chart_legend_bottomleft.png
+share/apps/kchart/pics/chart_legend_bottomleftbottom.png
+share/apps/kchart/pics/chart_legend_bottomleftleft.png
 share/apps/kchart/pics/chart_legend_bottomright.png
+share/apps/kchart/pics/chart_legend_bottomrightbottom.png
+share/apps/kchart/pics/chart_legend_bottomrightright.png
 share/apps/kchart/pics/chart_legend_left.png
 share/apps/kchart/pics/chart_legend_nolegend.png
 share/apps/kchart/pics/chart_legend_right.png
 share/apps/kchart/pics/chart_legend_top.png
 share/apps/kchart/pics/chart_legend_topleft.png
+share/apps/kchart/pics/chart_legend_topleftleft.png
+share/apps/kchart/pics/chart_legend_toplefttop.png
 share/apps/kchart/pics/chart_legend_topright.png
+share/apps/kchart/pics/chart_legend_toprightright.png
+share/apps/kchart/pics/chart_legend_toprighttop.png
 share/apps/kchart/pics/chart_line_normal.png
 share/apps/kchart/pics/chart_line_percent.png
 share/apps/kchart/pics/chart_line_stacked.png
@@ -1401,6 +1483,7 @@ share/apps/kexi/icons/crystalsvg/16x16/actions/business_user.png
 share/apps/kexi/icons/crystalsvg/16x16/actions/button.png
 share/apps/kexi/icons/crystalsvg/16x16/actions/check.png
 share/apps/kexi/icons/crystalsvg/16x16/actions/clear_table_contents.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/combo.png
 share/apps/kexi/icons/crystalsvg/16x16/actions/database.png
 share/apps/kexi/icons/crystalsvg/16x16/actions/database_import.png
 share/apps/kexi/icons/crystalsvg/16x16/actions/delete_table_row.png
@@ -1414,6 +1497,8 @@ share/apps/kexi/icons/crystalsvg/16x16/actions/line.png
 share/apps/kexi/icons/crystalsvg/16x16/actions/line_horizontal.png
 share/apps/kexi/icons/crystalsvg/16x16/actions/line_vertical.png
 share/apps/kexi/icons/crystalsvg/16x16/actions/lineedit.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/macro.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/macro_newobj.png
 share/apps/kexi/icons/crystalsvg/16x16/actions/mouse_pointer.png
 share/apps/kexi/icons/crystalsvg/16x16/actions/multiple_obj.png
 share/apps/kexi/icons/crystalsvg/16x16/actions/navigator_first.png
@@ -1484,6 +1569,8 @@ share/apps/kexi/icons/crystalsvg/22x22/actions/lineedit.png
 share/apps/kexi/icons/crystalsvg/22x22/actions/listbox.png
 share/apps/kexi/icons/crystalsvg/22x22/actions/listview.png
 share/apps/kexi/icons/crystalsvg/22x22/actions/lower.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/macro.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/macro_newobj.png
 share/apps/kexi/icons/crystalsvg/22x22/actions/mouse_pointer.png
 share/apps/kexi/icons/crystalsvg/22x22/actions/multiple_obj.png
 share/apps/kexi/icons/crystalsvg/22x22/actions/new_sign.png
@@ -1522,6 +1609,8 @@ share/apps/kexi/icons/crystalsvg/32x32/actions/form_action.png
 share/apps/kexi/icons/crystalsvg/32x32/actions/grid.png
 share/apps/kexi/icons/crystalsvg/32x32/actions/insert_table_row.png
 share/apps/kexi/icons/crystalsvg/32x32/actions/key.png
+share/apps/kexi/icons/crystalsvg/32x32/actions/macro.png
+share/apps/kexi/icons/crystalsvg/32x32/actions/macro_newobj.png
 share/apps/kexi/icons/crystalsvg/32x32/actions/new_sign.png
 share/apps/kexi/icons/crystalsvg/32x32/actions/pixmaplabel.png
 share/apps/kexi/icons/crystalsvg/32x32/actions/query.png
@@ -1563,15 +1652,13 @@ share/apps/kexi/scripts/importxhtml/ImportXHTML.rc
 share/apps/kexi/scripts/projectdocumentor/ProjectDocumentor.py
 share/apps/kexi/scripts/projectdocumentor/ProjectDocumentor.rc
 share/apps/kformula/dtd/kformula.dtd
-share/apps/kformula/fonts/cmbx10.ttf
+share/apps/kformula/fonts/Arev.ttf
+share/apps/kformula/fonts/ArevBI.ttf
+share/apps/kformula/fonts/ArevBd.ttf
+share/apps/kformula/fonts/ArevIt.ttf
 share/apps/kformula/fonts/cmex10.ttf
-share/apps/kformula/fonts/cmmi10.ttf
-share/apps/kformula/fonts/cmr10.ttf
-share/apps/kformula/fonts/cmsy10.ttf
 share/apps/kformula/fonts/fonts.dir
 share/apps/kformula/fonts/fonts.scale
-share/apps/kformula/fonts/msam10.ttf
-share/apps/kformula/fonts/msbm10.ttf
 share/apps/kformula/kformula.rc
 share/apps/kformula/kformula_readonly.rc
 share/apps/kformula/tips
@@ -3684,11 +3771,19 @@ share/apps/krita/pics/polyline.png
 share/apps/krita/pics/raiselayer.png
 share/apps/krita/pics/rotate_cursor.xpm
 share/apps/krita/pics/tablet.png
+share/apps/krita/pics/tool_bezier_cursor.png
+share/apps/krita/pics/tool_bezier_paint.png
+share/apps/krita/pics/tool_bezier_select.png
 share/apps/krita/pics/tool_brush_selection.png
 share/apps/krita/pics/tool_brush_selection_cursor.png
+share/apps/krita/pics/tool_color_fill.png
+share/apps/krita/pics/tool_colorpicker.png
 share/apps/krita/pics/tool_contiguous_selection.png
 share/apps/krita/pics/tool_contiguous_selection_cursor.png
+share/apps/krita/pics/tool_crop.png
 share/apps/krita/pics/tool_crop_cursor.png
+share/apps/krita/pics/tool_curve_dragging.png
+share/apps/krita/pics/tool_duplicate.png
 share/apps/krita/pics/tool_duplicate_cursor.png
 share/apps/krita/pics/tool_ellipse.png
 share/apps/krita/pics/tool_ellipse_cursor.png
@@ -3696,6 +3791,8 @@ share/apps/krita/pics/tool_elliptical_selection.png
 share/apps/krita/pics/tool_elliptical_selection_cursor.png
 share/apps/krita/pics/tool_eraser_selection.png
 share/apps/krita/pics/tool_eraser_selection_cursor.png
+share/apps/krita/pics/tool_example.png
+share/apps/krita/pics/tool_example_cursor.png
 share/apps/krita/pics/tool_fill_cursor.png
 share/apps/krita/pics/tool_filter.png
 share/apps/krita/pics/tool_filter_cursor.png
@@ -3705,9 +3802,15 @@ share/apps/krita/pics/tool_gradient.png
 share/apps/krita/pics/tool_gradient_cursor.png
 share/apps/krita/pics/tool_line.png
 share/apps/krita/pics/tool_line_cursor.png
+share/apps/krita/pics/tool_moutline.png
+share/apps/krita/pics/tool_moutline_cursor.png
+share/apps/krita/pics/tool_moutline_editing.png
+share/apps/krita/pics/tool_move.png
 share/apps/krita/pics/tool_outline_selection.png
 share/apps/krita/pics/tool_outline_selection_cursor.png
 share/apps/krita/pics/tool_pan.png
+share/apps/krita/pics/tool_perspectivegrid.png
+share/apps/krita/pics/tool_perspectivetransform.png
 share/apps/krita/pics/tool_polygon.png
 share/apps/krita/pics/tool_polygon_cursor.png
 share/apps/krita/pics/tool_polygonal_selection.png
@@ -3725,6 +3828,8 @@ share/apps/krita/pics/tool_star.png
 share/apps/krita/pics/tool_star_cursor.png
 share/apps/krita/pics/tool_text.png
 share/apps/krita/pics/tool_text_cursor.png
+share/apps/krita/pics/tool_transform.png
+share/apps/krita/pics/tool_zoom.png
 share/apps/krita/pics/tool_zoom_minus_cursor.png
 share/apps/krita/pics/tool_zoom_plus_cursor.png
 share/apps/krita/pics/unlinked.png
@@ -3740,6 +3845,7 @@ share/apps/krita/profiles/PAL.icm
 share/apps/krita/profiles/SMPTE-C.icm
 share/apps/krita/profiles/WideGamut.icm
 share/apps/krita/profiles/cmyk.icm
+share/apps/krita/profiles/fogra27l.icm
 share/apps/krita/profiles/lcmslabi.icm
 share/apps/krita/profiles/lcmsxyzi.icm
 share/apps/krita/profiles/monoscnr.icm
@@ -3796,10 +3902,12 @@ share/apps/kritaplugins/imageseparate.rc
 share/apps/kritaplugins/imagesize.rc
 share/apps/kritaplugins/kritafiltersgallery.rc
 share/apps/kritaplugins/kritahistogramdocker.rc
+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/shearimage.rc
+share/apps/kritaplugins/substrate.rc
 share/apps/kritaplugins/wetplugin.rc
 share/apps/kross/python/RestrictedPython/Eval.py
 share/apps/kross/python/RestrictedPython/Guards.py
@@ -3947,8 +4055,13 @@ share/apps/kspread/icons/crystalsvg/scalable/actions/template_studentidcard.svgz
 share/apps/kspread/icons/crystalsvg/scalable/actions/template_vacationchecklist.svgz
 share/apps/kspread/icons/crystalsvg/scalable/actions/template_worksheet.svgz
 share/apps/kspread/kpartplugins/insertcalendar.rc
+share/apps/kspread/kpartplugins/scripting.rc
 share/apps/kspread/kspread.rc
 share/apps/kspread/kspread_readonly.rc
+share/apps/kspread/scripts/exporthtml/ExportHtml.py
+share/apps/kspread/scripts/exporthtml/ExportHtml.rc
+share/apps/kspread/scripts/scripteditor/ScriptEditor.py
+share/apps/kspread/scripts/scripteditor/ScriptEditor.rc
 share/apps/kspread/sheetstyles/standard1.ksts
 share/apps/kspread/sheetstyles/standard1.png
 share/apps/kspread/sheetstyles/standard1.xml
@@ -4190,14 +4303,19 @@ share/doc/HTML/en/kchart/toolbars.png
 share/doc/HTML/en/kexi/basics.docbook
 share/doc/HTML/en/kexi/building.docbook
 share/doc/HTML/en/kexi/common
+share/doc/HTML/en/kexi/comparing.docbook
 share/doc/HTML/en/kexi/configuration.docbook
 share/doc/HTML/en/kexi/contact-example.png
 share/doc/HTML/en/kexi/credits.docbook
 share/doc/HTML/en/kexi/database.docbook
+share/doc/HTML/en/kexi/designingforms.docbook
+share/doc/HTML/en/kexi/enteringdataintotables.docbook
+share/doc/HTML/en/kexi/enteringdatausingforms.docbook
 share/doc/HTML/en/kexi/index.cache.bz2
 share/doc/HTML/en/kexi/index.docbook
 share/doc/HTML/en/kexi/intro.docbook
 share/doc/HTML/en/kexi/menus.docbook
+share/doc/HTML/en/kexi/querydesigning.docbook
 share/doc/HTML/en/kformula/ambiguous-string.png
 share/doc/HTML/en/kformula/common
 share/doc/HTML/en/kformula/correct_index_location.png
@@ -4374,6 +4492,7 @@ share/doc/HTML/en/kpresenter/tut25.png
 share/doc/HTML/en/kpresenter/tut26.png
 share/doc/HTML/en/kpresenter/tutorial.docbook
 share/doc/HTML/en/kpresenter/zoomfactor.png
+share/doc/HTML/en/krita/README.SCREENSHOTS
 share/doc/HTML/en/krita/commands-dialogs.docbook
 share/doc/HTML/en/krita/commands-menus.docbook
 share/doc/HTML/en/krita/commands-palettes.docbook
@@ -4382,7 +4501,15 @@ share/doc/HTML/en/krita/commands.docbook
 share/doc/HTML/en/krita/common
 share/doc/HTML/en/krita/createdocument.png
 share/doc/HTML/en/krita/credits.docbook
+share/doc/HTML/en/krita/crocusses-autocontrast.png
+share/doc/HTML/en/krita/crocusses-blur.png
+share/doc/HTML/en/krita/crocusses-brightnesscontrast.png
 share/doc/HTML/en/krita/crocusses-bumpmap.png
+share/doc/HTML/en/krita/crocusses-coloradjustment.png
+share/doc/HTML/en/krita/crocusses-colortoalpha.png
+share/doc/HTML/en/krita/crocusses-colortransfer.png
+share/doc/HTML/en/krita/crocusses-customconvolution.png
+share/doc/HTML/en/krita/crocusses-desaturate.png
 share/doc/HTML/en/krita/crocusses-edgebottom.png
 share/doc/HTML/en/krita/crocusses-edgeleft.png
 share/doc/HTML/en/krita/crocusses-edgeright.png
@@ -4390,24 +4517,37 @@ share/doc/HTML/en/krita/crocusses-embossall.png
 share/doc/HTML/en/krita/crocusses-embosshorvert.png
 share/doc/HTML/en/krita/crocusses-embossvariable.png
 share/doc/HTML/en/krita/crocusses-gaussianblur.png
+share/doc/HTML/en/krita/crocusses-gaussiannoise.png
 share/doc/HTML/en/krita/crocusses-invert.png
+share/doc/HTML/en/krita/crocusses-lenscorrection.png
+share/doc/HTML/en/krita/crocusses-maximizechannel.png
 share/doc/HTML/en/krita/crocusses-meanremoval.png
+share/doc/HTML/en/krita/crocusses-minimizechannel.png
 share/doc/HTML/en/krita/crocusses-oilpaint.png
 share/doc/HTML/en/krita/crocusses-pixelize.png
 share/doc/HTML/en/krita/crocusses-raindrops.png
+share/doc/HTML/en/krita/crocusses-randomnoise.png
+share/doc/HTML/en/krita/crocusses-randompick.png
 share/doc/HTML/en/krita/crocusses-roundcorners.png
 share/doc/HTML/en/krita/crocusses-sharpen.png
-share/doc/HTML/en/krita/crocusses-simplenoise.png
+share/doc/HTML/en/krita/crocusses-smalltiles.png
 share/doc/HTML/en/krita/crocusses-sobel.png
-share/doc/HTML/en/krita/crocusses-tiles.png
 share/doc/HTML/en/krita/crocusses-topedge.png
+share/doc/HTML/en/krita/crocusses-unsharpmask.png
+share/doc/HTML/en/krita/crocusses-wave.png
+share/doc/HTML/en/krita/crocusses-waveletnoise.png
 share/doc/HTML/en/krita/crocusses.png
+share/doc/HTML/en/krita/developers-plugins.docbook
+share/doc/HTML/en/krita/developers-scripting.docbook
 share/doc/HTML/en/krita/developers.docbook
 share/doc/HTML/en/krita/dialogs-addpalette.png
+share/doc/HTML/en/krita/dialogs-blur.png
 share/doc/HTML/en/krita/dialogs-brightnesscontrast.png
 share/doc/HTML/en/krita/dialogs-bumpmap.png
 share/doc/HTML/en/krita/dialogs-coloradjustment.png
 share/doc/HTML/en/krita/dialogs-colorrange.png
+share/doc/HTML/en/krita/dialogs-colortoalpha.png
+share/doc/HTML/en/krita/dialogs-colortransfer.png
 share/doc/HTML/en/krita/dialogs-convertimagetype.png
 share/doc/HTML/en/krita/dialogs-convertlayertype.png
 share/doc/HTML/en/krita/dialogs-cubism.png
@@ -4416,17 +4556,21 @@ share/doc/HTML/en/krita/dialogs-documentinformation.png
 share/doc/HTML/en/krita/dialogs-dropshadow.png
 share/doc/HTML/en/krita/dialogs-emboss.png
 share/doc/HTML/en/krita/dialogs-filtersgallery.png
+share/doc/HTML/en/krita/dialogs-gaussiannoise.png
 share/doc/HTML/en/krita/dialogs-histogram.png
 share/doc/HTML/en/krita/dialogs-imageproperties.png
 share/doc/HTML/en/krita/dialogs-imagerestoration.png
 share/doc/HTML/en/krita/dialogs-imagesize.png
 share/doc/HTML/en/krita/dialogs-layerproperties.png
 share/doc/HTML/en/krita/dialogs-layersize.png
+share/doc/HTML/en/krita/dialogs-lenscorrection.png
 share/doc/HTML/en/krita/dialogs-newadjustmentlayer.png
 share/doc/HTML/en/krita/dialogs-newlayer.png
 share/doc/HTML/en/krita/dialogs-oilpaint.png
 share/doc/HTML/en/krita/dialogs-pixelize.png
 share/doc/HTML/en/krita/dialogs-raindrops.png
+share/doc/HTML/en/krita/dialogs-randomnoise.png
+share/doc/HTML/en/krita/dialogs-randompick.png
 share/doc/HTML/en/krita/dialogs-rotateimage.png
 share/doc/HTML/en/krita/dialogs-rotatelayer.png
 share/doc/HTML/en/krita/dialogs-roundcorners.png
@@ -4435,31 +4579,56 @@ share/doc/HTML/en/krita/dialogs-shearimage.png
 share/doc/HTML/en/krita/dialogs-shearlayer.png
 share/doc/HTML/en/krita/dialogs-smalltiles.png
 share/doc/HTML/en/krita/dialogs-sobel.png
+share/doc/HTML/en/krita/dialogs-substrate.png
+share/doc/HTML/en/krita/dialogs-unsharpmask.png
+share/doc/HTML/en/krita/dialogs-wave.png
+share/doc/HTML/en/krita/dialogs-waveletnoise.png
 share/doc/HTML/en/krita/faq.docbook
 share/doc/HTML/en/krita/index.cache.bz2
 share/doc/HTML/en/krita/index.docbook
 share/doc/HTML/en/krita/installation.docbook
 share/doc/HTML/en/krita/introduction.docbook
 share/doc/HTML/en/krita/mainscreen.png
+share/doc/HTML/en/krita/mountains-burn.png
+share/doc/HTML/en/krita/mountains-color.png
+share/doc/HTML/en/krita/mountains-darken.png
+share/doc/HTML/en/krita/mountains-divide.png
+share/doc/HTML/en/krita/mountains-dodge.png
+share/doc/HTML/en/krita/mountains-hue.png
+share/doc/HTML/en/krita/mountains-lighten.png
+share/doc/HTML/en/krita/mountains-multiply.png
+share/doc/HTML/en/krita/mountains-normal.png
+share/doc/HTML/en/krita/mountains-original.png
+share/doc/HTML/en/krita/mountains-overlay.png
+share/doc/HTML/en/krita/mountains-saturation.png
+share/doc/HTML/en/krita/mountains-screen.png
+share/doc/HTML/en/krita/mountains-value.png
+share/doc/HTML/en/krita/mountains.png
 share/doc/HTML/en/krita/newimage.png
 share/doc/HTML/en/krita/palettes-colors-gray.png
 share/doc/HTML/en/krita/palettes-colors-hsv.png
 share/doc/HTML/en/krita/palettes-colors-palettes.png
 share/doc/HTML/en/krita/palettes-colors-rgb.png
 share/doc/HTML/en/krita/palettes-colors-watercolors.png
+share/doc/HTML/en/krita/palettes-controlbox-bezier.png
 share/doc/HTML/en/krita/palettes-controlbox-brush.png
 share/doc/HTML/en/krita/palettes-controlbox-colorpicker.png
 share/doc/HTML/en/krita/palettes-controlbox-contiguousfill.png
 share/doc/HTML/en/krita/palettes-controlbox-crop.png
+share/doc/HTML/en/krita/palettes-controlbox-duplicate.png
+share/doc/HTML/en/krita/palettes-controlbox-ellipse.png
+share/doc/HTML/en/krita/palettes-controlbox-fill.png
 share/doc/HTML/en/krita/palettes-controlbox-gradient.png
 share/doc/HTML/en/krita/palettes-controlbox-histogram.png
 share/doc/HTML/en/krita/palettes-controlbox-line.png
 share/doc/HTML/en/krita/palettes-controlbox-overview.png
 share/doc/HTML/en/krita/palettes-controlbox-paintwithfilters.png
 share/doc/HTML/en/krita/palettes-controlbox-polygon.png
+share/doc/HTML/en/krita/palettes-controlbox-polyline.png
 share/doc/HTML/en/krita/palettes-controlbox-rectangle.png
 share/doc/HTML/en/krita/palettes-controlbox-select.png
 share/doc/HTML/en/krita/palettes-controlbox-selectcontiguous.png
+share/doc/HTML/en/krita/palettes-controlbox-selectmagnetic.png
 share/doc/HTML/en/krita/palettes-controlbox-selectsimilar.png
 share/doc/HTML/en/krita/palettes-controlbox-star.png
 share/doc/HTML/en/krita/palettes-controlbox-text.png
@@ -4473,8 +4642,11 @@ share/doc/HTML/en/krita/preferences-grid.png
 share/doc/HTML/en/krita/preferences-performance.png
 share/doc/HTML/en/krita/preferences-sidebar.png
 share/doc/HTML/en/krita/preferences-tablet.png
-share/doc/HTML/en/krita/scripting.docbook
 share/doc/HTML/en/krita/settings.docbook
+share/doc/HTML/en/krita/tool-bezier-example.png
+share/doc/HTML/en/krita/tool-bezier-example2.png
+share/doc/HTML/en/krita/tool-bezier-example3.png
+share/doc/HTML/en/krita/tool-bezier.png
 share/doc/HTML/en/krita/tool-brush.png
 share/doc/HTML/en/krita/tool-colorpicker.png
 share/doc/HTML/en/krita/tool-contiguousfill.png
@@ -4486,13 +4658,18 @@ share/doc/HTML/en/krita/tool-gradient.png
 share/doc/HTML/en/krita/tool-line.png
 share/doc/HTML/en/krita/tool-move.png
 share/doc/HTML/en/krita/tool-paintselection.png
+share/doc/HTML/en/krita/tool-paintwithfilters-example.png
 share/doc/HTML/en/krita/tool-paintwithfilters.png
 share/doc/HTML/en/krita/tool-pan.png
+share/doc/HTML/en/krita/tool-perspectivegrid.png
+share/doc/HTML/en/krita/tool-perspectivetransform.png
 share/doc/HTML/en/krita/tool-polygon.png
 share/doc/HTML/en/krita/tool-polyline.png
 share/doc/HTML/en/krita/tool-rectangle.png
+share/doc/HTML/en/krita/tool-selectbezier.png
 share/doc/HTML/en/krita/tool-selectcontiguous.png
 share/doc/HTML/en/krita/tool-selectelliptical.png
+share/doc/HTML/en/krita/tool-selectmagnetic.png
 share/doc/HTML/en/krita/tool-selectoutline.png
 share/doc/HTML/en/krita/tool-selectpolygonal.png
 share/doc/HTML/en/krita/tool-selectrectangular.png
@@ -4513,6 +4690,8 @@ share/doc/HTML/en/krita/toolbar-file.png
 share/doc/HTML/en/krita/toolbar-krita.png
 share/doc/HTML/en/krita/toolbar-navigation.png
 share/doc/HTML/en/krita/toolbar-transformationtools.png
+share/doc/HTML/en/krita/toolbars-button-zoomin.png
+share/doc/HTML/en/krita/toolbars-button-zoomout.png
 share/doc/HTML/en/krita/tutorial-quick-starts.docbook
 share/doc/HTML/en/krita/tutorial-quick-starts1.png
 share/doc/HTML/en/krita/tutorial-quick-starts10.png
@@ -4542,9 +4721,14 @@ share/doc/HTML/en/krita/tutorial-select-layer-9.png
 share/doc/HTML/en/krita/tutorial-select-layer-sample.png
 share/doc/HTML/en/krita/tutorial-select-layer.docbook
 share/doc/HTML/en/krita/tutorial-starting.docbook
+share/doc/HTML/en/krita/tutorial-tablet-1.png
+share/doc/HTML/en/krita/tutorial-tablet-2.png
+share/doc/HTML/en/krita/tutorial-tablet-3.png
+share/doc/HTML/en/krita/tutorial-tablet.docbook
 share/doc/HTML/en/krita/tutorial.docbook
 share/doc/HTML/en/krita/using-colorspaces.docbook
 share/doc/HTML/en/krita/using-filters.docbook
+share/doc/HTML/en/krita/using-images.docbook
 share/doc/HTML/en/krita/using-layers.docbook
 share/doc/HTML/en/krita/using-selections-1.png
 share/doc/HTML/en/krita/using-selections-2.png
@@ -4553,6 +4737,7 @@ share/doc/HTML/en/krita/using-selections-4.png
 share/doc/HTML/en/krita/using-selections-5.png
 share/doc/HTML/en/krita/using-selections-6.png
 share/doc/HTML/en/krita/using-selections.docbook
+share/doc/HTML/en/krita/using-views.docbook
 share/doc/HTML/en/kspread/a11y.docbook
 share/doc/HTML/en/kspread/advanced.docbook
 share/doc/HTML/en/kspread/basics.docbook
@@ -4748,6 +4933,7 @@ share/doc/HTML/en/kword/formframe2.png
 share/doc/HTML/en/kword/formframe3.png
 share/doc/HTML/en/kword/formframe4.png
 share/doc/HTML/en/kword/formframe5.png
+share/doc/HTML/en/kword/formframe6.png
 share/doc/HTML/en/kword/forminteg.png
 share/doc/HTML/en/kword/formllind.png
 share/doc/HTML/en/kword/formlrind.png
@@ -4831,6 +5017,7 @@ share/doc/HTML/en/kword/opt2.png
 share/doc/HTML/en/kword/opt3.png
 share/doc/HTML/en/kword/opt4.png
 share/doc/HTML/en/kword/opt5.png
+share/doc/HTML/en/kword/opt6.png
 share/doc/HTML/en/kword/optkb.png
 share/doc/HTML/en/kword/optkb2.png
 share/doc/HTML/en/kword/opttb.png
@@ -5104,7 +5291,6 @@ share/services/kpresenter_mng_export.desktop
 share/services/kpresenter_ooimpress_export.desktop
 share/services/kpresenter_ooimpress_import.desktop
 share/services/kpresenter_png_export.desktop
-share/services/kpresenter_powerpoint_import.desktop
 share/services/kpresenter_svg_export.desktop
 share/services/kpresenter_xbm_export.desktop
 share/services/kpresenter_xpm_export.desktop
@@ -5119,6 +5305,7 @@ share/services/krita_magick_export.desktop
 share/services/krita_magick_import.desktop
 share/services/krita_openexr_export.desktop
 share/services/krita_openexr_import.desktop
+share/services/krita_pdf_import.desktop
 share/services/krita_png_export.desktop
 share/services/krita_png_import.desktop
 share/services/krita_raw_import.desktop
@@ -5127,6 +5314,9 @@ share/services/krita_rgb_f32_plugin.desktop
 share/services/krita_rgb_u16_plugin.desktop
 share/services/krita_tiff_export.desktop
 share/services/krita_tiff_import.desktop
+share/services/krita_ycbcr_u16_plugin.desktop
+share/services/krita_ycbcr_u8_plugin.desktop
+share/services/kritablurfilter.desktop
 share/services/kritabumpmapfilter.desktop
 share/services/kritacimg.desktop
 share/services/kritacmykplugin.desktop
@@ -5139,16 +5329,23 @@ share/services/kritadefaulttools.desktop
 share/services/kritadropshadow.desktop
 share/services/kritaembossfilter.desktop
 share/services/kritaexample.desktop
+share/services/kritaextensioncolorsfilters.desktop
+share/services/kritafastcolortransfer.desktop
 share/services/kritafiltersgallery.desktop
 share/services/kritagrayplugin.desktop
 share/services/kritahistogram.desktop
 share/services/kritahistogramdocker.desktop
 share/services/kritaimageenhancement.desktop
 share/services/kritaimagesize.desktop
+share/services/kritalenscorrectionfilter.desktop
+share/services/kritalevelfilter.desktop
+share/services/kritamodifyselection.desktop
+share/services/kritanoisefilter.desktop
 share/services/kritaoilpaintfilter.desktop
 share/services/kritapart.desktop
 share/services/kritapixelizefilter.desktop
 share/services/kritaraindropsfilter.desktop
+share/services/kritarandompickfilter.desktop
 share/services/kritargbplugin.desktop
 share/services/kritarotateimage.desktop
 share/services/kritaroundcornersfilter.desktop
@@ -5158,15 +5355,20 @@ share/services/kritaselectiontools.desktop
 share/services/kritaseparatechannels.desktop
 share/services/kritashearimage.desktop
 share/services/kritasmalltilesfilter.desktop
-share/services/kritasmearybrush.desktop
 share/services/kritasobelfilter.desktop
+share/services/kritasubstrate.desktop
 share/services/kritatoolcrop.desktop
+share/services/kritatoolcurves.desktop
 share/services/kritatoolfilter.desktop
+share/services/kritatoolperspectivegrid.desktop
+share/services/kritatoolperspectivetransform.desktop
 share/services/kritatoolpolygon.desktop
 share/services/kritatoolpolyline.desktop
 share/services/kritatoolselectsimilar.desktop
 share/services/kritatoolstar.desktop
 share/services/kritatooltransform.desktop
+share/services/kritaunsharpfilter.desktop
+share/services/kritawavefilter.desktop
 share/services/kritawetplugin.desktop
 share/services/kspread_applixspread_import.desktop
 share/services/kspread_csv_export.desktop
@@ -5176,11 +5378,13 @@ share/services/kspread_excel_import.desktop
 share/services/kspread_gnumeric_export.desktop
 share/services/kspread_gnumeric_import.desktop
 share/services/kspread_html_export.desktop
+share/services/kspread_kexi_import.desktop
 share/services/kspread_latex_export.desktop
 share/services/kspread_opencalc_export.desktop
 share/services/kspread_opencalc_import.desktop
 share/services/kspread_qpro_import.desktop
 share/services/kspreadpart.desktop
+share/services/kspreadscripting.desktop
 share/services/kugar_kugar_import.desktop
 share/services/kugarpart.desktop
 share/services/kwmailmerge_kabc.desktop
@@ -5215,6 +5419,7 @@ share/services/kword_wp_import.desktop
 share/services/kwordpart.desktop
 share/services/kwserialletter_classic.desktop
 share/services/kwserialletter_qtsqldb_power.desktop
+share/services/ole_powerpoint97_import.desktop
 share/services/thesaurustool.desktop
 share/services/xslt_export.desktop
 share/services/xslt_import.desktop
@@ -5384,6 +5589,9 @@ share/templates/TextDocument.desktop
 @dirrm share/apps/kspread/templates/Business
 @dirrm share/apps/kspread/templates
 @dirrm share/apps/kspread/sheetstyles
+@dirrm share/apps/kspread/scripts/scripteditor
+@dirrm share/apps/kspread/scripts/exporthtml
+@dirrm share/apps/kspread/scripts
 @dirrm share/apps/kspread/kpartplugins
 @dirrm share/apps/kspread/icons/crystalsvg/scalable/actions
 @dirrm share/apps/kspread/icons/crystalsvg/scalable