Update editors/calligra 2.9.4

classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

Update editors/calligra 2.9.4

Rafael Sadowski
Hi ports@

blow is an maintainer update to Calligra 2.9.4. Tested @amd64

Infos: https://www.calligra.org/news/calligra-2-9-4-released/

Cheers,

Rafael



Index: Makefile
===================================================================
RCS file: /cvs/ports/editors/calligra/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- Makefile 27 Mar 2015 08:11:26 -0000 1.7
+++ Makefile 7 May 2015 18:52:54 -0000
@@ -1,10 +1,9 @@
 # $OpenBSD: Makefile,v 1.7 2015/03/27 08:11:26 ajacoutot Exp $
 
 COMMENT = K Desktop Environment, office suite
-HOMEPAGE = http://www.calligra-suite.org/
-DISTNAME = calligra-2.8.7
+HOMEPAGE = https://www.calligra-suite.org/
+DISTNAME = calligra-2.9.4
 CATEGORIES = editors
-REVISION = 0
 
 DIST_SUBDIR = kde
 MASTER_SITES = ${MASTER_SITE_KDE:=stable/${DISTNAME}/}
@@ -71,13 +70,17 @@ SHARED_LIBS +=  planprivate            
 SHARED_LIBS +=  planworkapp               50.0 # 0.0
 SHARED_LIBS +=  planworkfactory           50.0 # 0.0
 SHARED_LIBS +=  rcps_plan                 50.0 # 0.0
-SHARED_LIBS +=  wordsprivate              50.0 # 0.0
 SHARED_LIBS +=  kformula                  50.0 # 13.0
 SHARED_LIBS +=  komsooxml                 50.0 # 13.0
 SHARED_LIBS +=  koodf2                    50.0 # 13.0
 SHARED_LIBS +=  koodfreader               50.0 # 13.0
 SHARED_LIBS +=  kotextlayout              50.0 # 13.0
 SHARED_LIBS +=  kovectorimage             50.0 # 13.0
+SHARED_LIBS +=  koversion                 0.0 # 14.0
+SHARED_LIBS +=  kritacolor                0.0 # 14.0
+SHARED_LIBS +=  wordsprivate              14.0 # 1.0
+SHARED_LIBS +=  libglobal                 0.0 # 14.0
+SHARED_LIBS +=  libkispsd                 0.0 # 14.0
 
 WANTLIB =  c m pthread z
 WANTLIB += GL GLEW GLU Half ICE Iex IlmImf IlmThread Imath SM X11 Xext Xi
@@ -85,23 +88,25 @@ WANTLIB += fontconfig
 WANTLIB += lib/qt4/QtDeclarative lib/qt4/QtWebKit lib/qt4/QtDBus
 WANTLIB += lib/qt4/QtGui lib/qt4/QtNetwork lib/qt4/QtSvg lib/qt4/QtOpenGL
 WANTLIB += lib/qt4/QtScript lib/qt4/QtXml
-WANTLIB += lib/qt4/Qt3Support lib/qt4/QtSql
+WANTLIB +=  lib/qt4/QtSql
 WANTLIB += ${KDE4LIB}/akonadi-contact ${KDE4LIB}/akonadi-kde
 WANTLIB += ${KDE4LIB}/kabc ${KDE4LIB}/kactivities
 WANTLIB += ${KDE4LIB}/kcalcore ${KDE4LIB}/kcmutils ${KDE4LIB}/kdcraw
-WANTLIB += ${KDE4LIB}/kde3support ${KDE4LIB}/kdeclarative
+WANTLIB += ${KDE4LIB}/kdeclarative
 WANTLIB += ${KDE4LIB}/kdeui ${KDE4LIB}/kfile ${KDE4LIB}/khtml
 WANTLIB += ${KDE4LIB}/kio ${KDE4LIB}/kjs ${KDE4LIB}/kmime
-WANTLIB += ${KDE4LIB}/knewstuff3 ${KDE4LIB}/knotifyconfig
+WANTLIB += ${KDE4LIB}/knotifyconfig
 WANTLIB += ${KDE4LIB}/kparts ${KDE4LIB}/kpimutils ${KDE4LIB}/kresources
 WANTLIB += ${KDE4LIB}/krosscore ${KDE4LIB}/krossui
-WANTLIB += ${KDE4LIB}/ktexteditor ${KDE4LIB}/marblewidget
+WANTLIB += ${KDE4LIB}/marblewidget
 WANTLIB += ${KDE4LIB}/nepomuk ${KDE4LIB}/nepomukutils
 WANTLIB += ${KDE4LIB}/okularcore
 WANTLIB += ${KDE4LIB}/phonon_sexperimental ${KDE4LIB}/threadweaver
 WANTLIB += OpenColorIO exiv2 fftw3 freetype glib-2.0 gsl icui18n icuuc
 WANTLIB += jpeg lcms2 mysqlclient openjpeg png poppler poppler-qt4 pqxx
 WANTLIB += qca2 soprano sqlite3 sybdb tiff
+WANTLIB += boost_system-mt curl ktexteditor gslcblas
+
 
 # kexi needs headers in postgresql,{-main,-server}
 # kexi needs all db drivers to be present while building
@@ -109,7 +114,7 @@ BUILD_DEPENDS = devel/boost \
  databases/mariadb \
  databases/postgresql,-main \
  databases/postgresql,-server \
- math/eigen2 \
+ math/eigen3 \
  productivity/librcps
 
 # kexi needs all db driver installed to run,
@@ -136,6 +141,7 @@ LIB_DEPENDS = databases/freetds \
  graphics/png \
  graphics/tiff \
  math/fftw3,double \
+ net/curl \
  print/poppler,,-qt4 \
  security/qca2 \
  textproc/icu4c \
Index: distinfo
===================================================================
RCS file: /cvs/ports/editors/calligra/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo 23 Dec 2014 13:45:17 -0000 1.3
+++ distinfo 7 May 2015 18:52:54 -0000
@@ -1,2 +1,2 @@
-SHA256 (kde/calligra-2.8.7.tar.xz) = r2uLdOoHflu/o5jjrpaGa5o8z7wQIk6fNB5ZZDvoDrU=
-SIZE (kde/calligra-2.8.7.tar.xz) = 138966248
+SHA256 (kde/calligra-2.9.4.tar.xz) = qd023HK58kj4HsI5vmWOPn9WfkQYMnbz9AgyLrns9Ng=
+SIZE (kde/calligra-2.9.4.tar.xz) = 193721936
Index: patches/patch-cmake_modules_FindPoppler_cmake
===================================================================
RCS file: /cvs/ports/editors/calligra/patches/patch-cmake_modules_FindPoppler_cmake,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-cmake_modules_FindPoppler_cmake
--- patches/patch-cmake_modules_FindPoppler_cmake 12 Jul 2014 10:44:18 -0000 1.1.1.1
+++ patches/patch-cmake_modules_FindPoppler_cmake 7 May 2015 18:52:54 -0000
@@ -1,9 +1,9 @@
 $OpenBSD: patch-cmake_modules_FindPoppler_cmake,v 1.1.1.1 2014/07/12 10:44:18 zhuk Exp $
---- cmake/modules/FindPoppler.cmake.orig Sat Oct 12 10:17:41 2013
-+++ cmake/modules/FindPoppler.cmake Sun Oct 20 15:12:39 2013
-@@ -60,6 +60,10 @@ endif(POPPLER_FOUND)
+--- cmake/modules/FindPoppler.cmake.orig Wed Apr  1 15:27:00 2015
++++ cmake/modules/FindPoppler.cmake Mon Apr 27 00:31:55 2015
+@@ -60,6 +60,10 @@ endif()
  if (POPPLER_FOUND)
-   INCLUDE(CheckCXXSourceCompiles)
+   include(CheckCXXSourceCompiles)
 
 +  # Unbreak Qt4 linking after QT_USE_IMPORTED_TARGETS set in KDE config
 +  set(QT_USE_IMPORTED_TARGETS FALSE)
Index: patches/patch-kexi_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/editors/calligra/patches/patch-kexi_CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-kexi_CMakeLists_txt
--- patches/patch-kexi_CMakeLists_txt 12 Jul 2014 10:44:18 -0000 1.1.1.1
+++ patches/patch-kexi_CMakeLists_txt 7 May 2015 18:52:54 -0000
@@ -1,13 +1,13 @@
 $OpenBSD: patch-kexi_CMakeLists_txt,v 1.1.1.1 2014/07/12 10:44:18 zhuk Exp $
 Upstream bug?
---- kexi/CMakeLists.txt.orig Mon Mar 24 15:38:42 2014
-+++ kexi/CMakeLists.txt Sun May  4 13:19:27 2014
-@@ -88,7 +88,7 @@ set (PQXX_MAX_VERSION "5.0.0")
- macro_optional_find_package(PostgreSQL)
+--- kexi/CMakeLists.txt.orig Wed Apr  1 15:27:01 2015
++++ kexi/CMakeLists.txt Mon Apr 27 00:31:55 2015
+@@ -49,7 +49,7 @@ set (PQXX_MAX_VERSION "5.0.0")
+ macro_optional_find_package(CalligraPostgreSQL)
  macro_log_feature(POSTGRESQL_FOUND "libpq" "C application programmer's interface to PostgreSQL" "http://www.postgresql.org" FALSE "" "Required by Kexi PostgreSQL driver")
 
 -pkg_check_modules (PQXX libpqxx)
 +macro_optional_find_package (Pqxx)
 
- IF (POSTGRESQL_FOUND AND PQXX_FOUND)
-    IF (PQXX_VERSION VERSION_GREATER PQXX_MIN_VERSION AND PQXX_VERSION VERSION_LESS PQXX_MAX_VERSION)
+ if (POSTGRESQL_FOUND AND PQXX_FOUND)
+    if (PQXX_VERSION VERSION_GREATER PQXX_MIN_VERSION AND PQXX_VERSION VERSION_LESS PQXX_MAX_VERSION)
Index: patches/patch-kexi_widget_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/editors/calligra/patches/patch-kexi_widget_CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-kexi_widget_CMakeLists_txt
--- patches/patch-kexi_widget_CMakeLists_txt 12 Jul 2014 10:44:18 -0000 1.1.1.1
+++ patches/patch-kexi_widget_CMakeLists_txt 7 May 2015 18:52:54 -0000
@@ -1,8 +1,8 @@
 $OpenBSD: patch-kexi_widget_CMakeLists_txt,v 1.1.1.1 2014/07/12 10:44:18 zhuk Exp $
 Unbreak build.
---- kexi/widget/CMakeLists.txt.orig Sun Oct 20 21:40:21 2013
-+++ kexi/widget/CMakeLists.txt Sun Oct 20 21:54:12 2013
-@@ -10,7 +10,7 @@ ENDIF(KEXI_MOBILE)
+--- kexi/widget/CMakeLists.txt.orig Wed Apr  1 15:27:01 2015
++++ kexi/widget/CMakeLists.txt Mon Apr 27 00:31:55 2015
+@@ -10,7 +10,7 @@ endif()
 
  add_definitions(-DKDE_DEFAULT_DEBUG_AREA=44023)
 
Index: patches/patch-krita_image_kis_painter_cc
===================================================================
RCS file: patches/patch-krita_image_kis_painter_cc
diff -N patches/patch-krita_image_kis_painter_cc
--- patches/patch-krita_image_kis_painter_cc 12 Jul 2014 13:06:22 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-$OpenBSD: patch-krita_image_kis_painter_cc,v 1.2 2014/07/12 13:06:22 zhuk Exp $
-REVIEW: https://git.reviewboard.kde.org/r/119244/
---- krita/image/kis_painter.cc.orig Sun Mar  2 15:46:08 2014
-+++ krita/image/kis_painter.cc Wed Mar  5 21:20:39 2014
-@@ -1393,7 +1393,7 @@ void KisPainter::drawLine(const QPointF& start, const
-     int dstX = x2-x1;
-     int dstY = y2-y1;
-
--    qreal _C = dstX*y1 - dstY*x1;
-+    qreal uniC = dstX*y1 - dstY*x1;
-     qreal projectionDenominator = 1.0 / (pow((double)dstX, 2) + pow((double)dstY, 2));
-
-     qreal subPixel;
-@@ -1439,7 +1439,7 @@ void KisPainter::drawLine(const QPointF& start, const
-                 AA_ = qMin( sqrt( pow((double)x - X1_, 2) + pow((double)y - Y1_, 2) ),
-                             sqrt( pow((double)x - X2_, 2) + pow((double)y - Y2_, 2) ));
-             }else{
--                AA_ = qAbs(dstY*x - dstX*y + _C) * denominator;
-+                AA_ = qAbs(dstY*x - dstX*y + uniC) * denominator;
-             }
-
-             if (AA_>halfWidth) {
Index: patches/patch-krita_plugins_extensions_gmic_3rdparty_gmic_CImg_h
===================================================================
RCS file: patches/patch-krita_plugins_extensions_gmic_3rdparty_gmic_CImg_h
diff -N patches/patch-krita_plugins_extensions_gmic_3rdparty_gmic_CImg_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-krita_plugins_extensions_gmic_3rdparty_gmic_CImg_h 7 May 2015 18:52:54 -0000
@@ -0,0 +1,61 @@
+$OpenBSD$
+
+Variables starting by underscore ("_") sign are reserved and should not be used
+in applications.
+
+--- krita/plugins/extensions/gmic/3rdparty/gmic/CImg.h.orig Mon May  4 21:17:23 2015
++++ krita/plugins/extensions/gmic/3rdparty/gmic/CImg.h Mon May  4 21:22:58 2015
+@@ -37389,19 +37389,19 @@ namespace cimg_library_suffixed {
+             else { if (!visible_cursor) { disp.show_mouse(); visible_cursor = true; }}
+             const int d = (depth()>1)?depth():0;
+             int
+-              _X = (int)X, _Y = (int)Y, _Z = (int)Z,
++              uniX = (int)X, uniY = (int)Y, uniZ = (int)Z,
+               w = disp.width(), W = width() + d,
+               h = disp.height(), H = height() + d,
+-              _xp = (int)(_X*(float)w/W), xp = _xp + ((int)(_xp*(float)W/w)!=_X?1:0),
+-              _yp = (int)(_Y*(float)h/H), yp = _yp + ((int)(_yp*(float)H/h)!=_Y?1:0),
+-              _xn = (int)((_X+1.0f)*w/W-1), xn = _xn + ((int)((_xn+1.0f)*W/w)!=_X+1?1:0),
+-              _yn = (int)((_Y+1.0f)*h/H-1), yn = _yn + ((int)((_yn+1.0f)*H/h)!=_Y+1?1:0),
+-              _zxp = (int)((_Z+width())*(float)w/W), zxp = _zxp + ((int)(_zxp*(float)W/w)!=_Z+width()?1:0),
+-              _zyp = (int)((_Z+height())*(float)h/H), zyp = _zyp + ((int)(_zyp*(float)H/h)!=_Z+height()?1:0),
+-              _zxn = (int)((_Z+width()+1.0f)*w/W-1), zxn = _zxn + ((int)((_zxn+1.0f)*W/w)!=_Z+width()+1?1:0),
+-              _zyn = (int)((_Z+height()+1.0f)*h/H-1), zyn = _zyn + ((int)((_zyn+1.0f)*H/h)!=_Z+height()+1?1:0),
+-              _xM = (int)(width()*(float)w/W-1), xM = _xM + ((int)((_xM+1.0f)*W/w)!=width()?1:0),
+-              _yM = (int)(height()*(float)h/H-1), yM = _yM + ((int)((_yM+1.0f)*H/h)!=height()?1:0),
++              unixp = (int)(uniX*(float)w/W), xp = unixp + ((int)(unixp*(float)W/w)!=uniX?1:0),
++              uniyp = (int)(uniY*(float)h/H), yp = uniyp + ((int)(uniyp*(float)H/h)!=uniY?1:0),
++              unixn = (int)((uniX+1.0f)*w/W-1), xn = unixn + ((int)((unixn+1.0f)*W/w)!=uniX+1?1:0),
++              uniyn = (int)((uniY+1.0f)*h/H-1), yn = uniyn + ((int)((uniyn+1.0f)*H/h)!=uniY+1?1:0),
++              unizxp = (int)((uniZ+width())*(float)w/W), zxp = unizxp + ((int)(unizxp*(float)W/w)!=uniZ+width()?1:0),
++              unizyp = (int)((uniZ+height())*(float)h/H), zyp = unizyp + ((int)(unizyp*(float)H/h)!=uniZ+height()?1:0),
++              unizxn = (int)((uniZ+width()+1.0f)*w/W-1), zxn = unizxn + ((int)((unizxn+1.0f)*W/w)!=uniZ+width()+1?1:0),
++              unizyn = (int)((uniZ+height()+1.0f)*h/H-1), zyn = unizyn + ((int)((unizyn+1.0f)*H/h)!=uniZ+height()+1?1:0),
++              unixM = (int)(width()*(float)w/W-1), xM = unixM + ((int)((unixM+1.0f)*W/w)!=width()?1:0),
++              uniyM = (int)(height()*(float)h/H-1), yM = uniyM + ((int)((uniyM+1.0f)*H/h)!=height()?1:0),
+               xc = (xp + xn)/2,
+               yc = (yp + yn)/2,
+               zxc = (zxp + zxn)/2,
+@@ -37439,14 +37439,14 @@ namespace cimg_library_suffixed {
+             // Draw selection.
+             if (phase) {
+               const int
+-                _xp0 = (int)(X0*(float)w/W), xp0 = _xp0 + ((int)(_xp0*(float)W/w)!=X0?1:0),
+-                _yp0 = (int)(Y0*(float)h/H), yp0 = _yp0 + ((int)(_yp0*(float)H/h)!=Y0?1:0),
+-                _xn0 = (int)((X0+1.0f)*w/W-1), xn0 = _xn0 + ((int)((_xn0+1.0f)*W/w)!=X0+1?1:0),
+-                _yn0 = (int)((Y0+1.0f)*h/H-1), yn0 = _yn0 + ((int)((_yn0+1.0f)*H/h)!=Y0+1?1:0),
+-                _zxp0 = (int)((Z0+width())*(float)w/W), zxp0 = _zxp0 + ((int)(_zxp0*(float)W/w)!=Z0+width()?1:0),
+-                _zyp0 = (int)((Z0+height())*(float)h/H), zyp0 = _zyp0 + ((int)(_zyp0*(float)H/h)!=Z0+height()?1:0),
+-                _zxn0 = (int)((Z0+width()+1.0f)*w/W-1), zxn0 = _zxn0 + ((int)((_zxn0+1.0f)*W/w)!=Z0+width()+1?1:0),
+-                _zyn0 = (int)((Z0+height()+1.0f)*h/H-1), zyn0 = _zyn0 + ((int)((_zyn0+1.0f)*H/h)!=Z0+height()+1?1:0),
++                unixp0 = (int)(X0*(float)w/W), xp0 = unixp0 + ((int)(unixp0*(float)W/w)!=X0?1:0),
++                uniyp0 = (int)(Y0*(float)h/H), yp0 = uniyp0 + ((int)(uniyp0*(float)H/h)!=Y0?1:0),
++                unixn0 = (int)((X0+1.0f)*w/W-1), xn0 = unixn0 + ((int)((unixn0+1.0f)*W/w)!=X0+1?1:0),
++                uniyn0 = (int)((Y0+1.0f)*h/H-1), yn0 = uniyn0 + ((int)((uniyn0+1.0f)*H/h)!=Y0+1?1:0),
++                unizxp0 = (int)((Z0+width())*(float)w/W), zxp0 = unizxp0 + ((int)(unizxp0*(float)W/w)!=Z0+width()?1:0),
++                unizyp0 = (int)((Z0+height())*(float)h/H), zyp0 = unizyp0 + ((int)(unizyp0*(float)H/h)!=Z0+height()?1:0),
++                unizxn0 = (int)((Z0+width()+1.0f)*w/W-1), zxn0 = unizxn0 + ((int)((unizxn0+1.0f)*W/w)!=Z0+width()+1?1:0),
++                unizyn0 = (int)((Z0+height()+1.0f)*h/H-1), zyn0 = unizyn0 + ((int)((unizyn0+1.0f)*H/h)!=Z0+height()+1?1:0),
+                 xc0 = (xp0 + xn0)/2,
+                 yc0 = (yp0 + yn0)/2,
+                 zxc0 = (zxp0 + zxn0)/2,
Index: patches/patch-plan_libs_kernel_tests_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/editors/calligra/patches/patch-plan_libs_kernel_tests_CMakeLists_txt,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-plan_libs_kernel_tests_CMakeLists_txt
--- patches/patch-plan_libs_kernel_tests_CMakeLists_txt 15 Jan 2015 18:13:52 -0000 1.1
+++ patches/patch-plan_libs_kernel_tests_CMakeLists_txt 7 May 2015 18:52:54 -0000
@@ -3,9 +3,9 @@ $OpenBSD: patch-plan_libs_kernel_tests_C
 Rename some targets to avoid generating multiple ninja rules with
 the same name
 
---- plan/libs/kernel/tests/CMakeLists.txt.orig Sun Nov 30 08:02:20 2014
-+++ plan/libs/kernel/tests/CMakeLists.txt Thu Jan 15 09:35:44 2015
-@@ -73,9 +73,9 @@ target_link_libraries(ScheduleTester  ${KDE4_KDECORE_L
+--- plan/libs/kernel/tests/CMakeLists.txt.orig Wed Apr  1 15:27:05 2015
++++ plan/libs/kernel/tests/CMakeLists.txt Mon Apr 27 00:31:55 2015
+@@ -78,9 +78,9 @@ target_link_libraries(ScheduleTester  ${KDE4_KDECORE_L
  set(ProjectTester_SRCS ProjectTester.cpp )
   
   
Index: patches/patch-plan_plugins_schedulers_tj_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/editors/calligra/patches/patch-plan_plugins_schedulers_tj_CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-plan_plugins_schedulers_tj_CMakeLists_txt
--- patches/patch-plan_plugins_schedulers_tj_CMakeLists_txt 12 Jul 2014 10:44:18 -0000 1.1.1.1
+++ patches/patch-plan_plugins_schedulers_tj_CMakeLists_txt 7 May 2015 18:52:54 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-plan_plugins_schedulers_tj_CMakeLists_txt,v 1.1.1.1 2014/07/12 10:44:18 zhuk Exp $
 XXX allow to build
---- plan/plugins/schedulers/tj/CMakeLists.txt.orig Thu Dec 26 13:04:14 2013
-+++ plan/plugins/schedulers/tj/CMakeLists.txt Thu Dec 26 13:04:40 2013
+--- plan/plugins/schedulers/tj/CMakeLists.txt.orig Wed Apr  1 15:27:05 2015
++++ plan/plugins/schedulers/tj/CMakeLists.txt Mon Apr 27 00:31:55 2015
 @@ -3,7 +3,7 @@ set(LIBTJ_INCLUDE_DIR taskjuggler)
  include_directories( ${LIBTJ_INCLUDE_DIR} ${KOODF_INCLUDES} ${CMAKE_SOURCE_DIR}/plan/libs/kernel ${KDE4_INCLUDES} )
 
@@ -9,5 +9,5 @@ XXX allow to build
 -add_subdirectory( tests )
 +#add_subdirectory( tests )
 
- SET ( TJScheduler_SRCS
+ set ( TJScheduler_SRCS
      PlanTJPlugin.cpp
Index: patches/patch-plugins_semanticitems_contact_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/editors/calligra/patches/patch-plugins_semanticitems_contact_CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-plugins_semanticitems_contact_CMakeLists_txt
--- patches/patch-plugins_semanticitems_contact_CMakeLists_txt 12 Jul 2014 10:44:18 -0000 1.1.1.1
+++ patches/patch-plugins_semanticitems_contact_CMakeLists_txt 7 May 2015 18:52:54 -0000
@@ -1,12 +1,12 @@
 $OpenBSD: patch-plugins_semanticitems_contact_CMakeLists_txt,v 1.1.1.1 2014/07/12 10:44:18 zhuk Exp $
 Unbreak build.
---- plugins/semanticitems/contact/CMakeLists.txt.orig Fri Jul 11 19:04:57 2014
-+++ plugins/semanticitems/contact/CMakeLists.txt Fri Jul 11 19:05:22 2014
-@@ -25,6 +25,7 @@ endif (KdepimLibs_FOUND)
+--- plugins/semanticitems/contact/CMakeLists.txt.orig Wed Apr  1 15:28:07 2015
++++ plugins/semanticitems/contact/CMakeLists.txt Mon Apr 27 00:31:56 2015
+@@ -25,6 +25,7 @@ endif ()
 
  target_link_libraries(calligra_semanticitem_contact ${KDE4_KDECORE_LIBS}  ${KORDF_LIBS})
 
 +add_definitions(-DBOOST_NO_EXCEPTIONS)
 
  install(TARGETS calligra_semanticitem_contact  DESTINATION ${PLUGIN_INSTALL_DIR})
- install(FILES   calligra_semanticitem_contact.desktop  DESTINATION ${SERVICES_INSTALL_DIR})
+ install(FILES   calligra_semanticitem_contact.desktop  DESTINATION ${SERVICES_INSTALL_DIR}/calligra)
Index: patches/patch-stage_part_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/editors/calligra/patches/patch-stage_part_CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-stage_part_CMakeLists_txt
--- patches/patch-stage_part_CMakeLists_txt 12 Jul 2014 10:44:18 -0000 1.1.1.1
+++ patches/patch-stage_part_CMakeLists_txt 7 May 2015 18:52:54 -0000
@@ -1,9 +1,9 @@
 $OpenBSD: patch-stage_part_CMakeLists_txt,v 1.1.1.1 2014/07/12 10:44:18 zhuk Exp $
 Unbreak build.
---- stage/part/CMakeLists.txt.orig Fri Jul 11 18:09:42 2014
-+++ stage/part/CMakeLists.txt Fri Jul 11 18:10:18 2014
+--- stage/part/CMakeLists.txt.orig Wed Apr  1 15:28:07 2015
++++ stage/part/CMakeLists.txt Mon Apr 27 00:31:56 2015
 @@ -12,6 +12,8 @@ if (!WIN32) ## Disable tests in Windows whilst they br
- endif(!WIN32)
+ endif()
  add_subdirectory(tools)
 
 +add_definitions(-DBOOST_NO_EXCEPTIONS)
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/editors/calligra/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST 23 Dec 2014 13:45:17 -0000 1.3
+++ pkg/PLIST 7 May 2015 18:52:55 -0000
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2014/12/23 13:45:17 zhuk Exp $
+@comment $OpenBSD$
 @conflict koffice-*
 @bin bin/braindump
 @bin bin/calligra
@@ -6,6 +6,8 @@
 @bin bin/calligraauthor
 @bin bin/calligraconverter
 @bin bin/calligraflow
+@bin bin/calligragemini
+@bin bin/calligrageminithumbnailhelper
 @bin bin/calligraplan
 @bin bin/calligraplanwork
 @bin bin/calligrasheets
@@ -18,18 +20,13 @@
 @bin bin/kexi
 @bin bin/kexi_sqlite3_dump
 @bin bin/krita
-@bin bin/kritagemini
-@bin bin/kritasketch
 @bin bin/visualimagecompare
-include/kde4/KoPABackgroundTool.h
 include/kde4/calligra/
 include/kde4/calligra/DebugPigment.h
 include/kde4/calligra/Ko3dScene.h
 include/kde4/calligra/KoAnchorInlineObject.h
 include/kde4/calligra/KoAnchorTextRange.h
 include/kde4/calligra/KoAnnotationManager.h
-include/kde4/calligra/KoApplication.h
-include/kde4/calligra/KoApplicationAdaptor.h
 include/kde4/calligra/KoBasicHistogramProducers.h
 include/kde4/calligra/KoBookmark.h
 include/kde4/calligra/KoBookmarkManager.h
@@ -83,14 +80,11 @@ include/kde4/calligra/KoDockFactoryBase.
 include/kde4/calligra/KoDockRegistry.h
 include/kde4/calligra/KoDockWidgetTitleBar.h
 include/kde4/calligra/KoDockWidgetTitleBarButton.h
-include/kde4/calligra/KoDocument.h
-include/kde4/calligra/KoDocumentEntry.h
-include/kde4/calligra/KoDocumentInfo.h
+include/kde4/calligra/KoDocumentBase.h
 include/kde4/calligra/KoDocumentRdf.h
 include/kde4/calligra/KoDocumentRdfBase.h
 include/kde4/calligra/KoDocumentRdfEditWidget.h
 include/kde4/calligra/KoDocumentResourceManager.h
-include/kde4/calligra/KoDocumentSectionModel.h
 include/kde4/calligra/KoDom.h
 include/kde4/calligra/KoDpi.h
 include/kde4/calligra/KoDrag.h
@@ -104,9 +98,6 @@ include/kde4/calligra/KoEventActionRemov
 include/kde4/calligra/KoFallBackColorTransformation.h
 include/kde4/calligra/KoFileDialog.h
 include/kde4/calligra/KoFillConfigWidget.h
-include/kde4/calligra/KoFilter.h
-include/kde4/calligra/KoFilterChain.h
-include/kde4/calligra/KoFilterChainLinkList.h
 include/kde4/calligra/KoFilterEffect.h
 include/kde4/calligra/KoFilterEffectConfigWidgetBase.h
 include/kde4/calligra/KoFilterEffectFactoryBase.h
@@ -114,16 +105,6 @@ include/kde4/calligra/KoFilterEffectLoad
 include/kde4/calligra/KoFilterEffectRegistry.h
 include/kde4/calligra/KoFilterEffectRenderContext.h
 include/kde4/calligra/KoFilterEffectStack.h
-include/kde4/calligra/KoFilterEntry.h
-include/kde4/calligra/KoFilterGraph.h
-include/kde4/calligra/KoFilterManager.h
-include/kde4/calligra/KoFilterVertex.h
-include/kde4/calligra/KoFindBase.h
-include/kde4/calligra/KoFindMatch.h
-include/kde4/calligra/KoFindOption.h
-include/kde4/calligra/KoFindOptionSet.h
-include/kde4/calligra/KoFindText.h
-include/kde4/calligra/KoFindToolbar.h
 include/kde4/calligra/KoFlake.h
 include/kde4/calligra/KoFontFace.h
 include/kde4/calligra/KoFrameShape.h
@@ -155,32 +136,31 @@ include/kde4/calligra/KoLabDarkenColorTr
 include/kde4/calligra/KoLineStyleSelector.h
 include/kde4/calligra/KoList.h
 include/kde4/calligra/KoLoadingShapeUpdater.h
-include/kde4/calligra/KoMainWindow.h
 include/kde4/calligra/KoMixColorsOp.h
 include/kde4/calligra/KoMixColorsOpImpl.h
-include/kde4/calligra/KoModeBoxFactory.h
 include/kde4/calligra/KoOasisSettings.h
 include/kde4/calligra/KoOdf.h
 include/kde4/calligra/KoOdfBibliographyConfiguration.h
-include/kde4/calligra/KoOdfDocument.h
 include/kde4/calligra/KoOdfGraphicProperties.h
 include/kde4/calligra/KoOdfGraphicStyles.h
+include/kde4/calligra/KoOdfHeaderFooterProperties.h
 include/kde4/calligra/KoOdfLineNumberingConfiguration.h
 include/kde4/calligra/KoOdfLoadingContext.h
 include/kde4/calligra/KoOdfManifestEntry.h
 include/kde4/calligra/KoOdfNotesConfiguration.h
 include/kde4/calligra/KoOdfNumberDefinition.h
 include/kde4/calligra/KoOdfNumberStyles.h
+include/kde4/calligra/KoOdfPageLayoutProperties.h
 include/kde4/calligra/KoOdfParagraphProperties.h
 include/kde4/calligra/KoOdfPaste.h
 include/kde4/calligra/KoOdfReadStore.h
 include/kde4/calligra/KoOdfStyle.h
+include/kde4/calligra/KoOdfStyleBase.h
 include/kde4/calligra/KoOdfStyleManager.h
 include/kde4/calligra/KoOdfStyleProperties.h
 include/kde4/calligra/KoOdfStylesReader.h
 include/kde4/calligra/KoOdfTextProperties.h
 include/kde4/calligra/KoOdfWriteStore.h
-include/kde4/calligra/KoOpacityConfigWidget.h
 include/kde4/calligra/KoPABackgroundTool.h
 include/kde4/calligra/KoPACanvas.h
 include/kde4/calligra/KoPACanvasBase.h
@@ -203,10 +183,8 @@ include/kde4/calligra/KoPageLayout.h
 include/kde4/calligra/KoPageLayoutDialog.h
 include/kde4/calligra/KoPageLayoutWidget.h
 include/kde4/calligra/KoPagePreviewWidget.h
-include/kde4/calligra/KoPageWidgetItem.h
 include/kde4/calligra/KoPanTool.h
 include/kde4/calligra/KoParameterToPathCommand.h
-include/kde4/calligra/KoPart.h
 include/kde4/calligra/KoPathCombineCommand.h
 include/kde4/calligra/KoPathControlPointMoveCommand.h
 include/kde4/calligra/KoPathFillRuleCommand.h
@@ -223,7 +201,6 @@ include/kde4/calligra/KoPencilTool.h
 include/kde4/calligra/KoPointedAt.h
 include/kde4/calligra/KoPointerEvent.h
 include/kde4/calligra/KoPositionSelector.h
-include/kde4/calligra/KoPrintJob.h
 include/kde4/calligra/KoProgressBar.h
 include/kde4/calligra/KoProgressProxy.h
 include/kde4/calligra/KoProgressUpdater.h
@@ -239,6 +216,7 @@ include/kde4/calligra/KoRdfSemanticTree.
 include/kde4/calligra/KoRdfSemanticTreeWidgetItem.h
 include/kde4/calligra/KoResourceItemChooser.h
 include/kde4/calligra/KoResourceItemChooserContextMenu.h
+include/kde4/calligra/KoResourceModelBase.h
 include/kde4/calligra/KoResourceSelector.h
 include/kde4/calligra/KoResourceServer.h
 include/kde4/calligra/KoResourceServerAdapter.h
@@ -250,6 +228,9 @@ include/kde4/calligra/KoRgbColorSpaceTra
 include/kde4/calligra/KoRow.h
 include/kde4/calligra/KoRowStyle.h
 include/kde4/calligra/KoSection.h
+include/kde4/calligra/KoSectionEnd.h
+include/kde4/calligra/KoSectionManager.h
+include/kde4/calligra/KoSectionUtils.h
 include/kde4/calligra/KoSelection.h
 include/kde4/calligra/KoSemanticStylesheet.h
 include/kde4/calligra/KoSemanticStylesheetsEditor.h
@@ -293,7 +274,6 @@ include/kde4/calligra/KoShapeUngroupComm
 include/kde4/calligra/KoShapeUserData.h
 include/kde4/calligra/KoSharedSavingData.h
 include/kde4/calligra/KoSizeGroup.h
-include/kde4/calligra/KoStandardAction.h
 include/kde4/calligra/KoStore.h
 include/kde4/calligra/KoStoreDevice.h
 include/kde4/calligra/KoStrokeConfigWidget.h
@@ -335,17 +315,11 @@ include/kde4/calligra/KoToolProxy.h
 include/kde4/calligra/KoToolRegistry.h
 include/kde4/calligra/KoToolSelection.h
 include/kde4/calligra/KoTriangleColorSelector.h
-include/kde4/calligra/KoUniColorChooser.h
-include/kde4/calligra/KoUniColorDialog.h
 include/kde4/calligra/KoUnit.h
 include/kde4/calligra/KoUpdater.h
 include/kde4/calligra/KoVariable.h
 include/kde4/calligra/KoVariableManager.h
-include/kde4/calligra/KoVersionDialog.h
-include/kde4/calligra/KoView.h
-include/kde4/calligra/KoViewAdaptor.h
 include/kde4/calligra/KoViewConverter.h
-include/kde4/calligra/KoXYColorSelector.h
 include/kde4/calligra/KoXmlNS.h
 include/kde4/calligra/KoXmlReader.h
 include/kde4/calligra/KoXmlReaderForward.h
@@ -357,7 +331,6 @@ include/kde4/calligra/KoZoomController.h
 include/kde4/calligra/KoZoomHandler.h
 include/kde4/calligra/KoZoomInput.h
 include/kde4/calligra/KoZoomMode.h
-include/kde4/calligra/MacSupport.h
 include/kde4/calligra/RdfForward.h
 include/kde4/calligra/RdfSemanticTreeWidgetAction.h
 include/kde4/calligra/RdfSemanticTreeWidgetSelectAction.h
@@ -372,18 +345,19 @@ include/kde4/calligra/changetracker/KoDe
 include/kde4/calligra/changetracker/KoDeletedRowColumnDataStore.h
 include/kde4/calligra/changetracker/KoDeletedRowData.cpp
 include/kde4/calligra/flake_export.h
-include/kde4/calligra/komain_export.h
 include/kde4/calligra/koodf2_export.h
 include/kde4/calligra/koodf_export.h
 include/kde4/calligra/kopageapp_export.h
 include/kde4/calligra/kordf_export.h
 include/kde4/calligra/kotext_export.h
 include/kde4/calligra/kotextlayout_export.h
+include/kde4/calligra/koversion_export.h
 include/kde4/calligra/kowidgets_export.h
 include/kde4/calligra/kowidgetutils_export.h
 include/kde4/calligra/kundo2_export.h
 include/kde4/calligra/kundo2command.h
 include/kde4/calligra/kundo2group.h
+include/kde4/calligra/kundo2magicstring.h
 include/kde4/calligra/kundo2model.h
 include/kde4/calligra/kundo2qstack.h
 include/kde4/calligra/kundo2stack.h
@@ -400,17 +374,8 @@ include/kde4/calligra/styles/KoTableCell
 include/kde4/calligra/styles/KoTableColumnStyle.h
 include/kde4/calligra/styles/KoTableRowStyle.h
 include/kde4/calligra/styles/KoTableStyle.h
-include/kde4/kexi/
-include/kde4/kexi/forms/
-include/kde4/kexi/forms/FormWidget.h
-include/kde4/kexi/forms/FormWidgetInterface.h
-include/kde4/kexi/forms/WidgetInfo.h
-include/kde4/kexi/forms/WidgetTreeWidget.h
-include/kde4/kexi/forms/objecttree.h
-include/kde4/kexi/forms/widgetfactory.h
-include/kde4/kexi/forms/widgetlibrary.h
-include/kde4/kexi/forms/widgetwithsubpropertiesinterface.h
 include/kde4/krita/
+include/kde4/krita/KisViewManager.h
 include/kde4/krita/fill_processing_visitor.h
 include/kde4/krita/kis_base_node.h
 include/kde4/krita/kis_base_processor.h
@@ -435,6 +400,9 @@ include/kde4/krita/kis_generator.h
 include/kde4/krita/kis_generator_registry.h
 include/kde4/krita/kis_global.h
 include/kde4/krita/kis_image.h
+include/kde4/krita/kis_locked_properties.h
+include/kde4/krita/kis_locked_properties_proxy.h
+include/kde4/krita/kis_locked_properties_server.h
 include/kde4/krita/kis_mask.h
 include/kde4/krita/kis_multi_bool_filter_widget.h
 include/kde4/krita/kis_multi_double_filter_widget.h
@@ -454,14 +422,12 @@ include/kde4/krita/kis_selection.h
 include/kde4/krita/kis_serializable_configuration.h
 include/kde4/krita/kis_shared.h
 include/kde4/krita/kis_shared_ptr.h
-include/kde4/krita/kis_shared_ptr_vector.h
 include/kde4/krita/kis_tiled_data_manager.h
 include/kde4/krita/kis_tool.h
 include/kde4/krita/kis_transaction.h
 include/kde4/krita/kis_transform_worker.h
 include/kde4/krita/kis_types.h
 include/kde4/krita/kis_ui_types.h
-include/kde4/krita/kis_view2.h
 include/kde4/krita/kis_warptransform_worker.h
 include/kde4/krita/krita_export.h
 include/kde4/sheets/
@@ -495,6 +461,10 @@ include/kde4/sheets/commands/
 include/kde4/sheets/commands/AbstractRegionCommand.h
 include/kde4/sheets/commands/DataManipulators.h
 include/kde4/sheets/commands/SortManipulator.h
+include/kde4/sheets/commands/pivot.h
+include/kde4/sheets/commands/pivotfilters.h
+include/kde4/sheets/commands/pivotmain.h
+include/kde4/sheets/commands/pivotoptions.h
 include/kde4/sheets/database/
 include/kde4/sheets/database/Database.h
 include/kde4/sheets/database/Filter.h
@@ -556,222 +526,20 @@ include/kde4/words/part/frames/KWTextFra
 include/kde4/words/part/words_export.h
 lib/calligra/
 lib/calligra/imports/
+lib/calligra/imports/Calligra/
+lib/calligra/imports/Calligra/Gemini/
+lib/calligra/imports/Calligra/Gemini/Dropbox/
+lib/calligra/imports/Calligra/Gemini/Dropbox/libcalligrageminidropboxplugin.so
+lib/calligra/imports/Calligra/Gemini/Dropbox/qmldir
 lib/calligra/imports/org/
+lib/calligra/imports/org/calligra/
+lib/calligra/imports/org/calligra/CalligraComponents/
+lib/calligra/imports/org/calligra/CalligraComponents/libcalligraqtquickcomponentsplugin.so
+lib/calligra/imports/org/calligra/CalligraComponents/qmldir
 lib/calligra/imports/org/krita/
 lib/calligra/imports/org/krita/draganddrop/
 lib/calligra/imports/org/krita/draganddrop/libdraganddropplugin.so
 lib/calligra/imports/org/krita/draganddrop/qmldir
-lib/calligra/imports/org/krita/sketch/
-lib/calligra/imports/org/krita/sketch/HelpPage.qml
-lib/calligra/imports/org/krita/sketch/KritaSketchBase.qml
-lib/calligra/imports/org/krita/sketch/MainPage.qml
-lib/calligra/imports/org/krita/sketch/OpenImagePage.qml
-lib/calligra/imports/org/krita/sketch/SaveImagePage.qml
-lib/calligra/imports/org/krita/sketch/SettingsPage.qml
-lib/calligra/imports/org/krita/sketch/WelcomePage.qml
-lib/calligra/imports/org/krita/sketch/components/
-lib/calligra/imports/org/krita/sketch/components/BusyIndicator.qml
-lib/calligra/imports/org/krita/sketch/components/Button.qml
-lib/calligra/imports/org/krita/sketch/components/CategorySwitcher.qml
-lib/calligra/imports/org/krita/sketch/components/CheckBox.qml
-lib/calligra/imports/org/krita/sketch/components/ColorSwatch.qml
-lib/calligra/imports/org/krita/sketch/components/Dialog.qml
-lib/calligra/imports/org/krita/sketch/components/Divider.qml
-lib/calligra/imports/org/krita/sketch/components/DropShadow.qml
-lib/calligra/imports/org/krita/sketch/components/ExpandingListView.qml
-lib/calligra/imports/org/krita/sketch/components/Header.qml
-lib/calligra/imports/org/krita/sketch/components/Label.qml
-lib/calligra/imports/org/krita/sketch/components/ListItem.qml
-lib/calligra/imports/org/krita/sketch/components/MessageStack.qml
-lib/calligra/imports/org/krita/sketch/components/NewImageList.qml
-lib/calligra/imports/org/krita/sketch/components/NewsList.qml
-lib/calligra/imports/org/krita/sketch/components/Page.qml
-lib/calligra/imports/org/krita/sketch/components/PageStack.js
-lib/calligra/imports/org/krita/sketch/components/PageStack.qml
-lib/calligra/imports/org/krita/sketch/components/PanelTextField.qml
-lib/calligra/imports/org/krita/sketch/components/RangeInput.qml
-lib/calligra/imports/org/krita/sketch/components/RecentFilesList.qml
-lib/calligra/imports/org/krita/sketch/components/ScrollDecorator.qml
-lib/calligra/imports/org/krita/sketch/components/Slider.qml
-lib/calligra/imports/org/krita/sketch/components/TextField.qml
-lib/calligra/imports/org/krita/sketch/components/TextFieldMultiline.qml
-lib/calligra/imports/org/krita/sketch/components/VirtualKeyboard.qml
-lib/calligra/imports/org/krita/sketch/images/
-lib/calligra/imports/org/krita/sketch/images/blue.png
-lib/calligra/imports/org/krita/sketch/images/busyindicator.png
-lib/calligra/imports/org/krita/sketch/images/camera-web.png
-lib/calligra/imports/org/krita/sketch/images/configure.png
-lib/calligra/imports/org/krita/sketch/images/divider.png
-lib/calligra/imports/org/krita/sketch/images/divider2.png
-lib/calligra/imports/org/krita/sketch/images/document-new.png
-lib/calligra/imports/org/krita/sketch/images/document-open.png
-lib/calligra/imports/org/krita/sketch/images/document-save-as.png
-lib/calligra/imports/org/krita/sketch/images/document-save.png
-lib/calligra/imports/org/krita/sketch/images/document-share.png
-lib/calligra/imports/org/krita/sketch/images/edit-copy.png
-lib/calligra/imports/org/krita/sketch/images/edit-cut.png
-lib/calligra/imports/org/krita/sketch/images/edit-paste.png
-lib/calligra/imports/org/krita/sketch/images/edit-redo.png
-lib/calligra/imports/org/krita/sketch/images/edit-select.png
-lib/calligra/imports/org/krita/sketch/images/edit-undo.png
-lib/calligra/imports/org/krita/sketch/images/green.png
-lib/calligra/imports/org/krita/sketch/images/handle-menu.png
-lib/calligra/imports/org/krita/sketch/images/header_krita_sketch.png
-lib/calligra/imports/org/krita/sketch/images/header_krita_sketch_light.png
-lib/calligra/imports/org/krita/sketch/images/header_red.png
-lib/calligra/imports/org/krita/sketch/images/help-about.png
-lib/calligra/imports/org/krita/sketch/images/image-x-generic.png
-lib/calligra/imports/org/krita/sketch/images/krita.png
-lib/calligra/imports/org/krita/sketch/images/kritasketch.png
-lib/calligra/imports/org/krita/sketch/images/red.png
-lib/calligra/imports/org/krita/sketch/images/shadow-bc.png
-lib/calligra/imports/org/krita/sketch/images/shadow-bl.png
-lib/calligra/imports/org/krita/sketch/images/shadow-br.png
-lib/calligra/imports/org/krita/sketch/images/shadow-lc.png
-lib/calligra/imports/org/krita/sketch/images/shadow-rc.png
-lib/calligra/imports/org/krita/sketch/images/shadow-smooth.png
-lib/calligra/imports/org/krita/sketch/images/shadow-tc.png
-lib/calligra/imports/org/krita/sketch/images/shadow-tl.png
-lib/calligra/imports/org/krita/sketch/images/shadow-tr.png
-lib/calligra/imports/org/krita/sketch/images/svg/
-lib/calligra/imports/org/krita/sketch/images/svg/checker-small.svg
-lib/calligra/imports/org/krita/sketch/images/svg/combo-arrows-white.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-A4landscape-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-A4portrait-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-add-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-add.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-apply-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-apply.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-back.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-camera-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-cancel-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-close.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-color_wheel.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-colorpicker.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-crop-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-crop.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-delete-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-delete.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-down.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-edit.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-erase.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-fileclip-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-filenew-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-filenew.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-fileopen-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-fileopen.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-filesave.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-filesaveas.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-fileshare.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-fill-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-fill.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-filter_delete-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-filter_load-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-filter_save-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-forward.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-gradient-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-gradient.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-help.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-krita_sketch.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-layer_filter-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-layer_group-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-layer_paint-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-locked_off-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-locked_on-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-minimize.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-mirror_c-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-mirror_h-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-mirror_v-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-move-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-move.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-paint-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-paint.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-palette-add-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-palette-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-palette-delete-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-palette.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-redo.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-select-add.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-select-apply.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-select-area.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-select-color.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-select-deselect.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-select-hide.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-select-intersect.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-select-polygon.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-select-rectangle.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-select-replace.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-select-reselect.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-select-show.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-select-sub.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-settings.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-switch.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-transform-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-transform.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-undo.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-up.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-visible_off-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-visible_off.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-visible_on-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-visible_on.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-web.svg
-lib/calligra/imports/org/krita/sketch/libkritasketchplugin.so
-lib/calligra/imports/org/krita/sketch/panels/
-lib/calligra/imports/org/krita/sketch/panels/ColorPanel.qml
-lib/calligra/imports/org/krita/sketch/panels/EditLayerPage.qml
-lib/calligra/imports/org/krita/sketch/panels/EditPresetPage.qml
-lib/calligra/imports/org/krita/sketch/panels/FilterPanel.qml
-lib/calligra/imports/org/krita/sketch/panels/LayersPanel.qml
-lib/calligra/imports/org/krita/sketch/panels/MenuPanel.qml
-lib/calligra/imports/org/krita/sketch/panels/NewImagePanel.qml
-lib/calligra/imports/org/krita/sketch/panels/OpenImagePanel.qml
-lib/calligra/imports/org/krita/sketch/panels/Panel.qml
-lib/calligra/imports/org/krita/sketch/panels/PanelBar.qml
-lib/calligra/imports/org/krita/sketch/panels/PanelDropArea.qml
-lib/calligra/imports/org/krita/sketch/panels/PresetsPanel.qml
-lib/calligra/imports/org/krita/sketch/panels/SelectPanel.qml
-lib/calligra/imports/org/krita/sketch/panels/ToolOverlayPanel.qml
-lib/calligra/imports/org/krita/sketch/panels/ToolPanel.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/blur.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/brightnesscontrast.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/burn.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/colortoalpha.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/colortransfer.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/dodge.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/emboss.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/gaussian blur.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/gaussiannoisereducer.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/hsvadjustment.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/lens blur.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/levels.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/motion blur.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/noise.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/nothing-to-configure.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/oilpaint.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/perchannel.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/phongbumpmap.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/pixelize.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/raindrops.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/randompick.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/roundcorners.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/smalltiles.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/sobel.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/unsharp.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/wave.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/waveletnoisereducer.qml
-lib/calligra/imports/org/krita/sketch/panels/toolconfigpages/
-lib/calligra/imports/org/krita/sketch/panels/toolconfigpages/crop.qml
-lib/calligra/imports/org/krita/sketch/panels/toolconfigpages/fill.qml
-lib/calligra/imports/org/krita/sketch/panels/toolconfigpages/gradient.qml
-lib/calligra/imports/org/krita/sketch/panels/toolconfigpages/move.qml
-lib/calligra/imports/org/krita/sketch/panels/toolconfigpages/paint.qml
-lib/calligra/imports/org/krita/sketch/panels/toolconfigpages/transform.qml
-lib/calligra/imports/org/krita/sketch/panels/tooloverlays/
-lib/calligra/imports/org/krita/sketch/panels/tooloverlays/move.qml
-lib/calligra/imports/org/krita/sketch/panels/tooloverlays/none.qml
-lib/calligra/imports/org/krita/sketch/panels/tooloverlays/transform.qml
-lib/calligra/imports/org/krita/sketch/qmldir
 lib/kde4/authorpart.so
 lib/kde4/braindump_shape_state.so
 lib/kde4/braindump_shape_web.so
@@ -793,9 +561,11 @@ lib/kde4/calligra_filter_kpr2odp.so
 lib/kde4/calligra_filter_kspread2tex.so
 lib/kde4/calligra_filter_mpxj2plan.so
 lib/kde4/calligra_filter_odt2ascii.so
+lib/kde4/calligra_filter_odt2docx.so
 lib/kde4/calligra_filter_odt2epub2.so
 lib/kde4/calligra_filter_odt2html.so
 lib/kde4/calligra_filter_odt2mobi.so
+lib/kde4/calligra_filter_odt2wiki.so
 lib/kde4/calligra_filter_opencalc2sheets.so
 lib/kde4/calligra_filter_pdf2svg.so
 lib/kde4/calligra_filter_ppt2odp.so
@@ -905,6 +675,7 @@ lib/kde4/kritacolorgenerator.so
 lib/kde4/kritacolorrange.so
 lib/kde4/kritacolorselectorng.so
 lib/kde4/kritacolorsfilters.so
+lib/kde4/kritacolorslider.so
 lib/kde4/kritacolorsmudgepaintop.so
 lib/kde4/kritacolorspaceconversion.so
 lib/kde4/kritacompositiondocker.so
@@ -916,7 +687,6 @@ lib/kde4/kritadefaulttools.so
 lib/kde4/kritadeformpaintop.so
 lib/kde4/kritadigitalmixer.so
 lib/kde4/kritadodgeburn.so
-lib/kde4/kritadropshadow.so
 lib/kde4/kritadynapaintop.so
 lib/kde4/kritaembossfilter.so
 lib/kde4/kritaexample.so
@@ -926,22 +696,25 @@ lib/kde4/kritaexrimport.so
 lib/kde4/kritaextensioncolorsfilters.so
 lib/kde4/kritafastcolortransferfilter.so
 lib/kde4/kritafilterop.so
-lib/kde4/kritaflipbookimport.so
 lib/kde4/kritagmic.so
 lib/kde4/kritagridpaintop.so
 lib/kde4/kritahairypaintop.so
 lib/kde4/kritahatchingpaintop.so
+lib/kde4/kritaheightmapexport.so
+lib/kde4/kritaheightmapimport.so
 lib/kde4/kritahistogram.so
 lib/kde4/kritahistorydocker.so
 lib/kde4/kritaimagedocker.so
 lib/kde4/kritaimageenhancement.so
 lib/kde4/kritaimagesize.so
 lib/kde4/kritaimagesplit.so
+lib/kde4/kritaindexcolors.so
 lib/kde4/kritajp2export.so
 lib/kde4/kritajp2import.so
 lib/kde4/kritajpegexport.so
 lib/kde4/kritajpegimport.so
 lib/kde4/kritalayergroupswitcher.so
+lib/kde4/kritalayersplit.so
 lib/kde4/kritalevelfilter.so
 lib/kde4/kritalutdocker.so
 lib/kde4/kritametadataeditor.so
@@ -954,7 +727,6 @@ lib/kde4/kritaoraexport.so
 lib/kde4/kritaoraimport.so
 lib/kde4/kritaoverviewdocker.so
 lib/kde4/kritapalettedocker.so
-lib/kde4/kritapart.so
 lib/kde4/kritaparticlepaintop.so
 lib/kde4/kritapatterndocker.so
 lib/kde4/kritapatterngenerator.so
@@ -963,6 +735,7 @@ lib/kde4/kritaphongbumpmap.so
 lib/kde4/kritapixelizefilter.so
 lib/kde4/kritapngexport.so
 lib/kde4/kritapngimport.so
+lib/kde4/kritaposterize.so
 lib/kde4/kritappmexport.so
 lib/kde4/kritappmimport.so
 lib/kde4/kritapresetdocker.so
@@ -971,6 +744,7 @@ lib/kde4/kritapsdimport.so
 lib/kde4/kritaqmlexport.so
 lib/kde4/kritaraindropsfilter.so
 lib/kde4/kritarandompickfilter.so
+lib/kde4/kritaresourcemanager.so
 lib/kde4/kritarotateimage.so
 lib/kde4/kritaroundcornersfilter.so
 lib/kde4/kritarulerassistanttool.so
@@ -984,6 +758,9 @@ lib/kde4/kritasobelfilter.so
 lib/kde4/kritaspecificcolorselector.so
 lib/kde4/kritaspraypaintop.so
 lib/kde4/kritatasksetdocker.so
+lib/kde4/kritatgaexport.so
+lib/kde4/kritatgaimport.so
+lib/kde4/kritathumbnail.so
 lib/kde4/kritatiffexport.so
 lib/kde4/kritatiffimport.so
 lib/kde4/kritatoolcrop.so
@@ -1015,6 +792,7 @@ lib/kde4/kspreadstatisticalmodule.so
 lib/kde4/kspreadtextmodule.so
 lib/kde4/kspreadtrigonometrymodule.so
 lib/kde4/okularGenerator_odp.so
+lib/kde4/okularGenerator_odt.so
 lib/kde4/planconvert/
 lib/kde4/planconvert/PlanConvert.jar
 lib/kde4/planicalexport.so
@@ -1022,6 +800,8 @@ lib/kde4/plankplatoimport.so
 lib/kde4/planpart.so
 lib/kde4/plantjscheduler.so
 lib/kde4/planworkpart.so
+lib/kde4/plugins/imageformats/kimg_kra.so
+lib/kde4/plugins/imageformats/kimg_ora.so
 lib/kde4/sheetssolver.so
 lib/kde4/wordspart.so
 @lib lib/libRtfReader.so.${LIBRtfReader_VERSION}
@@ -1045,7 +825,6 @@ lib/libkdeinit4_calligrasheets.so
 lib/libkdeinit4_calligrastage.so
 lib/libkdeinit4_calligrawords.so
 lib/libkdeinit4_karbon.so
-lib/libkdeinit4_krita.so
 @lib lib/libkexicore.so.${LIBkexicore_VERSION}
 @lib lib/libkexidatatable.so.${LIBkexidatatable_VERSION}
 @lib lib/libkexidataviewcommon.so.${LIBkexidataviewcommon_VERSION}
@@ -1073,29 +852,42 @@ lib/libkdeinit4_krita.so
 @lib lib/libkotext.so.${LIBkotext_VERSION}
 @lib lib/libkotextlayout.so.${LIBkotextlayout_VERSION}
 @lib lib/libkovectorimage.so.${LIBkovectorimage_VERSION}
+@lib lib/libkoversion.so.${LIBkoversion_VERSION}
 @lib lib/libkowidgets.so.${LIBkowidgets_VERSION}
 @lib lib/libkowidgetutils.so.${LIBkowidgetutils_VERSION}
 @lib lib/libkowv2.so.${LIBkowv2_VERSION}
 @lib lib/libkplatokernel.so.${LIBkplatokernel_VERSION}
 @lib lib/libkplatomodels.so.${LIBkplatomodels_VERSION}
 @lib lib/libkplatoui.so.${LIBkplatoui_VERSION}
+@lib lib/libkritacolor.so.${LIBkritacolor_VERSION}
+lib/libkritacolord.so
 @lib lib/libkritaimage.so.${LIBkritaimage_VERSION}
 @lib lib/libkritalibbrush.so.${LIBkritalibbrush_VERSION}
 @lib lib/libkritalibpaintop.so.${LIBkritalibpaintop_VERSION}
-lib/libkritasketchlib.so
 @lib lib/libkritaui.so.${LIBkritaui_VERSION}
 @lib lib/libkundo2.so.${LIBkundo2_VERSION}
+@lib lib/liblibglobal.so.${LIBlibglobal_VERSION}
+@lib lib/liblibkispsd.so.${LIBlibkispsd_VERSION}
 @lib lib/libpigmentcms.so.${LIBpigmentcms_VERSION}
 @lib lib/libplanprivate.so.${LIBplanprivate_VERSION}
 @lib lib/libplanworkapp.so.${LIBplanworkapp_VERSION}
 @lib lib/libplanworkfactory.so.${LIBplanworkfactory_VERSION}
 @lib lib/librcps_plan.so.${LIBrcps_plan_VERSION}
 @lib lib/libwordsprivate.so.${LIBwordsprivate_VERSION}
+share/appdata/braindump.appdata.xml
+share/appdata/flow.appdata.xml
+share/appdata/karbon.appdata.xml
+share/appdata/kexi.appdata.xml
 share/appdata/krita.appdata.xml
-share/applications/calligraactive.desktop
+share/appdata/plan.appdata.xml
+share/appdata/sheets.appdata.xml
+share/appdata/stage.appdata.xml
+share/appdata/words.appdata.xml
 share/applications/kde4/author.desktop
 share/applications/kde4/braindump.desktop
 share/applications/kde4/calligra.desktop
+share/applications/kde4/calligraactive.desktop
+share/applications/kde4/calligragemini.desktop
 share/applications/kde4/calligrawords_ascii.desktop
 share/applications/kde4/flow.desktop
 share/applications/kde4/karbon.desktop
@@ -1103,7 +895,7 @@ share/applications/kde4/kexi.desktop
 share/applications/kde4/krita.desktop
 share/applications/kde4/krita_bmp.desktop
 share/applications/kde4/krita_exr.desktop
-share/applications/kde4/krita_flipbook.desktop
+share/applications/kde4/krita_heightmap.desktop
 share/applications/kde4/krita_jp2.desktop
 share/applications/kde4/krita_jpeg.desktop
 share/applications/kde4/krita_odg.desktop
@@ -1113,11 +905,13 @@ share/applications/kde4/krita_png.deskto
 share/applications/kde4/krita_ppm.desktop
 share/applications/kde4/krita_psd.desktop
 share/applications/kde4/krita_raw.desktop
+share/applications/kde4/krita_tga.desktop
 share/applications/kde4/krita_tiff.desktop
 share/applications/kde4/krita_xcf.desktop
-share/applications/kde4/kritagemini.desktop
-share/applications/kde4/kritasketch.desktop
+share/applications/kde4/okularApplication_doc_calligra.desktop
+share/applications/kde4/okularApplication_docx_calligra.desktop
 share/applications/kde4/okularApplication_odp.desktop
+share/applications/kde4/okularApplication_odt.desktop
 share/applications/kde4/plan.desktop
 share/applications/kde4/planwork.desktop
 share/applications/kde4/sheets.desktop
@@ -1151,6 +945,7 @@ share/apps/calligra/icons/hicolor/128x12
 share/apps/calligra/icons/hicolor/128x128/actions/template_ratio_1610.png
 share/apps/calligra/icons/hicolor/128x128/actions/template_ratio_2391.png
 share/apps/calligra/icons/hicolor/128x128/actions/template_ratio_43.png
+share/apps/calligra/icons/hicolor/128x128/actions/template_web_design.png
 share/apps/calligra/icons/hicolor/16x16/
 share/apps/calligra/icons/hicolor/16x16/actions/
 share/apps/calligra/icons/hicolor/16x16/actions/abs.png
@@ -1425,18 +1220,322 @@ share/apps/calligra/palettes/swatch-colo
 share/apps/calligra/palettes/swatch-rgb.gpl
 share/apps/calligra/palettes/swatche.gpl
 share/apps/calligra/palettes/web.gpl
+share/apps/calligra/pics/
+share/apps/calligra/pics/dark_docker_close.png
+share/apps/calligra/pics/dark_docker_collapse_a.png
+share/apps/calligra/pics/dark_docker_collapse_b.png
+share/apps/calligra/pics/dark_docker_float.png
+share/apps/calligra/pics/dark_docker_lock_a.png
+share/apps/calligra/pics/dark_docker_lock_b.png
+share/apps/calligra/pics/light_docker_close.png
+share/apps/calligra/pics/light_docker_collapse_a.png
+share/apps/calligra/pics/light_docker_collapse_b.png
+share/apps/calligra/pics/light_docker_float.png
+share/apps/calligra/pics/light_docker_lock_a.png
+share/apps/calligra/pics/light_docker_lock_b.png
 share/apps/calligra/styles/
 share/apps/calligra/styles/markers.xml
 share/apps/calligra/thesaurus/
 share/apps/calligra/thesaurus/thesaurus.txt
+share/apps/calligragemini/
+share/apps/calligragemini/calligragemini.qml
+share/apps/calligragemini/qml/
+share/apps/calligragemini/qml/MainPage.qml
+share/apps/calligragemini/qml/PresentationDJMode.qml
+share/apps/calligragemini/qml/StageDocumentPage.qml
+share/apps/calligragemini/qml/WelcomePage.qml
+share/apps/calligragemini/qml/WordsDocumentPage.qml
+share/apps/calligragemini/qml/components/
+share/apps/calligragemini/qml/components/BusyIndicator.qml
+share/apps/calligragemini/qml/components/Button.qml
+share/apps/calligragemini/qml/components/CategorySwitcher.qml
+share/apps/calligragemini/qml/components/CheckBox.qml
+share/apps/calligragemini/qml/components/CohereButton.qml
+share/apps/calligragemini/qml/components/ColorSwatch.qml
+share/apps/calligragemini/qml/components/Dialog.qml
+share/apps/calligragemini/qml/components/Divider.qml
+share/apps/calligragemini/qml/components/DropShadow.qml
+share/apps/calligragemini/qml/components/ExpandingListView.qml
+share/apps/calligragemini/qml/components/Header.qml
+share/apps/calligragemini/qml/components/Label.qml
+share/apps/calligragemini/qml/components/ListItem.qml
+share/apps/calligragemini/qml/components/MessageStack.qml
+share/apps/calligragemini/qml/components/NewImageList.qml
+share/apps/calligragemini/qml/components/NewsList.qml
+share/apps/calligragemini/qml/components/Page.qml
+share/apps/calligragemini/qml/components/PageStack.js
+share/apps/calligragemini/qml/components/PageStack.qml
+share/apps/calligragemini/qml/components/PanelTextField.qml
+share/apps/calligragemini/qml/components/ProgressBar.qml
+share/apps/calligragemini/qml/components/RangeInput.qml
+share/apps/calligragemini/qml/components/RecentFilesList.qml
+share/apps/calligragemini/qml/components/ScrollDecorator.qml
+share/apps/calligragemini/qml/components/Shadow.qml
+share/apps/calligragemini/qml/components/Slider.qml
+share/apps/calligragemini/qml/components/TextField.qml
+share/apps/calligragemini/qml/components/TextFieldMultiline.qml
+share/apps/calligragemini/qml/components/Tooltip.qml
+share/apps/calligragemini/qml/components/VirtualKeyboard.qml
+share/apps/calligragemini/qml/panels/
+share/apps/calligragemini/qml/panels/ImageToolsPanel.qml
+share/apps/calligragemini/qml/panels/NotesPanel.qml
+share/apps/calligragemini/qml/panels/OptionsPanel.qml
+share/apps/calligragemini/qml/panels/TextStylePanel.qml
+share/apps/calligragemini/qml/panels/notespanelpages/
+share/apps/calligragemini/qml/panels/notespanelpages/NotesPanelAddCustom.qml
+share/apps/calligragemini/qml/panels/notespanelpages/NotesPanelMain.qml
+share/apps/calligragemini/qml/panels/notespanelpages/NotesPanelSummary.qml
+share/apps/calligragemini/qml/welcomepages/
+share/apps/calligragemini/qml/welcomepages/CustomDocWords.qml
+share/apps/calligragemini/qml/welcomepages/TemplatesWords.qml
+share/apps/calligragemini/qml/welcomepages/VariantSelector.qml
+share/apps/calligragemini/qml/welcomepages/WelcomePageCloud.qml
+share/apps/calligragemini/qml/welcomepages/WelcomePageCustom.qml
+share/apps/calligragemini/qml/welcomepages/WelcomePageFilebrowser.qml
+share/apps/calligragemini/qml/welcomepages/WelcomePageRecent.qml
+share/apps/calligragemini/qml/welcomepages/WelcomePageStage.qml
+share/apps/calligragemini/qml/welcomepages/WelcomePageWords.qml
+share/apps/calligragemini/qml/welcomepages/cloud/
+share/apps/calligragemini/qml/welcomepages/cloud/AddDropbox.qml
+share/apps/calligragemini/qml/welcomepages/cloud/AddGit.qml
+share/apps/calligragemini/qml/welcomepages/cloud/AddWebdav.qml
+share/apps/calligragemini/qml/welcomepages/cloud/CloudAccounts.qml
+share/apps/calligragemini/qml/welcomepages/cloud/Dropbox.qml
+share/apps/calligragemini/qml/welcomepages/cloud/EditDetailsBase.qml
+share/apps/calligragemini/qml/welcomepages/cloud/EditGit.qml
+share/apps/calligragemini/qml/welcomepages/cloud/Git.qml
+share/apps/calligragemini/qml/welcomepages/cloud/RemoveAccountDlg.qml
+share/apps/calligragemini/qml/welcomepages/cloud/Webdav.qml
+share/apps/calligragemini/qml/welcomepages/cloud/dropbox/
+share/apps/calligragemini/qml/welcomepages/cloud/dropbox/DropboxWebView.qml
+share/apps/calligragemini/qml/welcomepages/cloud/dropbox/FileNavigator.qml
+share/apps/calligragemini/qml/welcomepages/cloud/dropbox/InfoBanner.qml
+share/apps/calligragemini/qml/welcomepages/cloud/dropbox/LoginPage.qml
+share/apps/calligragemini/qml/welcomepages/cloud/dropbox/SetupPage.qml
+share/apps/calligragemini/qml/welcomepages/cloud/git/
+share/apps/calligragemini/qml/welcomepages/cloud/git/CreateCheckout.qml
+share/apps/calligragemini/qml/welcomepages/cloud/git/GetUserCredentials.qml
+share/apps/calligragemini/qml/welcomepages/cloud/git/RepositoryContent.qml
+share/apps/calligragemini/qml/welcomepages/cloud/git/createCheckoutContainer.qml
+share/apps/calligragemini/qml/welcomepages/cloud/git/repositoryContentContainer.qml
+share/apps/calligragemini/qml/welcomepages/cloud/git/userCredentialsContainer.qml
+share/apps/calligragemini/themes/
+share/apps/calligragemini/themes/default/
+share/apps/calligragemini/themes/default/colors.js
+share/apps/calligragemini/themes/default/fonts/
+share/apps/calligragemini/themes/default/fonts.js
+share/apps/calligragemini/themes/default/fonts/PermanentMarker.ttf
+share/apps/calligragemini/themes/default/fonts/SourceSansPro-Black.otf
+share/apps/calligragemini/themes/default/fonts/SourceSansPro-BlackIt.otf
+share/apps/calligragemini/themes/default/fonts/SourceSansPro-Bold.otf
+share/apps/calligragemini/themes/default/fonts/SourceSansPro-BoldIt.otf
+share/apps/calligragemini/themes/default/fonts/SourceSansPro-ExtraLight.otf
+share/apps/calligragemini/themes/default/fonts/SourceSansPro-ExtraLightIt.otf
+share/apps/calligragemini/themes/default/fonts/SourceSansPro-It.otf
+share/apps/calligragemini/themes/default/fonts/SourceSansPro-Light.otf
+share/apps/calligragemini/themes/default/fonts/SourceSansPro-LightIt.otf
+share/apps/calligragemini/themes/default/fonts/SourceSansPro-Regular.otf
+share/apps/calligragemini/themes/default/fonts/SourceSansPro-Semibold.otf
+share/apps/calligragemini/themes/default/fonts/SourceSansPro-SemiboldIt.otf
+share/apps/calligragemini/themes/default/icons/
+share/apps/calligragemini/themes/default/icons/A4landscape-black.svg
+share/apps/calligragemini/themes/default/icons/A4portrait-black.svg
+share/apps/calligragemini/themes/default/icons/Arrow-Back-FileBrowse-1.svg
+share/apps/calligragemini/themes/default/icons/Arrow-ScrollDown-1.svg
+share/apps/calligragemini/themes/default/icons/Arrow-ScrollUp-1.svg
+share/apps/calligragemini/themes/default/icons/Calligra-MockIcon-1.svg
+share/apps/calligragemini/themes/default/icons/ColorPalettes-1-04.svg
+share/apps/calligragemini/themes/default/icons/ColorPalettes-Blue-1.svg
+share/apps/calligragemini/themes/default/icons/ColorPalettes-Magenta-1.svg
+share/apps/calligragemini/themes/default/icons/ColorPalettes-Red-1.svg
+share/apps/calligragemini/themes/default/icons/ColorPalettes-gold-1.svg
+share/apps/calligragemini/themes/default/icons/Presentaton-Blue.svg
+share/apps/calligragemini/themes/default/icons/Presentaton-Gold.svg
+share/apps/calligragemini/themes/default/icons/Presentaton-Magenta.svg
+share/apps/calligragemini/themes/default/icons/Presentaton-Red.svg
+share/apps/calligragemini/themes/default/icons/SVG-AddComment-Inline-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Comment-DragHandle-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Exit-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-FXTransition-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-FillLabel-Green-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-FillLabel-Neutral-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-FillLabel-Red-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-FillLabel-Yellow-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Highlighter-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-IMGTOOLS-Brightness-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-IMGTOOLS-Contrast-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-IMGTOOLS-Crop-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-IMGTOOLS-ReplaceImage-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-IMGTOOLS-SliderHandle-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-IMGTOOLS-Sliders-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-IMGTOOLS-Transparency-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-IMGTOOLS-Wand-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-AddNote-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-AddPhotoComment-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-AddShape-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-AddSlide-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-AddVoiceComment-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-Animations-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-Bold-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-BulletList-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-Cloud-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-DesktopMode-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-Fill.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-Find-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-Help-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-Image.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-ImageAdjustment-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-Italic-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-Lines.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-MenuBack-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-MyDocuments-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-NewDocument-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-NewPresentation-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-NewSketch-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-NewSpreadsheet-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-NotesSummary-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-OK-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-Options-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-OptionsWhite-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-Pen.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-PlayPresentation-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-RecentDocuments-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-Shadow.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-SmallX.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-SpellCheck-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-TextAlignment-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-TextBox-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-TextStyle-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-Underline-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Label-Green-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Label-Red-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Label-SelectedRing-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Label-Yellow-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-LargeSelectedFill-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-NextSlide-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-NotesSummary-Counter-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Nudge-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Pointer-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-PreviousSlide-1.svg
+share/apps/calligragemini/themes/default/icons/add-black.svg
+share/apps/calligragemini/themes/default/icons/add.svg
+share/apps/calligragemini/themes/default/icons/apply-black.svg
+share/apps/calligragemini/themes/default/icons/apply.svg
+share/apps/calligragemini/themes/default/icons/back.svg
+share/apps/calligragemini/themes/default/icons/camera-black.svg
+share/apps/calligragemini/themes/default/icons/cancel-black.svg
+share/apps/calligragemini/themes/default/icons/checker-small.svg
+share/apps/calligragemini/themes/default/icons/close.svg
+share/apps/calligragemini/themes/default/icons/color_wheel.svg
+share/apps/calligragemini/themes/default/icons/colorpicker.svg
+share/apps/calligragemini/themes/default/icons/combo-arrows-white.svg
+share/apps/calligragemini/themes/default/icons/crop-black.svg
+share/apps/calligragemini/themes/default/icons/crop.svg
+share/apps/calligragemini/themes/default/icons/delete-black.svg
+share/apps/calligragemini/themes/default/icons/delete.svg
+share/apps/calligragemini/themes/default/icons/down.svg
+share/apps/calligragemini/themes/default/icons/edit.svg
+share/apps/calligragemini/themes/default/icons/erase.svg
+share/apps/calligragemini/themes/default/icons/fileclip-black.svg
+share/apps/calligragemini/themes/default/icons/fileclip.svg
+share/apps/calligragemini/themes/default/icons/filenew-black.svg
+share/apps/calligragemini/themes/default/icons/filenew.svg
+share/apps/calligragemini/themes/default/icons/fileopen-black.svg
+share/apps/calligragemini/themes/default/icons/fileopen.svg
+share/apps/calligragemini/themes/default/icons/filesave.svg
+share/apps/calligragemini/themes/default/icons/filesaveas.svg
+share/apps/calligragemini/themes/default/icons/fileshare.svg
+share/apps/calligragemini/themes/default/icons/fill-black.svg
+share/apps/calligragemini/themes/default/icons/fill.svg
+share/apps/calligragemini/themes/default/icons/filter_delete-black.svg
+share/apps/calligragemini/themes/default/icons/filter_load-black.svg
+share/apps/calligragemini/themes/default/icons/filter_save-black.svg
+share/apps/calligragemini/themes/default/icons/forward.svg
+share/apps/calligragemini/themes/default/icons/gradient-black.svg
+share/apps/calligragemini/themes/default/icons/gradient.svg
+share/apps/calligragemini/themes/default/icons/help.svg
+share/apps/calligragemini/themes/default/icons/intel-Words-Handle-cursor.svg
+share/apps/calligragemini/themes/default/icons/krita_sketch.svg
+share/apps/calligragemini/themes/default/icons/layer_filter-black.svg
+share/apps/calligragemini/themes/default/icons/layer_group-black.svg
+share/apps/calligragemini/themes/default/icons/layer_paint-black.svg
+share/apps/calligragemini/themes/default/icons/locked_off-black.svg
+share/apps/calligragemini/themes/default/icons/locked_off-small.svg
+share/apps/calligragemini/themes/default/icons/locked_on-black.svg
+share/apps/calligragemini/themes/default/icons/locked_on-small.svg
+share/apps/calligragemini/themes/default/icons/minimize.svg
+share/apps/calligragemini/themes/default/icons/mirror_c-black.svg
+share/apps/calligragemini/themes/default/icons/mirror_h-black.svg
+share/apps/calligragemini/themes/default/icons/mirror_v-black.svg
+share/apps/calligragemini/themes/default/icons/move-black.svg
+share/apps/calligragemini/themes/default/icons/move.svg
+share/apps/calligragemini/themes/default/icons/paint-black.svg
+share/apps/calligragemini/themes/default/icons/paint.svg
+share/apps/calligragemini/themes/default/icons/palette-add-black.svg
+share/apps/calligragemini/themes/default/icons/palette-black.svg
+share/apps/calligragemini/themes/default/icons/palette-delete-black.svg
+share/apps/calligragemini/themes/default/icons/palette.svg
+share/apps/calligragemini/themes/default/icons/redo.svg
+share/apps/calligragemini/themes/default/icons/select-add.svg
+share/apps/calligragemini/themes/default/icons/select-apply.svg
+share/apps/calligragemini/themes/default/icons/select-area.svg
+share/apps/calligragemini/themes/default/icons/select-color.svg
+share/apps/calligragemini/themes/default/icons/select-deselect.svg
+share/apps/calligragemini/themes/default/icons/select-hide.svg
+share/apps/calligragemini/themes/default/icons/select-intersect.svg
+share/apps/calligragemini/themes/default/icons/select-polygon.svg
+share/apps/calligragemini/themes/default/icons/select-rectangle.svg
+share/apps/calligragemini/themes/default/icons/select-replace.svg
+share/apps/calligragemini/themes/default/icons/select-reselect.svg
+share/apps/calligragemini/themes/default/icons/select-show.svg
+share/apps/calligragemini/themes/default/icons/select-sub.svg
+share/apps/calligragemini/themes/default/icons/settings.svg
+share/apps/calligragemini/themes/default/icons/switch.svg
+share/apps/calligragemini/themes/default/icons/transform-black.svg
+share/apps/calligragemini/themes/default/icons/transform.svg
+share/apps/calligragemini/themes/default/icons/undo.svg
+share/apps/calligragemini/themes/default/icons/up.svg
+share/apps/calligragemini/themes/default/icons/visible_off-black.svg
+share/apps/calligragemini/themes/default/icons/visible_off-small.svg
+share/apps/calligragemini/themes/default/icons/visible_off.svg
+share/apps/calligragemini/themes/default/icons/visible_on-black.svg
+share/apps/calligragemini/themes/default/icons/visible_on-small.svg
+share/apps/calligragemini/themes/default/icons/visible_on.svg
+share/apps/calligragemini/themes/default/icons/web.svg
+share/apps/calligragemini/themes/default/images/
+share/apps/calligragemini/themes/default/images/Sticker-A.svg
+share/apps/calligragemini/themes/default/images/Sticker-Apple.svg
+share/apps/calligragemini/themes/default/images/Sticker-ArrowTarget.svg
+share/apps/calligragemini/themes/default/images/Sticker-B.svg
+share/apps/calligragemini/themes/default/images/Sticker-C.svg
+share/apps/calligragemini/themes/default/images/Sticker-D.svg
+share/apps/calligragemini/themes/default/images/Sticker-F.svg
+share/apps/calligragemini/themes/default/images/Sticker-Feather.svg
+share/apps/calligragemini/themes/default/images/Sticker-Lightbulb.svg
+share/apps/calligragemini/themes/default/images/Sticker-OK.svg
+share/apps/calligragemini/themes/default/images/Sticker-Ribbon.svg
+share/apps/calligragemini/themes/default/images/Sticker-ThumbsUp.svg
+share/apps/calligragemini/themes/default/images/busyindicator.png
+share/apps/calligragemini/themes/default/images/divider.png
+share/apps/calligragemini/themes/default/images/drop-corners.png
+share/apps/calligragemini/themes/default/images/drop-shadows.png
+share/apps/calligragemini/themes/default/images/header_krita_sketch.png
+share/apps/calligragemini/themes/default/images/header_krita_sketch_light.png
+share/apps/calligragemini/themes/default/images/intel-Stage-Slide-PieChart-Default.svg
+share/apps/calligragemini/themes/default/images/intel-Stage-Slide-PieChart-PieceTappedOn.svg
+share/apps/calligragemini/themes/default/images/intel-Words-Note-Circle-Green.svg
+share/apps/calligragemini/themes/default/images/intel-Words-Note-Circle-Red.svg
+share/apps/calligragemini/themes/default/images/intel-Words-Note-Circle-Yellow.svg
+share/apps/calligragemini/themes/default/images/kritasketch.png
+share/apps/calligragemini/themes/default/images/shadow.png
+share/apps/calligragemini/themes/default/sizes.js
+share/apps/calligragemini/themes/default/theme.qml
 share/apps/cmake/modules/FindCalligraLibs.cmake
 share/apps/color-schemes/
-share/apps/color-schemes/Krita50.colors
 share/apps/color-schemes/KritaBlender.colors
 share/apps/color-schemes/KritaBright.colors
-share/apps/color-schemes/KritaBrighter.colors
 share/apps/color-schemes/KritaDark.colors
-share/apps/color-schemes/KritaDarker.colors
+share/apps/color-schemes/KritaNeutral.colors
 share/apps/flow/
 share/apps/flow/flow.rc
 share/apps/flow/icons/
@@ -5409,8 +5508,8 @@ share/apps/kexi/icons/hicolor/16x16/acti
 share/apps/kexi/icons/hicolor/16x16/actions/clear_table_contents.png
 share/apps/kexi/icons/hicolor/16x16/actions/close.png
 share/apps/kexi/icons/hicolor/16x16/actions/combo.png
+share/apps/kexi/icons/hicolor/16x16/actions/database-import.png
 share/apps/kexi/icons/hicolor/16x16/actions/delete_table_row.png
-share/apps/kexi/icons/hicolor/16x16/actions/document_import_database.png
 share/apps/kexi/icons/hicolor/16x16/actions/form.png
 share/apps/kexi/icons/hicolor/16x16/actions/form_action.png
 share/apps/kexi/icons/hicolor/16x16/actions/form_newobj.png
@@ -5438,12 +5537,9 @@ share/apps/kexi/icons/hicolor/16x16/acti
 share/apps/kexi/icons/hicolor/16x16/actions/report_newobj.png
 share/apps/kexi/icons/hicolor/16x16/actions/script.png
 share/apps/kexi/icons/hicolor/16x16/actions/script_newobj.png
-share/apps/kexi/icons/hicolor/16x16/actions/spring.png
-share/apps/kexi/icons/hicolor/16x16/actions/spring_vertical.png
 share/apps/kexi/icons/hicolor/16x16/actions/state_data.png
 share/apps/kexi/icons/hicolor/16x16/actions/state_edit.png
 share/apps/kexi/icons/hicolor/16x16/actions/state_sql.png
-share/apps/kexi/icons/hicolor/16x16/actions/state_text.png
 share/apps/kexi/icons/hicolor/16x16/actions/subform.png
 share/apps/kexi/icons/hicolor/16x16/actions/table.png
 share/apps/kexi/icons/hicolor/16x16/actions/table_newobj.png
@@ -5475,10 +5571,10 @@ share/apps/kexi/icons/hicolor/22x22/acti
 share/apps/kexi/icons/hicolor/22x22/actions/clear_table_contents.png
 share/apps/kexi/icons/hicolor/22x22/actions/close.png
 share/apps/kexi/icons/hicolor/22x22/actions/combo.png
+share/apps/kexi/icons/hicolor/22x22/actions/database-import.png
 share/apps/kexi/icons/hicolor/22x22/actions/dateedit.png
 share/apps/kexi/icons/hicolor/22x22/actions/datetimeedit.png
 share/apps/kexi/icons/hicolor/22x22/actions/delete_table_row.png
-share/apps/kexi/icons/hicolor/22x22/actions/document_import_database.png
 share/apps/kexi/icons/hicolor/22x22/actions/form.png
 share/apps/kexi/icons/hicolor/22x22/actions/form_action.png
 share/apps/kexi/icons/hicolor/22x22/actions/form_edit.png
@@ -5514,12 +5610,9 @@ share/apps/kexi/icons/hicolor/22x22/acti
 share/apps/kexi/icons/hicolor/22x22/actions/signalslot.png
 share/apps/kexi/icons/hicolor/22x22/actions/slider.png
 share/apps/kexi/icons/hicolor/22x22/actions/spin.png
-share/apps/kexi/icons/hicolor/22x22/actions/spring.png
-share/apps/kexi/icons/hicolor/22x22/actions/spring_vertical.png
 share/apps/kexi/icons/hicolor/22x22/actions/state_data.png
 share/apps/kexi/icons/hicolor/22x22/actions/state_edit.png
 share/apps/kexi/icons/hicolor/22x22/actions/state_sql.png
-share/apps/kexi/icons/hicolor/22x22/actions/state_text.png
 share/apps/kexi/icons/hicolor/22x22/actions/subform.png
 share/apps/kexi/icons/hicolor/22x22/actions/table.png
 share/apps/kexi/icons/hicolor/22x22/actions/table_newobj.png
@@ -5538,8 +5631,8 @@ share/apps/kexi/icons/hicolor/32x32/acti
 share/apps/kexi/icons/hicolor/32x32/actions/business_user.png
 share/apps/kexi/icons/hicolor/32x32/actions/clear_table_contents.png
 share/apps/kexi/icons/hicolor/32x32/actions/close.png
+share/apps/kexi/icons/hicolor/32x32/actions/database-import.png
 share/apps/kexi/icons/hicolor/32x32/actions/delete_table_row.png
-share/apps/kexi/icons/hicolor/32x32/actions/document_import_database.png
 share/apps/kexi/icons/hicolor/32x32/actions/form.png
 share/apps/kexi/icons/hicolor/32x32/actions/form_action.png
 share/apps/kexi/icons/hicolor/32x32/actions/form_newobj.png
@@ -5554,15 +5647,13 @@ share/apps/kexi/icons/hicolor/32x32/acti
 share/apps/kexi/icons/hicolor/32x32/actions/query_newobj.png
 share/apps/kexi/icons/hicolor/32x32/actions/report.png
 share/apps/kexi/icons/hicolor/32x32/actions/report_newobj.png
-share/apps/kexi/icons/hicolor/32x32/actions/spring.png
 share/apps/kexi/icons/hicolor/32x32/actions/state_data.png
 share/apps/kexi/icons/hicolor/32x32/actions/state_sql.png
-share/apps/kexi/icons/hicolor/32x32/actions/state_text.png
 share/apps/kexi/icons/hicolor/32x32/actions/table.png
 share/apps/kexi/icons/hicolor/32x32/actions/table_newobj.png
 share/apps/kexi/icons/hicolor/48x48/
 share/apps/kexi/icons/hicolor/48x48/actions/
-share/apps/kexi/icons/hicolor/48x48/actions/document_import_database.png
+share/apps/kexi/icons/hicolor/48x48/actions/database-import.png
 share/apps/kexi/icons/hicolor/48x48/actions/form_action.png
 share/apps/kexi/icons/hicolor/48x48/actions/key.png
 share/apps/kexi/icons/hicolor/64x64/
@@ -5591,8 +5682,13 @@ share/apps/kexi/icons/oxygen/16x16/mimet
 share/apps/kexi/icons/oxygen/16x16/mimetypes/application-x-kexiproject-sqlite3.png
 share/apps/kexi/icons/oxygen/16x16/mimetypes/application-x-sqlite2.png
 share/apps/kexi/icons/oxygen/16x16/mimetypes/application-x-sqlite3.png
+share/apps/kexi/icons/oxygen/16x16/places/
+share/apps/kexi/icons/oxygen/16x16/places/breeze-kexi-file-database.svgz
+share/apps/kexi/icons/oxygen/16x16/places/breeze-network-server-database.svgz
 share/apps/kexi/icons/oxygen/22x22/
 share/apps/kexi/icons/oxygen/22x22/actions/
+share/apps/kexi/icons/oxygen/22x22/actions/breeze-database-import.svgz
+share/apps/kexi/icons/oxygen/22x22/actions/breeze-kexi-document-empty.svgz
 share/apps/kexi/icons/oxygen/22x22/actions/data-source-tag.png
 share/apps/kexi/icons/oxygen/22x22/actions/table.png
 share/apps/kexi/icons/oxygen/22x22/mimetypes/
@@ -5603,8 +5699,14 @@ share/apps/kexi/icons/oxygen/22x22/mimet
 share/apps/kexi/icons/oxygen/22x22/mimetypes/application-x-kexiproject-sqlite3.png
 share/apps/kexi/icons/oxygen/22x22/mimetypes/application-x-sqlite2.png
 share/apps/kexi/icons/oxygen/22x22/mimetypes/application-x-sqlite3.png
+share/apps/kexi/icons/oxygen/22x22/places/
+share/apps/kexi/icons/oxygen/22x22/places/breeze-kexi-file-database.svgz
+share/apps/kexi/icons/oxygen/22x22/places/breeze-network-server-database.svgz
 share/apps/kexi/icons/oxygen/32x32/
 share/apps/kexi/icons/oxygen/32x32/actions/
+share/apps/kexi/icons/oxygen/32x32/actions/breeze-kexi-document-empty.svgz
+share/apps/kexi/icons/oxygen/32x32/actions/kexi-document-empty.png
+share/apps/kexi/icons/oxygen/32x32/actions/kexi-document-empty.svgz
 share/apps/kexi/icons/oxygen/32x32/actions/table.png
 share/apps/kexi/icons/oxygen/32x32/mimetypes/
 share/apps/kexi/icons/oxygen/32x32/mimetypes/application-x-kexi-connectiondata.png
@@ -5614,7 +5716,12 @@ share/apps/kexi/icons/oxygen/32x32/mimet
 share/apps/kexi/icons/oxygen/32x32/mimetypes/application-x-kexiproject-sqlite3.png
 share/apps/kexi/icons/oxygen/32x32/mimetypes/application-x-sqlite2.png
 share/apps/kexi/icons/oxygen/32x32/mimetypes/application-x-sqlite3.png
+share/apps/kexi/icons/oxygen/32x32/places/
+share/apps/kexi/icons/oxygen/32x32/places/breeze-kexi-file-database.svgz
+share/apps/kexi/icons/oxygen/32x32/places/breeze-network-server-database.svgz
 share/apps/kexi/icons/oxygen/48x48/
+share/apps/kexi/icons/oxygen/48x48/actions/
+share/apps/kexi/icons/oxygen/48x48/actions/kexi-document-empty.png
 share/apps/kexi/icons/oxygen/48x48/mimetypes/
 share/apps/kexi/icons/oxygen/48x48/mimetypes/application-x-kexi-connectiondata.png
 share/apps/kexi/icons/oxygen/48x48/mimetypes/application-x-kexiproject-shortcut.png
@@ -5624,6 +5731,8 @@ share/apps/kexi/icons/oxygen/48x48/mimet
 share/apps/kexi/icons/oxygen/48x48/mimetypes/application-x-sqlite2.png
 share/apps/kexi/icons/oxygen/48x48/mimetypes/application-x-sqlite3.png
 share/apps/kexi/icons/oxygen/64x64/
+share/apps/kexi/icons/oxygen/64x64/actions/
+share/apps/kexi/icons/oxygen/64x64/actions/kexi-document-empty.svgz
 share/apps/kexi/icons/oxygen/64x64/mimetypes/
 share/apps/kexi/icons/oxygen/64x64/mimetypes/application-x-kexi-connectiondata.png
 share/apps/kexi/icons/oxygen/64x64/mimetypes/application-x-kexiproject-shortcut.png
@@ -5677,15 +5786,13 @@ share/apps/kexi/pics/
 share/apps/kexi/pics/calligra-logo-black-glow.png
 share/apps/kexi/pics/calligra-logo-white-glow.png
 share/apps/kexi/pics/external-link.png
-share/apps/kexi/pics/kexi-logo-white.png
-share/apps/kexi/pics/kexi-logo.png
 share/apps/kexi/status/
-share/apps/kexi/status/2.8.6/
-share/apps/kexi/status/2.8.6/contribution_details.ui
-share/apps/kexi/status/2.8.6/contribution_help.ui
-share/apps/kexi/status/2.8.6/status.rcc
-share/apps/kexi/status/2.8.6/status.ui
-share/apps/kexi/status/2.8.6/status_strings.ui
+share/apps/kexi/status/2.9.0/
+share/apps/kexi/status/2.9.0/contribution_details.ui
+share/apps/kexi/status/2.9.0/contribution_help.ui
+share/apps/kexi/status/2.9.0/status.rcc
+share/apps/kexi/status/2.9.0/status.ui
+share/apps/kexi/status/2.9.0/status_strings.ui
 share/apps/koproperty/
 share/apps/koproperty/icons/
 share/apps/koproperty/icons/hicolor/
@@ -5693,6 +5800,28 @@ share/apps/koproperty/icons/hicolor/16x1
 share/apps/koproperty/icons/hicolor/16x16/actions/
 share/apps/koproperty/icons/hicolor/16x16/actions/button_no.png
 share/apps/krita/
+share/apps/krita/actions/
+share/apps/krita/actions/ArtisticTextToolFactoryID.action
+share/apps/krita/actions/InteractionTool.action
+share/apps/krita/actions/KisRulerAssistantTool.action
+share/apps/krita/actions/KisToolCrop.action
+share/apps/krita/actions/KisToolGrid.action
+share/apps/krita/actions/KisToolPath.action
+share/apps/krita/actions/KisToolPencil.action
+share/apps/krita/actions/KisToolPerspectiveGrid.action
+share/apps/krita/actions/KisToolPolygon.action
+share/apps/krita/actions/KisToolPolyline.action
+share/apps/krita/actions/KisToolSelectContiguous.action
+share/apps/krita/actions/KisToolSelectElliptical.action
+share/apps/krita/actions/KisToolSelectOutline.action
+share/apps/krita/actions/KisToolSelectPath.action
+share/apps/krita/actions/KisToolSelectPolygonal.action
+share/apps/krita/actions/KisToolSelectRectangular.action
+share/apps/krita/actions/KisToolSelectSimilar.action
+share/apps/krita/actions/KisToolTransform.action
+share/apps/krita/actions/PathToolFactoryId.action
+share/apps/krita/actions/TextToolFactory_ID.action
+share/apps/krita/actions/krita.action
 share/apps/krita/brushes/
 share/apps/krita/brushes/3_brush.png
 share/apps/krita/brushes/3_dotted-flat.png
@@ -5857,6 +5986,8 @@ share/apps/krita/brushes/z_study_pencil_
 share/apps/krita/brushes/z_study_pencil_2Hb.gih
 share/apps/krita/brushes/z_study_pencil_H.gih
 share/apps/krita/brushes/z_study_pencil_H_h.gih
+share/apps/krita/bundles/
+share/apps/krita/bundles/README
 share/apps/krita/defaultpresets/
 share/apps/krita/defaultpresets/chalkbrush.kpp
 share/apps/krita/defaultpresets/colorsmudge.kpp
@@ -5905,7 +6036,6 @@ share/apps/krita/icons/hicolor/128x128/
 share/apps/krita/icons/hicolor/128x128/actions/
 share/apps/krita/icons/hicolor/128x128/actions/template_comics_empty.png
 share/apps/krita/icons/hicolor/128x128/actions/template_dslr.png
-share/apps/krita/icons/hicolor/128x128/actions/template_film.png
 share/apps/krita/icons/hicolor/128x128/actions/template_texture.png
 share/apps/krita/images/
 share/apps/krita/images/krita-chalk.png
@@ -5943,17 +6073,28 @@ share/apps/krita/paintoppresets/Airbrush
 share/apps/krita/paintoppresets/Airbrush_linear_noisy.kpp
 share/apps/krita/paintoppresets/Airbrush_pressure.kpp
 share/apps/krita/paintoppresets/Basic_circle.kpp
-share/apps/krita/paintoppresets/Basic_circle_wet.kpp
+share/apps/krita/paintoppresets/Basic_mix.kpp
+share/apps/krita/paintoppresets/Basic_mix_soft.kpp
 share/apps/krita/paintoppresets/Basic_tip_default.kpp
 share/apps/krita/paintoppresets/Basic_tip_gaussian.kpp
 share/apps/krita/paintoppresets/Basic_tip_soft.kpp
+share/apps/krita/paintoppresets/Basic_wet.kpp
+share/apps/krita/paintoppresets/Basic_wet_soft.kpp
 share/apps/krita/paintoppresets/Block_basic.kpp
 share/apps/krita/paintoppresets/Block_bristles.kpp
 share/apps/krita/paintoppresets/Block_fuzzy.kpp
 share/apps/krita/paintoppresets/Block_mix_tilt.kpp
 share/apps/krita/paintoppresets/Block_tilt.kpp
+share/apps/krita/paintoppresets/Block_wet_tilt.kpp
+share/apps/krita/paintoppresets/Bristle_Details.kpp
+share/apps/krita/paintoppresets/Bristle_Large.kpp
+share/apps/krita/paintoppresets/Bristle_Special_Blender.kpp
+share/apps/krita/paintoppresets/Bristle_Squared.kpp
+share/apps/krita/paintoppresets/Bristle_Tapered.kpp
+share/apps/krita/paintoppresets/Bristle_Texture.kpp
 share/apps/krita/paintoppresets/Bristle_frottis.kpp
 share/apps/krita/paintoppresets/Bristles_hairy.kpp
+share/apps/krita/paintoppresets/Bristles_mix.kpp
 share/apps/krita/paintoppresets/Bristles_textured.kpp
 share/apps/krita/paintoppresets/Bristles_wet.kpp
 share/apps/krita/paintoppresets/Chalk_brush.kpp
@@ -5974,12 +6115,6 @@ share/apps/krita/paintoppresets/FX_splat
 share/apps/krita/paintoppresets/Fill_block.kpp
 share/apps/krita/paintoppresets/Fill_circle.kpp
 share/apps/krita/paintoppresets/Grid_square_25.kpp
-share/apps/krita/paintoppresets/Hairy_Details.kpp
-share/apps/krita/paintoppresets/Hairy_Large.kpp
-share/apps/krita/paintoppresets/Hairy_Special_Blender.kpp
-share/apps/krita/paintoppresets/Hairy_Squared.kpp
-share/apps/krita/paintoppresets/Hairy_Tapered.kpp
-share/apps/krita/paintoppresets/Hairy_Texture.kpp
 share/apps/krita/paintoppresets/Hatch_crispy.kpp
 share/apps/krita/paintoppresets/Hatch_cross_regular.kpp
 share/apps/krita/paintoppresets/Hatch_cross_small.kpp
@@ -5999,14 +6134,6 @@ share/apps/krita/paintoppresets/Layout_b
 share/apps/krita/paintoppresets/Layout_circle_soft.kpp
 share/apps/krita/paintoppresets/Layout_oval.kpp
 share/apps/krita/paintoppresets/Layout_pen.kpp
-share/apps/krita/paintoppresets/Mix_dull.kpp
-share/apps/krita/paintoppresets/Mix_smear.kpp
-share/apps/krita/paintoppresets/Mix_smear_soft.kpp
-share/apps/krita/paintoppresets/Mixover_dull.kpp
-share/apps/krita/paintoppresets/Mixover_dull_bristle_soft.kpp
-share/apps/krita/paintoppresets/Mixover_dull_bristles.kpp
-share/apps/krita/paintoppresets/Mixover_oil.kpp
-share/apps/krita/paintoppresets/Mixover_smear.kpp
 share/apps/krita/paintoppresets/Move_tool.kpp
 share/apps/krita/paintoppresets/Pastel_texture_large.kpp
 share/apps/krita/paintoppresets/Pastel_texture_thin.kpp
@@ -6036,12 +6163,15 @@ share/apps/krita/paintoppresets/Smudge_r
 share/apps/krita/paintoppresets/Smudge_rake_2.kpp
 share/apps/krita/paintoppresets/Smudge_soft.kpp
 share/apps/krita/paintoppresets/Smudge_textured.kpp
+share/apps/krita/paintoppresets/Sparkle_wet.kpp
+share/apps/krita/paintoppresets/Sparkle_wet_soft.kpp
 share/apps/krita/paintoppresets/Special_FuzzyColor.kpp
 share/apps/krita/paintoppresets/Special_dyna_dots.kpp
 share/apps/krita/paintoppresets/Special_particles_crazy.kpp
 share/apps/krita/paintoppresets/Splat_mix_cells.kpp
 share/apps/krita/paintoppresets/Splat_texture.kpp
 share/apps/krita/paintoppresets/Splat_texture_2.kpp
+share/apps/krita/paintoppresets/Splat_wet_cells.kpp
 share/apps/krita/paintoppresets/Splatter_thin.kpp
 share/apps/krita/paintoppresets/Sponge_texture.kpp
 share/apps/krita/paintoppresets/Spray_splat.kpp
@@ -6135,6 +6265,8 @@ share/apps/krita/pics/
 share/apps/krita/pics/AboutKrita.png
 share/apps/krita/pics/addlayer.png
 share/apps/krita/pics/addtofolder.png
+share/apps/krita/pics/arrow-down.png
+share/apps/krita/pics/arrow-right.png
 share/apps/krita/pics/arrow_east.png
 share/apps/krita/pics/arrow_north.png
 share/apps/krita/pics/arrow_north_east.png
@@ -6154,12 +6286,72 @@ share/apps/krita/pics/cursor-cross.xpm
 share/apps/krita/pics/cursor-round.xpm
 share/apps/krita/pics/cursor-triangle_lefthanded.xpm
 share/apps/krita/pics/cursor-triangle_righthanded.xpm
+share/apps/krita/pics/dark_addlayer.png
+share/apps/krita/pics/dark_addtofolder.png
+share/apps/krita/pics/dark_arrowdown.png
+share/apps/krita/pics/dark_arrowupblr.png
+share/apps/krita/pics/dark_calligraphy.png
+share/apps/krita/pics/dark_deletelayer.png
+share/apps/krita/pics/dark_draw-text.png
+share/apps/krita/pics/dark_duplicatelayer.png
+share/apps/krita/pics/dark_format-fill-color.png
+share/apps/krita/pics/dark_krita_draw_path.png
+share/apps/krita/pics/dark_krita_tool_color_fill.png
+share/apps/krita/pics/dark_krita_tool_color_picker.png
+share/apps/krita/pics/dark_krita_tool_dyna.png
+share/apps/krita/pics/dark_krita_tool_editpath.png
+share/apps/krita/pics/dark_krita_tool_ellipse.png
+share/apps/krita/pics/dark_krita_tool_freehand.png
+share/apps/krita/pics/dark_krita_tool_freehandvector.png
+share/apps/krita/pics/dark_krita_tool_gradient.png
+share/apps/krita/pics/dark_krita_tool_grid.png
+share/apps/krita/pics/dark_krita_tool_line.png
+share/apps/krita/pics/dark_krita_tool_measure.png
+share/apps/krita/pics/dark_krita_tool_move.png
+share/apps/krita/pics/dark_krita_tool_multihand.png
+share/apps/krita/pics/dark_krita_tool_rectangle.png
+share/apps/krita/pics/dark_krita_tool_ruler_assistant.png
+share/apps/krita/pics/dark_krita_tool_transform.png
+share/apps/krita/pics/dark_pattern.png
+share/apps/krita/pics/dark_polyline.png
+share/apps/krita/pics/dark_properties.png
+share/apps/krita/pics/dark_removefromfolder.png
+share/apps/krita/pics/dark_select.png
+share/apps/krita/pics/dark_selection-mode_ants.png
+share/apps/krita/pics/dark_selection-mode_invisible.png
+share/apps/krita/pics/dark_selection-mode_mask.png
+share/apps/krita/pics/dark_symmetry-horizontal.png
+share/apps/krita/pics/dark_symmetry-vertical.png
+share/apps/krita/pics/dark_tool_contiguous_selection.png
+share/apps/krita/pics/dark_tool_crop.png
+share/apps/krita/pics/dark_tool_elliptical_selection.png
+share/apps/krita/pics/dark_tool_outline_selection.png
+share/apps/krita/pics/dark_tool_path_selection.png
+share/apps/krita/pics/dark_tool_perspectivegrid.png
+share/apps/krita/pics/dark_tool_polygon.png
+share/apps/krita/pics/dark_tool_polygonal_selection.png
+share/apps/krita/pics/dark_tool_rect_selection.png
+share/apps/krita/pics/dark_tool_similar_selection.png
+share/apps/krita/pics/dark_transform_icons_cage.png
+share/apps/krita/pics/dark_transform_icons_liquify_erase.png
+share/apps/krita/pics/dark_transform_icons_liquify_main.png
+share/apps/krita/pics/dark_transform_icons_liquify_move.png
+share/apps/krita/pics/dark_transform_icons_liquify_offset.png
+share/apps/krita/pics/dark_transform_icons_liquify_resize.png
+share/apps/krita/pics/dark_transform_icons_liquify_rotate.png
+share/apps/krita/pics/dark_transform_icons_liquify_rotateCCW.png
+share/apps/krita/pics/dark_transform_icons_main.png
+share/apps/krita/pics/dark_transform_icons_penPressure.png
+share/apps/krita/pics/dark_transform_icons_perspective.png
+share/apps/krita/pics/dark_transform_icons_warp.png
 share/apps/krita/pics/delete.png
 share/apps/krita/pics/deletelayer.png
 share/apps/krita/pics/duplicatelayer.png
 share/apps/krita/pics/eraser-toggle.png
+share/apps/krita/pics/exposure-cursor-gesture.xpm
 share/apps/krita/pics/extended_color_selector.png
 share/apps/krita/pics/folder.png
+share/apps/krita/pics/gamma-cursor-gesture.xpm
 share/apps/krita/pics/height.png
 share/apps/krita/pics/height_icon.png
 share/apps/krita/pics/hi16-add_dialog.png
@@ -6173,7 +6365,6 @@ share/apps/krita/pics/krita_tool_color_f
 share/apps/krita/pics/krita_tool_color_picker.png
 share/apps/krita/pics/krita_tool_dyna.png
 share/apps/krita/pics/krita_tool_ellipse.png
-share/apps/krita/pics/krita_tool_freehand.png
 share/apps/krita/pics/krita_tool_freehandvector.png
 share/apps/krita/pics/krita_tool_gradient.png
 share/apps/krita/pics/krita_tool_grid.png
@@ -6186,14 +6377,77 @@ share/apps/krita/pics/krita_tool_ruler_a
 share/apps/krita/pics/krita_tool_transform.png
 share/apps/krita/pics/krita_tool_transform_recursive.png
 share/apps/krita/pics/landscape.png
+share/apps/krita/pics/light_addlayer.png
+share/apps/krita/pics/light_addtofolder.png
+share/apps/krita/pics/light_arrowdown.png
+share/apps/krita/pics/light_arrowupblr.png
+share/apps/krita/pics/light_calligraphy.png
+share/apps/krita/pics/light_deletelayer.png
+share/apps/krita/pics/light_draw-text.png
+share/apps/krita/pics/light_duplicatelayer.png
+share/apps/krita/pics/light_format-fill-color.png
+share/apps/krita/pics/light_krita_draw_path.png
+share/apps/krita/pics/light_krita_tool_color_fill.png
+share/apps/krita/pics/light_krita_tool_color_picker.png
+share/apps/krita/pics/light_krita_tool_dyna.png
+share/apps/krita/pics/light_krita_tool_editpath.png
+share/apps/krita/pics/light_krita_tool_ellipse.png
+share/apps/krita/pics/light_krita_tool_freehand.png
+share/apps/krita/pics/light_krita_tool_freehandvector.png
+share/apps/krita/pics/light_krita_tool_gradient.png
+share/apps/krita/pics/light_krita_tool_grid.png
+share/apps/krita/pics/light_krita_tool_line.png
+share/apps/krita/pics/light_krita_tool_measure.png
+share/apps/krita/pics/light_krita_tool_move.png
+share/apps/krita/pics/light_krita_tool_multihand.png
+share/apps/krita/pics/light_krita_tool_rectangle.png
+share/apps/krita/pics/light_krita_tool_ruler_assistant.png
+share/apps/krita/pics/light_krita_tool_transform.png
+share/apps/krita/pics/light_pattern.png
+share/apps/krita/pics/light_polyline.png
+share/apps/krita/pics/light_properties.png
+share/apps/krita/pics/light_removefromfolder.png
+share/apps/krita/pics/light_select.png
+share/apps/krita/pics/light_selection-mode_ants.png
+share/apps/krita/pics/light_selection-mode_invisible.png
+share/apps/krita/pics/light_selection-mode_mask.png
+share/apps/krita/pics/light_symmetry-horizontal.png
+share/apps/krita/pics/light_symmetry-vertical.png
+share/apps/krita/pics/light_tool_contiguous_selection.png
+share/apps/krita/pics/light_tool_crop.png
+share/apps/krita/pics/light_tool_elliptical_selection.png
+share/apps/krita/pics/light_tool_outline_selection.png
+share/apps/krita/pics/light_tool_path_selection.png
+share/apps/krita/pics/light_tool_perspectivegrid.png
+share/apps/krita/pics/light_tool_polygon.png
+share/apps/krita/pics/light_tool_polygonal_selection.png
+share/apps/krita/pics/light_tool_rect_selection.png
+share/apps/krita/pics/light_tool_similar_selection.png
+share/apps/krita/pics/light_transform_icons_cage.png
+share/apps/krita/pics/light_transform_icons_liquify_erase.png
+share/apps/krita/pics/light_transform_icons_liquify_main.png
+share/apps/krita/pics/light_transform_icons_liquify_move.png
+share/apps/krita/pics/light_transform_icons_liquify_offset.png
+share/apps/krita/pics/light_transform_icons_liquify_resize.png
+share/apps/krita/pics/light_transform_icons_liquify_rotate.png
+share/apps/krita/pics/light_transform_icons_liquify_rotateCCW.png
+share/apps/krita/pics/light_transform_icons_main.png
+share/apps/krita/pics/light_transform_icons_penPressure.png
+share/apps/krita/pics/light_transform_icons_perspective.png
+share/apps/krita/pics/light_transform_icons_warp.png
 share/apps/krita/pics/linked.png
+share/apps/krita/pics/linked2.png
 share/apps/krita/pics/local_selection_active.png
 share/apps/krita/pics/local_selection_inactive.png
 share/apps/krita/pics/locked.png
+share/apps/krita/pics/mirrorAxis-HorizontalMove.png
+share/apps/krita/pics/mirrorAxis-VerticalMove.png
 share/apps/krita/pics/newlayer.png
 share/apps/krita/pics/novisible.png
 share/apps/krita/pics/offset_horizontal.png
 share/apps/krita/pics/offset_vertical.png
+share/apps/krita/pics/onionA.png
+share/apps/krita/pics/onionB.png
 share/apps/krita/pics/paintop_presets_disabled.png
 share/apps/krita/pics/paintop_settings_01.png
 share/apps/krita/pics/paintop_settings_02.png
@@ -6201,15 +6455,14 @@ share/apps/krita/pics/paintop_settings_d
 share/apps/krita/pics/polyline.png
 share/apps/krita/pics/portrait.png
 share/apps/krita/pics/precise-pick-layer-icon.xpm
-share/apps/krita/pics/properties.png
 share/apps/krita/pics/ratio_icon.png
+share/apps/krita/pics/reload_preset.png
 share/apps/krita/pics/removefromfolder.png
 share/apps/krita/pics/rotate_cursor.xpm
 share/apps/krita/pics/rotate_discrete.xpm
 share/apps/krita/pics/rotate_smooth.xpm
 share/apps/krita/pics/select_pixel.png
 share/apps/krita/pics/select_shape.png
-share/apps/krita/pics/selection-info.png
 share/apps/krita/pics/selection_add.png
 share/apps/krita/pics/selection_exclude.png
 share/apps/krita/pics/selection_intersect.png
@@ -6218,11 +6471,8 @@ share/apps/krita/pics/selection_subtract
 share/apps/krita/pics/shade.png
 share/apps/krita/pics/shear_horizontal.png
 share/apps/krita/pics/shear_vertical.png
-share/apps/krita/pics/symmetry-horyzontal.png
-share/apps/krita/pics/symmetry-vertical.png
+share/apps/krita/pics/sidebaricon.png
 share/apps/krita/pics/tablet.png
-share/apps/krita/pics/tool_brush_selection.png
-share/apps/krita/pics/tool_brush_selection_cursor.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
@@ -6236,8 +6486,6 @@ share/apps/krita/pics/tool_fill_cursor.p
 share/apps/krita/pics/tool_freehand_cursor.png
 share/apps/krita/pics/tool_gradient_cursor.png
 share/apps/krita/pics/tool_line_cursor.png
-share/apps/krita/pics/tool_magneticoutline_selection.png
-share/apps/krita/pics/tool_magneticoutline_selection_cursor.png
 share/apps/krita/pics/tool_outline_selection.png
 share/apps/krita/pics/tool_outline_selection_cursor.png
 share/apps/krita/pics/tool_path_selection.png
@@ -6282,20 +6530,38 @@ share/apps/krita/predefined_image_sizes/
 share/apps/krita/predefined_image_sizes/A5__600_ppi_.predefinedimage
 share/apps/krita/predefined_image_sizes/A6__300_ppi_.predefinedimage
 share/apps/krita/predefined_image_sizes/A6__600_ppi_.predefinedimage
+share/apps/krita/predefined_image_sizes/Texture_1024x1024.predefinedimage
+share/apps/krita/predefined_image_sizes/Texture_2048x2048.predefinedimage
+share/apps/krita/predefined_image_sizes/Texture_256x256.predefinedimage
+share/apps/krita/predefined_image_sizes/Texture_4096x4096.predefinedimage
+share/apps/krita/predefined_image_sizes/Texture_512x512.predefinedimage
+share/apps/krita/predefined_image_sizes/US_Legal__300_ppi_.predefinedimage
+share/apps/krita/predefined_image_sizes/US_Letter__300_ppi_.predefinedimage
+share/apps/krita/predefined_image_sizes/US_Tabloid__300_ppi_.predefinedimage
 share/apps/krita/shaders/
 share/apps/krita/shaders/bilinear_gradient.frag
 share/apps/krita/shaders/conical_gradient.frag
 share/apps/krita/shaders/conical_symetric_gradient.frag
 share/apps/krita/shaders/cursor.frag
 share/apps/krita/shaders/cursor.vert
-share/apps/krita/shaders/highq_downscale.frag
+share/apps/krita/shaders/highq_downscale_main.frag.inc
+share/apps/krita/shaders/highq_downscale_main_ocio.frag.inc
+share/apps/krita/shaders/highq_downscale_preface.frag.inc
 share/apps/krita/shaders/linear_gradient.frag
 share/apps/krita/shaders/matrix_transform.vert
 share/apps/krita/shaders/matrix_transform_legacy.vert
 share/apps/krita/shaders/radial_gradient.frag
 share/apps/krita/shaders/simple_texture.frag
 share/apps/krita/shaders/simple_texture_legacy.frag
+share/apps/krita/shaders/simple_texture_legacy_main.frag.inc
+share/apps/krita/shaders/simple_texture_legacy_main_ocio.frag.inc
+share/apps/krita/shaders/simple_texture_legacy_preface.frag.inc
+share/apps/krita/shaders/simple_texture_main.frag.inc
+share/apps/krita/shaders/simple_texture_main_ocio.frag.inc
+share/apps/krita/shaders/simple_texture_preface.frag.inc
 share/apps/krita/shaders/square_gradient.frag
+share/apps/krita/tags/
+share/apps/krita/tags/kis_paintoppresets_tags.xml
 share/apps/krita/templates/
 share/apps/krita/templates/comics/
 share/apps/krita/templates/comics/.directory
@@ -6316,11 +6582,13 @@ share/apps/krita/templates/design/.sourc
 share/apps/krita/templates/design/.source/DesignpresentationA3Landscape_4960x3508_300dpiRGB_8bit_.kra
 share/apps/krita/templates/design/.source/DesignpresentationA4portrait_2480x3508_300dpiRGB_8bit_.kra
 share/apps/krita/templates/design/.source/Designscreen4_3_2250x1680_96dpiRGB_8bit_.kra
+share/apps/krita/templates/design/.source/web_design.kra
 share/apps/krita/templates/design/Designcinema16_10_2484x1200_96dpiRGB_8bit_.desktop
 share/apps/krita/templates/design/Designcinema2.39_1_2484x1040_96dpiRGB_8bit_.desktop
 share/apps/krita/templates/design/DesignpresentationA3Landscape_4960x3508_300dpiRGB_8bit_.desktop
 share/apps/krita/templates/design/DesignpresentationA4portrait_2480x3508_300dpiRGB_8bit_.desktop
 share/apps/krita/templates/design/Designscreen4_3_2250x1680_96dpiRGB_8bit_.desktop
+share/apps/krita/templates/design/web_design.desktop
 share/apps/krita/templates/dslr/
 share/apps/krita/templates/dslr/.directory
 share/apps/krita/templates/dslr/.source/
@@ -6334,102 +6602,71 @@ share/apps/krita/templates/dslr/Canon_5D
 share/apps/krita/templates/dslr/Nikon_D3000_3872x2592.desktop
 share/apps/krita/templates/dslr/Nikon_D5000_4288x2848.desktop
 share/apps/krita/templates/dslr/Nikon_D7000_4928x3264.desktop
-share/apps/krita/templates/film/
-share/apps/krita/templates/film/.directory
-share/apps/krita/templates/film/.source/
-share/apps/krita/templates/film/.source/1K_super35_fullAp_1024x778.kra
-share/apps/krita/templates/film/.source/2K_super35_fullAp_2048x1556.kra
-share/apps/krita/templates/film/.source/4K_super35_fullAp_4096x3112.kra
-share/apps/krita/templates/film/.source/HD_720p_1280x720.kra
-share/apps/krita/templates/film/.source/HD_full_1920x1080.kra
-share/apps/krita/templates/film/.source/HD_half_960x540.kra
-share/apps/krita/templates/film/1K_super35_fullAp_1024x778.desktop
-share/apps/krita/templates/film/2K_super35_fullAp_2048x1556.desktop
-share/apps/krita/templates/film/4K_super35_fullAp_4096x3112.desktop
-share/apps/krita/templates/film/HD_720p_1280x720.desktop
-share/apps/krita/templates/film/HD_full_1920x1080.desktop
-share/apps/krita/templates/film/HD_half_960x540.desktop
 share/apps/krita/templates/texture/
 share/apps/krita/templates/texture/.directory
 share/apps/krita/templates/texture/.source/
-share/apps/krita/templates/texture/.source/Texture1k16bitfloatrgb.kra
-share/apps/krita/templates/texture/.source/Texture1k16bitscalar.kra
+share/apps/krita/templates/texture/.source/Texture1024x10248bitsrgb.kra
 share/apps/krita/templates/texture/.source/Texture1k32bitscalar.kra
 share/apps/krita/templates/texture/.source/Texture1k8bitsrgb.kra
-share/apps/krita/templates/texture/.source/Texture2k16bitfloatrgb.kra
-share/apps/krita/templates/texture/.source/Texture2k16bitscalar.kra
+share/apps/krita/templates/texture/.source/Texture2048x20488bitsrgb.kra
+share/apps/krita/templates/texture/.source/Texture256x2568bitsrgb.kra
 share/apps/krita/templates/texture/.source/Texture2k32bitscalar.kra
 share/apps/krita/templates/texture/.source/Texture2k8bitsrgb.kra
-share/apps/krita/templates/texture/.source/Texture4k16bitfloatrgb.kra
-share/apps/krita/templates/texture/.source/Texture4k16bitscalar.kra
+share/apps/krita/templates/texture/.source/Texture4096x40968bitsrgb.kra
 share/apps/krita/templates/texture/.source/Texture4k32bitscalar.kra
 share/apps/krita/templates/texture/.source/Texture4k8bitsrgb.kra
+share/apps/krita/templates/texture/.source/Texture512x5128bitsrgb.kra
+share/apps/krita/templates/texture/.source/Texture8k32bitscalar.kra
 share/apps/krita/templates/texture/.source/Texture8k8bitsrgb.kra
-share/apps/krita/templates/texture/Texture1k16bitfloatrgb.desktop
-share/apps/krita/templates/texture/Texture1k16bitscalar.desktop
+share/apps/krita/templates/texture/Texture1024x10248bitsrgb.desktop
 share/apps/krita/templates/texture/Texture1k32bitscalar.desktop
 share/apps/krita/templates/texture/Texture1k8bitsrgb.desktop
-share/apps/krita/templates/texture/Texture2k16bitfloatrgb.desktop
-share/apps/krita/templates/texture/Texture2k16bitscalar.desktop
+share/apps/krita/templates/texture/Texture2048x20488bitsrgb.desktop
+share/apps/krita/templates/texture/Texture256x2568bitsrgb.desktop
 share/apps/krita/templates/texture/Texture2k32bitscalar.desktop
 share/apps/krita/templates/texture/Texture2k8bitsrgb.desktop
-share/apps/krita/templates/texture/Texture4k16bitfloatrgb.desktop
-share/apps/krita/templates/texture/Texture4k16bitscalar.desktop
+share/apps/krita/templates/texture/Texture4096x40968bitsrgb.desktop
 share/apps/krita/templates/texture/Texture4k32bitscalar.desktop
 share/apps/krita/templates/texture/Texture4k8bitsrgb.desktop
-share/apps/krita/templates/texture/Texture8k16bitfloatrgb.desktop
-share/apps/krita/templates/texture/Texture8k16bitscalar.desktop
+share/apps/krita/templates/texture/Texture512x5128bitsrgb.desktop
 share/apps/krita/templates/texture/Texture8k32bitscalar.desktop
 share/apps/krita/templates/texture/Texture8k8bitsrgb.desktop
 share/apps/krita/workspaces/
-share/apps/krita/workspaces/Default.kws
-share/apps/krita/workspaces/PaintingHD.kws
-share/apps/krita/workspaces/PaintingHD_2Panels.kws
-share/apps/krita/workspaces/PaintingSD.kws
-share/apps/krita/workspaces/VectorHD.kws
-share/apps/krita/workspaces/VectorSD.kws
+share/apps/krita/workspaces/Big_Paint.kws
+share/apps/krita/workspaces/Big_Paint_2.kws
+share/apps/krita/workspaces/Big_Vector.kws
+share/apps/krita/workspaces/Small_Paint.kws
+share/apps/krita/workspaces/Small_Vector.kws
+share/apps/krita/workspaces/VFX_Paint.kws
+share/apps/kritaanimation/
+share/apps/kritaanimation/input/
+share/apps/kritaanimation/input/kritadefault.profile
 share/apps/kritagemini/
 share/apps/kritagemini/input/
 share/apps/kritagemini/input/kritadefault.profile
-share/apps/kritagemini/kritagemini.qml
 share/apps/kritaplugins/
 share/apps/kritaplugins/bigbrother.rc
 share/apps/kritaplugins/clonesarray.rc
 share/apps/kritaplugins/colorrange.rc
 share/apps/kritaplugins/colorspaceconversion.rc
-share/apps/kritaplugins/dropshadow.rc
 share/apps/kritaplugins/gmic.rc
 share/apps/kritaplugins/histogram.rc
 share/apps/kritaplugins/imageseparate.rc
 share/apps/kritaplugins/imagesize.rc
 share/apps/kritaplugins/imagesplit.rc
+share/apps/kritaplugins/layersplit.rc
 share/apps/kritaplugins/metadataeditor/
 share/apps/kritaplugins/metadataeditor.rc
 share/apps/kritaplugins/metadataeditor/dublincore.rc
-share/apps/kritaplugins/metadataeditor/dublincore.ui
 share/apps/kritaplugins/metadataeditor/exif.rc
-share/apps/kritaplugins/metadataeditor/exif.ui
 share/apps/kritaplugins/modify_selection.rc
 share/apps/kritaplugins/offsetimage.rc
+share/apps/kritaplugins/resourcemanager.rc
 share/apps/kritaplugins/rotateimage.rc
 share/apps/kritaplugins/shearimage.rc
 share/apps/kritasketch/
-share/apps/kritasketch/fonts/
-share/apps/kritasketch/fonts/SourceSansPro-Black.otf
-share/apps/kritasketch/fonts/SourceSansPro-BlackIt.otf
-share/apps/kritasketch/fonts/SourceSansPro-Bold.otf
-share/apps/kritasketch/fonts/SourceSansPro-BoldIt.otf
-share/apps/kritasketch/fonts/SourceSansPro-ExtraLight.otf
-share/apps/kritasketch/fonts/SourceSansPro-ExtraLightIt.otf
-share/apps/kritasketch/fonts/SourceSansPro-It.otf
-share/apps/kritasketch/fonts/SourceSansPro-Light.otf
-share/apps/kritasketch/fonts/SourceSansPro-LightIt.otf
-share/apps/kritasketch/fonts/SourceSansPro-Regular.otf
-share/apps/kritasketch/fonts/SourceSansPro-Semibold.otf
-share/apps/kritasketch/fonts/SourceSansPro-SemiboldIt.otf
 share/apps/kritasketch/input/
 share/apps/kritasketch/input/kritadefault.profile
-share/apps/kritasketch/kritasketch.qml
 share/apps/musicshape/
 share/apps/musicshape/fonts/
 share/apps/musicshape/fonts/Emmentaler-14.ttf
@@ -6791,6 +7028,10 @@ share/apps/stage/icons/hicolor/64x64/act
 share/apps/stage/icons/hicolor/64x64/actions/zoom_animation.png
 share/apps/stage/icons/hicolor/scalable/
 share/apps/stage/icons/hicolor/scalable/actions/
+share/apps/stage/icons/hicolor/scalable/actions/cohere-blue.svgz
+share/apps/stage/icons/hicolor/scalable/actions/cohere-gold.svgz
+share/apps/stage/icons/hicolor/scalable/actions/cohere-magenta.svgz
+share/apps/stage/icons/hicolor/scalable/actions/cohere-red.svgz
 share/apps/stage/icons/hicolor/scalable/actions/template_emptylandscape.svgz
 share/apps/stage/pics/
 share/apps/stage/pics/layout-elements.svg
@@ -6818,6 +7059,10 @@ share/apps/stage/templates/odf/.source/
 share/apps/stage/templates/odf/.source/blue_orange_vector.otp
 share/apps/stage/templates/odf/.source/burning_desire.otp
 share/apps/stage/templates/odf/.source/business.otp
+share/apps/stage/templates/odf/.source/cohere-blue.otp
+share/apps/stage/templates/odf/.source/cohere-gold.otp
+share/apps/stage/templates/odf/.source/cohere-magenta.otp
+share/apps/stage/templates/odf/.source/cohere-red.otp
 share/apps/stage/templates/odf/.source/curious_penguin.otp
 share/apps/stage/templates/odf/.source/flood_light.otp
 share/apps/stage/templates/odf/.source/kde_events.otp
@@ -6830,9 +7075,33 @@ share/apps/stage/templates/odf/.source/s
 share/apps/stage/templates/odf/.source/skyline_night.otp
 share/apps/stage/templates/odf/.source/skyline_night_wide.otp
 share/apps/stage/templates/odf/.source/strange_far_hills.otp
+share/apps/stage/templates/odf/.thumbnail/
+share/apps/stage/templates/odf/.thumbnail/blue_orange_vector.png
+share/apps/stage/templates/odf/.thumbnail/burning_desire.png
+share/apps/stage/templates/odf/.thumbnail/business.png
+share/apps/stage/templates/odf/.thumbnail/cohere-blue.png
+share/apps/stage/templates/odf/.thumbnail/cohere-gold.png
+share/apps/stage/templates/odf/.thumbnail/cohere-magenta.png
+share/apps/stage/templates/odf/.thumbnail/cohere-red.png
+share/apps/stage/templates/odf/.thumbnail/curious_penguin.png
+share/apps/stage/templates/odf/.thumbnail/flood_light.png
+share/apps/stage/templates/odf/.thumbnail/kde_events.png
+share/apps/stage/templates/odf/.thumbnail/rounded_square.png
+share/apps/stage/templates/odf/.thumbnail/simple_waves.png
+share/apps/stage/templates/odf/.thumbnail/skyline_monotone.png
+share/apps/stage/templates/odf/.thumbnail/skyline_monotone_wide.png
+share/apps/stage/templates/odf/.thumbnail/skyline_morning.png
+share/apps/stage/templates/odf/.thumbnail/skyline_morning_wide.png
+share/apps/stage/templates/odf/.thumbnail/skyline_night.png
+share/apps/stage/templates/odf/.thumbnail/skyline_night_wide.png
+share/apps/stage/templates/odf/.thumbnail/strange_far_hills.png
 share/apps/stage/templates/odf/blue_orange_vector.desktop
 share/apps/stage/templates/odf/burning_desire.desktop
 share/apps/stage/templates/odf/business.desktop
+share/apps/stage/templates/odf/cohere-blue.desktop
+share/apps/stage/templates/odf/cohere-gold.desktop
+share/apps/stage/templates/odf/cohere-magenta.desktop
+share/apps/stage/templates/odf/cohere-red.desktop
 share/apps/stage/templates/odf/curious_penguin.desktop
 share/apps/stage/templates/odf/flood_light.desktop
 share/apps/stage/templates/odf/kde_events.desktop
@@ -6886,6 +7155,11 @@ share/apps/words/templates/Normal/.sourc
 share/apps/words/templates/Normal/.source/FaxLetter.odt
 share/apps/words/templates/Normal/.source/ProfessionalA4.odt
 share/apps/words/templates/Normal/.source/ProfessionalLetter.odt
+share/apps/words/templates/Normal/.thumbnail/
+share/apps/words/templates/Normal/.thumbnail/a4.png
+share/apps/words/templates/Normal/.thumbnail/colorful.png
+share/apps/words/templates/Normal/.thumbnail/fax.png
+share/apps/words/templates/Normal/.thumbnail/professional.png
 share/apps/words/templates/Normal/A4.desktop
 share/apps/words/templates/Normal/ColorfulA4.desktop
 share/apps/words/templates/Normal/ColorfulLetter.desktop
@@ -6912,20 +7186,64 @@ share/calligraactive/qml/RecentFiles.qml
 share/calligraactive/qml/SlideSelector.qml
 share/calligraactive/qml/SpreadsheetLeftToolbar.qml
 share/calligraactive/qml/SpreadsheetRightToolbar.qml
+share/calligraactive/qml/Test.qml
 share/calligraactive/qml/TextDocumentCenterOverlay.qml
 share/calligraactive/qml/TextDocumentEditingToolbar.qml
 share/calligraactive/qml/Toolbars.qml
 share/color/
 share/color/icc/
 share/color/icc/krita/
+share/color/icc/krita/AllColorsRGB-elle-V2-g10.icc
+share/color/icc/krita/AllColorsRGB-elle-V2-srgbtrc.icc
+share/color/icc/krita/AllColorsRGB-elle-V4-g10.icc
+share/color/icc/krita/AllColorsRGB-elle-V4-srgbtrc.icc
+share/color/icc/krita/CIERGB-elle-V2-g10.icc
+share/color/icc/krita/CIERGB-elle-V2-g22.icc
+share/color/icc/krita/CIERGB-elle-V2-srgbtrc.icc
+share/color/icc/krita/CIERGB-elle-V4-g10.icc
+share/color/icc/krita/CIERGB-elle-V4-g22.icc
+share/color/icc/krita/CIERGB-elle-V4-srgbtrc.icc
+share/color/icc/krita/CMakeLists.txt
+share/color/icc/krita/ClayRGB-elle-V2-g10.icc
+share/color/icc/krita/ClayRGB-elle-V2-g22.icc
+share/color/icc/krita/ClayRGB-elle-V2-srgbtrc.icc
+share/color/icc/krita/ClayRGB-elle-V4-g10.icc
+share/color/icc/krita/ClayRGB-elle-V4-g22.icc
+share/color/icc/krita/ClayRGB-elle-V4-srgbtrc.icc
+share/color/icc/krita/Gray-D50-elle-V2-g10.icc
+share/color/icc/krita/Gray-D50-elle-V2-g18.icc
+share/color/icc/krita/Gray-D50-elle-V2-g22.icc
+share/color/icc/krita/Gray-D50-elle-V2-srgbtrc.icc
+share/color/icc/krita/Gray-D50-elle-V4-g10.icc
+share/color/icc/krita/Gray-D50-elle-V4-g18.icc
+share/color/icc/krita/Gray-D50-elle-V4-g22.icc
+share/color/icc/krita/Gray-D50-elle-V4-srgbtrc.icc
+share/color/icc/krita/IdentityRGB-elle-V2-g10.icc
+share/color/icc/krita/IdentityRGB-elle-V2-srgbtrc.icc
+share/color/icc/krita/IdentityRGB-elle-V4-g10.icc
+share/color/icc/krita/IdentityRGB-elle-V4-srgbtrc.icc
+share/color/icc/krita/Lab-D50-Identity-elle-V2.icc
+share/color/icc/krita/Lab-D50-Identity-elle-V4.icc
+share/color/icc/krita/LargeRGB-elle-V2-g10.icc
+share/color/icc/krita/LargeRGB-elle-V2-g18.icc
+share/color/icc/krita/LargeRGB-elle-V2-srgbtrc.icc
+share/color/icc/krita/LargeRGB-elle-V4-g10.icc
+share/color/icc/krita/LargeRGB-elle-V4-g18.icc
+share/color/icc/krita/LargeRGB-elle-V4-srgbtrc.icc
 share/color/icc/krita/README
-share/color/icc/krita/WideGamut.icm
+share/color/icc/krita/WideRGB-elle-V2-g10.icc
+share/color/icc/krita/WideRGB-elle-V2-g22.icc
+share/color/icc/krita/WideRGB-elle-V2-srgbtrc.icc
+share/color/icc/krita/WideRGB-elle-V4-g10.icc
+share/color/icc/krita/WideRGB-elle-V4-g22.icc
+share/color/icc/krita/WideRGB-elle-V4-srgbtrc.icc
+share/color/icc/krita/cmyk.icm
 share/color/icc/krita/krita25_lcms-builtin-sRGB_g100-truegamma.icc
-share/color/icc/krita/sRGB.icm
+share/color/icc/krita/sRGB-elle-V2-g10.icc
+share/color/icc/krita/sRGB-elle-V2-srgbtrc.icc
+share/color/icc/krita/sRGB-elle-V4-g10.icc
+share/color/icc/krita/sRGB-elle-V4-srgbtrc.icc
 share/color/icc/krita/scRGB.icm
-share/color/icc/pigment/
-share/color/icc/pigment/CMY.icm
-share/color/icc/pigment/fogra27l.icm
 share/config.kcfg/plansettings.kcfg
 share/config.kcfg/planworksettings.kcfg
 share/config.kcfg/sheets.kcfg
@@ -6935,15 +7253,11 @@ share/config/flowrc
 share/config/karbonrc
 share/config/kexirc
 share/config/kritabrushes.knsrc
-share/config/kritageminipanelsrc
-share/config/kritageminirc
 share/config/kritagradients.knsrc
 share/config/kritaiccprofiles.knsrc
 share/config/kritapatterns.knsrc
 share/config/kritapresets.knsrc
 share/config/kritarc
-share/config/kritasketchpanelsrc
-share/config/kritasketchrc
 share/config/planrc
 share/config/planworkrc
 share/config/sheetsrc
@@ -7067,6 +7381,7 @@ share/icons/hicolor/1024x1024/apps/
 share/icons/hicolor/1024x1024/apps/braindump.png
 share/icons/hicolor/1024x1024/apps/calligraauthor.png
 share/icons/hicolor/1024x1024/apps/calligraflow.png
+share/icons/hicolor/1024x1024/apps/calligragemini.png
 share/icons/hicolor/1024x1024/apps/calligrakarbon.png
 share/icons/hicolor/1024x1024/apps/calligrakexi.png
 share/icons/hicolor/1024x1024/apps/calligrakrita.png
@@ -7077,6 +7392,7 @@ share/icons/hicolor/1024x1024/apps/calli
 share/icons/hicolor/128x128/apps/braindump.png
 share/icons/hicolor/128x128/apps/calligraauthor.png
 share/icons/hicolor/128x128/apps/calligraflow.png
+share/icons/hicolor/128x128/apps/calligragemini.png
 share/icons/hicolor/128x128/apps/calligrakarbon.png
 share/icons/hicolor/128x128/apps/calligrakexi.png
 share/icons/hicolor/128x128/apps/calligrakrita.png
@@ -7085,6 +7401,8 @@ share/icons/hicolor/128x128/apps/calligr
 share/icons/hicolor/128x128/apps/calligrasheets.png
 share/icons/hicolor/128x128/apps/calligrastage.png
 share/icons/hicolor/128x128/apps/calligrawords.png
+share/icons/hicolor/128x128/apps/kritagemini.png
+share/icons/hicolor/128x128/apps/kritasketch.png
 share/icons/hicolor/128x128/mimetypes/application-x-vnd.kde.kplato.png
 share/icons/hicolor/128x128/mimetypes/application-x-vnd.kde.kplato.work.png
 share/icons/hicolor/128x128/mimetypes/application-x-vnd.kde.plan.png
@@ -7095,6 +7413,7 @@ share/icons/hicolor/16x16/actions/pen.pn
 share/icons/hicolor/16x16/apps/braindump.png
 share/icons/hicolor/16x16/apps/calligraauthor.png
 share/icons/hicolor/16x16/apps/calligraflow.png
+share/icons/hicolor/16x16/apps/calligragemini.png
 share/icons/hicolor/16x16/apps/calligrakarbon.png
 share/icons/hicolor/16x16/apps/calligrakexi.png
 share/icons/hicolor/16x16/apps/calligrakrita.png
@@ -7103,6 +7422,8 @@ share/icons/hicolor/16x16/apps/calligrap
 share/icons/hicolor/16x16/apps/calligrasheets.png
 share/icons/hicolor/16x16/apps/calligrastage.png
 share/icons/hicolor/16x16/apps/calligrawords.png
+share/icons/hicolor/16x16/apps/kritagemini.png
+share/icons/hicolor/16x16/apps/kritasketch.png
 share/icons/hicolor/16x16/mimetypes/application-x-vnd.kde.kplato.work.png
 share/icons/hicolor/16x16/mimetypes/application-x-vnd.kde.plan.work.png
 share/icons/hicolor/22x22/actions/stateshape.png
@@ -7111,6 +7432,7 @@ share/icons/hicolor/22x22/actions/tool_p
 share/icons/hicolor/22x22/apps/braindump.png
 share/icons/hicolor/22x22/apps/calligraauthor.png
 share/icons/hicolor/22x22/apps/calligraflow.png
+share/icons/hicolor/22x22/apps/calligragemini.png
 share/icons/hicolor/22x22/apps/calligrakarbon.png
 share/icons/hicolor/22x22/apps/calligrakexi.png
 share/icons/hicolor/22x22/apps/calligrakrita.png
@@ -7119,11 +7441,14 @@ share/icons/hicolor/22x22/apps/calligrap
 share/icons/hicolor/22x22/apps/calligrasheets.png
 share/icons/hicolor/22x22/apps/calligrastage.png
 share/icons/hicolor/22x22/apps/calligrawords.png
+share/icons/hicolor/22x22/apps/kritagemini.png
+share/icons/hicolor/22x22/apps/kritasketch.png
 share/icons/hicolor/22x22/mimetypes/application-x-vnd.kde.kplato.work.png
 share/icons/hicolor/22x22/mimetypes/application-x-vnd.kde.plan.work.png
 share/icons/hicolor/256x256/apps/braindump.png
 share/icons/hicolor/256x256/apps/calligraauthor.png
 share/icons/hicolor/256x256/apps/calligraflow.png
+share/icons/hicolor/256x256/apps/calligragemini.png
 share/icons/hicolor/256x256/apps/calligrakarbon.png
 share/icons/hicolor/256x256/apps/calligrakexi.png
 share/icons/hicolor/256x256/apps/calligrakrita.png
@@ -7131,9 +7456,12 @@ share/icons/hicolor/256x256/apps/calligr
 share/icons/hicolor/256x256/apps/calligrasheets.png
 share/icons/hicolor/256x256/apps/calligrastage.png
 share/icons/hicolor/256x256/apps/calligrawords.png
+share/icons/hicolor/256x256/apps/kritagemini.png
+share/icons/hicolor/256x256/apps/kritasketch.png
 share/icons/hicolor/32x32/apps/braindump.png
 share/icons/hicolor/32x32/apps/calligraauthor.png
 share/icons/hicolor/32x32/apps/calligraflow.png
+share/icons/hicolor/32x32/apps/calligragemini.png
 share/icons/hicolor/32x32/apps/calligrakarbon.png
 share/icons/hicolor/32x32/apps/calligrakexi.png
 share/icons/hicolor/32x32/apps/calligrakrita.png
@@ -7142,11 +7470,14 @@ share/icons/hicolor/32x32/apps/calligrap
 share/icons/hicolor/32x32/apps/calligrasheets.png
 share/icons/hicolor/32x32/apps/calligrastage.png
 share/icons/hicolor/32x32/apps/calligrawords.png
+share/icons/hicolor/32x32/apps/kritagemini.png
+share/icons/hicolor/32x32/apps/kritasketch.png
 share/icons/hicolor/32x32/mimetypes/application-x-vnd.kde.kplato.work.png
 share/icons/hicolor/32x32/mimetypes/application-x-vnd.kde.plan.work.png
 share/icons/hicolor/48x48/apps/braindump.png
 share/icons/hicolor/48x48/apps/calligraauthor.png
 share/icons/hicolor/48x48/apps/calligraflow.png
+share/icons/hicolor/48x48/apps/calligragemini.png
 share/icons/hicolor/48x48/apps/calligrakarbon.png
 share/icons/hicolor/48x48/apps/calligrakexi.png
 share/icons/hicolor/48x48/apps/calligrakrita.png
@@ -7155,13 +7486,14 @@ share/icons/hicolor/48x48/apps/calligrap
 share/icons/hicolor/48x48/apps/calligrasheets.png
 share/icons/hicolor/48x48/apps/calligrastage.png
 share/icons/hicolor/48x48/apps/calligrawords.png
+share/icons/hicolor/48x48/apps/kritagemini.png
+share/icons/hicolor/48x48/apps/kritasketch.png
 share/icons/hicolor/48x48/mimetypes/application-x-vnd.kde.kplato.work.png
 share/icons/hicolor/48x48/mimetypes/application-x-vnd.kde.plan.work.png
-share/icons/hicolor/512x512/
-share/icons/hicolor/512x512/apps/
 share/icons/hicolor/512x512/apps/braindump.png
 share/icons/hicolor/512x512/apps/calligraauthor.png
 share/icons/hicolor/512x512/apps/calligraflow.png
+share/icons/hicolor/512x512/apps/calligragemini.png
 share/icons/hicolor/512x512/apps/calligrakarbon.png
 share/icons/hicolor/512x512/apps/calligrakexi.png
 share/icons/hicolor/512x512/apps/calligrakrita.png
@@ -7172,6 +7504,7 @@ share/icons/hicolor/512x512/apps/calligr
 share/icons/hicolor/64x64/apps/braindump.png
 share/icons/hicolor/64x64/apps/calligraauthor.png
 share/icons/hicolor/64x64/apps/calligraflow.png
+share/icons/hicolor/64x64/apps/calligragemini.png
 share/icons/hicolor/64x64/apps/calligrakarbon.png
 share/icons/hicolor/64x64/apps/calligrakexi.png
 share/icons/hicolor/64x64/apps/calligrakrita.png
@@ -7180,6 +7513,8 @@ share/icons/hicolor/64x64/apps/calligrap
 share/icons/hicolor/64x64/apps/calligrasheets.png
 share/icons/hicolor/64x64/apps/calligrastage.png
 share/icons/hicolor/64x64/apps/calligrawords.png
+share/icons/hicolor/64x64/apps/kritagemini.png
+share/icons/hicolor/64x64/apps/kritasketch.png
 share/icons/hicolor/64x64/mimetypes/application-x-vnd.kde.kplato.png
 share/icons/hicolor/64x64/mimetypes/application-x-vnd.kde.kplato.work.png
 share/icons/hicolor/64x64/mimetypes/application-x-vnd.kde.plan.png
@@ -7232,16 +7567,90 @@ share/icons/oxygen/scalable/
 share/icons/oxygen/scalable/actions/
 share/icons/oxygen/scalable/actions/table.svgz
 share/kde4/services/ServiceMenus/
-share/kde4/services/ServiceMenus/flow_print.desktop
-share/kde4/services/ServiceMenus/karbon_print.desktop
-share/kde4/services/ServiceMenus/krita_print.desktop
-share/kde4/services/ServiceMenus/sheets_print.desktop
-share/kde4/services/ServiceMenus/stage_print.desktop
-share/kde4/services/ServiceMenus/words_print.desktop
-share/kde4/services/authorpart.desktop
-share/kde4/services/braindump_shape_state.desktop
-share/kde4/services/braindump_shape_web.desktop
+share/kde4/services/ServiceMenus/calligra/
+share/kde4/services/ServiceMenus/calligra/flow_print.desktop
+share/kde4/services/ServiceMenus/calligra/karbon_print.desktop
+share/kde4/services/ServiceMenus/calligra/krita_print.desktop
+share/kde4/services/ServiceMenus/calligra/sheets_print.desktop
+share/kde4/services/ServiceMenus/calligra/stage_print.desktop
+share/kde4/services/ServiceMenus/calligra/words_print.desktop
 share/kde4/services/calligra/
+share/kde4/services/calligra/authorpart.desktop
+share/kde4/services/calligra/braindump_shape_state.desktop
+share/kde4/services/calligra/braindump_shape_web.desktop
+share/kde4/services/calligra/calligra_docker_defaults.desktop
+share/kde4/services/calligra/calligra_filter_applixspread2kspread.desktop
+share/kde4/services/calligra/calligra_filter_applixword2odt.desktop
+share/kde4/services/calligra/calligra_filter_ascii2words.desktop
+share/kde4/services/calligra/calligra_filter_csv2sheets.desktop
+share/kde4/services/calligra/calligra_filter_dbase2kspread.desktop
+share/kde4/services/calligra/calligra_filter_doc2odt.desktop
+share/kde4/services/calligra/calligra_filter_docx2odt.desktop
+share/kde4/services/calligra/calligra_filter_gnumeric2sheets.desktop
+share/kde4/services/calligra/calligra_filter_html2ods.desktop
+share/kde4/services/calligra/calligra_filter_karbon1x2karbon.desktop
+share/kde4/services/calligra/calligra_filter_karbon2image.desktop
+share/kde4/services/calligra/calligra_filter_karbon2svg.desktop
+share/kde4/services/calligra/calligra_filter_karbon2wmf.desktop
+share/kde4/services/calligra/calligra_filter_kpr2odp.desktop
+share/kde4/services/calligra/calligra_filter_kspread2tex.desktop
+share/kde4/services/calligra/calligra_filter_mpp2plan.desktop
+share/kde4/services/calligra/calligra_filter_mpx2plan.desktop
+share/kde4/services/calligra/calligra_filter_odt2ascii.desktop
+share/kde4/services/calligra/calligra_filter_odt2docx.desktop
+share/kde4/services/calligra/calligra_filter_odt2epub2.desktop
+share/kde4/services/calligra/calligra_filter_odt2html.desktop
+share/kde4/services/calligra/calligra_filter_odt2mobi.desktop
+share/kde4/services/calligra/calligra_filter_opencalc2sheets.desktop
+share/kde4/services/calligra/calligra_filter_pdf2svg.desktop
+share/kde4/services/calligra/calligra_filter_planner2plan.desktop
+share/kde4/services/calligra/calligra_filter_ppt2odp.desktop
+share/kde4/services/calligra/calligra_filter_pptx2odp.desktop
+share/kde4/services/calligra/calligra_filter_qpro2sheets.desktop
+share/kde4/services/calligra/calligra_filter_rtf2odt.desktop
+share/kde4/services/calligra/calligra_filter_sheets2csv.desktop
+share/kde4/services/calligra/calligra_filter_sheets2gnumeric.desktop
+share/kde4/services/calligra/calligra_filter_sheets2html.desktop
+share/kde4/services/calligra/calligra_filter_sheets2opencalc.desktop
+share/kde4/services/calligra/calligra_filter_svg2karbon.desktop
+share/kde4/services/calligra/calligra_filter_wmf2svg.desktop
+share/kde4/services/calligra/calligra_filter_xfig2odg.desktop
+share/kde4/services/calligra/calligra_filter_xls2ods.desktop
+share/kde4/services/calligra/calligra_filter_xlsx2ods.desktop
+share/kde4/services/calligra/calligra_semanticitem_contact.desktop
+share/kde4/services/calligra/calligra_semanticitem_event.desktop
+share/kde4/services/calligra/calligra_semanticitem_location.desktop
+share/kde4/services/calligra/calligra_shape_artistictext.desktop
+share/kde4/services/calligra/calligra_shape_chart.desktop
+share/kde4/services/calligra/calligra_shape_formular.desktop
+share/kde4/services/calligra/calligra_shape_music.desktop
+share/kde4/services/calligra/calligra_shape_paths.desktop
+share/kde4/services/calligra/calligra_shape_picture.desktop
+share/kde4/services/calligra/calligra_shape_plugin.desktop
+share/kde4/services/calligra/calligra_shape_spreadsheet-deferred.desktop
+share/kde4/services/calligra/calligra_shape_spreadsheet.desktop
+share/kde4/services/calligra/calligra_shape_text.desktop
+share/kde4/services/calligra/calligra_shape_vector.desktop
+share/kde4/services/calligra/calligra_shape_video.desktop
+share/kde4/services/calligra/calligra_textediting_autocorrect.desktop
+share/kde4/services/calligra/calligra_textediting_changecase.desktop
+share/kde4/services/calligra/calligra_textediting_spellcheck.desktop
+share/kde4/services/calligra/calligra_textediting_thesaurus.desktop
+share/kde4/services/calligra/calligra_textinlineobject_variables.desktop
+share/kde4/services/calligra/calligra_tool_basicflakes.desktop
+share/kde4/services/calligra/calligra_tool_defaults.desktop
+share/kde4/services/calligra/calligradocinfopropspage.desktop
+share/kde4/services/calligra/calligrastageeventactions.desktop
+share/kde4/services/calligra/calligrastagetoolanimation.desktop
+share/kde4/services/calligra/flowdockersplugin.desktop
+share/kde4/services/calligra/flowpart.desktop
+share/kde4/services/calligra/karbonfiltereffects.desktop
+share/kde4/services/calligra/karbonflattenpathplugin.desktop
+share/kde4/services/calligra/karbonpart.desktop
+share/kde4/services/calligra/karbonrefinepathplugin.desktop
+share/kde4/services/calligra/karbonroundcornersplugin.desktop
+share/kde4/services/calligra/karbontools.desktop
+share/kde4/services/calligra/karbonwhirlpinchplugin.desktop
 share/kde4/services/calligra/kexicsv_importexporthandler.desktop
 share/kde4/services/calligra/kexidb_mysqldriver.desktop
 share/kde4/services/calligra/kexidb_pqxxsqldriver.desktop
@@ -7265,251 +7674,192 @@ share/kde4/services/calligra/kformdesign
 share/kde4/services/calligra/kformdesigner_mapbrowser.desktop
 share/kde4/services/calligra/kformdesigner_stdwidgets.desktop
 share/kde4/services/calligra/kformdesigner_webbrowser.desktop
+share/kde4/services/calligra/kformulapart.desktop
+share/kde4/services/calligra/kolcmsengine.desktop
+share/kde4/services/calligra/kopabackgroundtool.desktop
 share/kde4/services/calligra/koreport_barcodeplugin.desktop
 share/kde4/services/calligra/koreport_chartplugin.desktop
 share/kde4/services/calligra/koreport_mapsplugin.desktop
 share/kde4/services/calligra/koreport_webplugin.desktop
-share/kde4/services/calligra_docker_defaults.desktop
-share/kde4/services/calligra_filter_applixspread2kspread.desktop
-share/kde4/services/calligra_filter_applixword2odt.desktop
-share/kde4/services/calligra_filter_ascii2words.desktop
-share/kde4/services/calligra_filter_csv2sheets.desktop
-share/kde4/services/calligra_filter_dbase2kspread.desktop
-share/kde4/services/calligra_filter_doc2odt.desktop
-share/kde4/services/calligra_filter_docx2odt.desktop
-share/kde4/services/calligra_filter_gnumeric2sheets.desktop
-share/kde4/services/calligra_filter_html2ods.desktop
-share/kde4/services/calligra_filter_karbon1x2karbon.desktop
-share/kde4/services/calligra_filter_karbon2jpg.desktop
-share/kde4/services/calligra_filter_karbon2png.desktop
-share/kde4/services/calligra_filter_karbon2svg.desktop
-share/kde4/services/calligra_filter_karbon2wmf.desktop
-share/kde4/services/calligra_filter_kpr2odp.desktop
-share/kde4/services/calligra_filter_kspread2tex.desktop
-share/kde4/services/calligra_filter_mpp2plan.desktop
-share/kde4/services/calligra_filter_mpx2plan.desktop
-share/kde4/services/calligra_filter_odt2ascii.desktop
-share/kde4/services/calligra_filter_odt2epub2.desktop
-share/kde4/services/calligra_filter_odt2html.desktop
-share/kde4/services/calligra_filter_odt2mobi.desktop
-share/kde4/services/calligra_filter_opencalc2sheets.desktop
-share/kde4/services/calligra_filter_pdf2svg.desktop
-share/kde4/services/calligra_filter_planner2plan.desktop
-share/kde4/services/calligra_filter_ppt2odp.desktop
-share/kde4/services/calligra_filter_pptx2odp.desktop
-share/kde4/services/calligra_filter_qpro2sheets.desktop
-share/kde4/services/calligra_filter_rtf2odt.desktop
-share/kde4/services/calligra_filter_sheets2csv.desktop
-share/kde4/services/calligra_filter_sheets2gnumeric.desktop
-share/kde4/services/calligra_filter_sheets2html.desktop
-share/kde4/services/calligra_filter_sheets2opencalc.desktop
-share/kde4/services/calligra_filter_svg2karbon.desktop
-share/kde4/services/calligra_filter_svgz2karbon.desktop
-share/kde4/services/calligra_filter_wmf2svg.desktop
-share/kde4/services/calligra_filter_xfig2odg.desktop
-share/kde4/services/calligra_filter_xls2ods.desktop
-share/kde4/services/calligra_filter_xlsx2ods.desktop
+share/kde4/services/calligra/kpr_pageeffect_barwipe.desktop
+share/kde4/services/calligra/kpr_pageeffect_clockwipe.desktop
+share/kde4/services/calligra/kpr_pageeffect_edgewipe.desktop
+share/kde4/services/calligra/kpr_pageeffect_fade.desktop
+share/kde4/services/calligra/kpr_pageeffect_iriswipe.desktop
+share/kde4/services/calligra/kpr_pageeffect_matrixwipe.desktop
+share/kde4/services/calligra/kpr_pageeffect_slidewipe.desktop
+share/kde4/services/calligra/kpr_pageeffect_spacerotation.desktop
+share/kde4/services/calligra/kpr_pageeffect_swapeffect.desktop
+share/kde4/services/calligra/kpr_shapeanimation_example.desktop
+share/kde4/services/calligra/kprvariables.desktop
+share/kde4/services/calligra/krita_artisticcolorselector.desktop
+share/kde4/services/calligra/krita_bmp_export.desktop
+share/kde4/services/calligra/krita_bmp_import.desktop
+share/kde4/services/calligra/krita_channeldocker.desktop
+share/kde4/services/calligra/krita_colorselectorng.desktop
+share/kde4/services/calligra/krita_colorslider.desktop
+share/kde4/services/calligra/krita_colorspaces_extensions_plugin.desktop
+share/kde4/services/calligra/krita_compositiondocker.desktop
+share/kde4/services/calligra/krita_digitalmixer.desktop
+share/kde4/services/calligra/krita_exr_export.desktop
+share/kde4/services/calligra/krita_exr_import.desktop
+share/kde4/services/calligra/krita_heightmap_export.desktop
+share/kde4/services/calligra/krita_heightmap_import.desktop
+share/kde4/services/calligra/krita_jp2_export.desktop
+share/kde4/services/calligra/krita_jp2_import.desktop
+share/kde4/services/calligra/krita_jpeg_export.desktop
+share/kde4/services/calligra/krita_jpeg_import.desktop
+share/kde4/services/calligra/krita_lutdocker.desktop
+share/kde4/services/calligra/krita_odg_import.desktop
+share/kde4/services/calligra/krita_ora_export.desktop
+share/kde4/services/calligra/krita_ora_import.desktop
+share/kde4/services/calligra/krita_ora_thumbnail.desktop
+share/kde4/services/calligra/krita_overviewdocker.desktop
+share/kde4/services/calligra/krita_palettedocker.desktop
+share/kde4/services/calligra/krita_patterndocker.desktop
+share/kde4/services/calligra/krita_pdf_import.desktop
+share/kde4/services/calligra/krita_png_export.desktop
+share/kde4/services/calligra/krita_png_import.desktop
+share/kde4/services/calligra/krita_ppm_export.desktop
+share/kde4/services/calligra/krita_ppm_import.desktop
+share/kde4/services/calligra/krita_presetdocker.desktop
+share/kde4/services/calligra/krita_psd_export.desktop
+share/kde4/services/calligra/krita_psd_import.desktop
+share/kde4/services/calligra/krita_qml_export.desktop
+share/kde4/services/calligra/krita_raw_import.desktop
+share/kde4/services/calligra/krita_smallcolorselector.desktop
+share/kde4/services/calligra/krita_specificcolorselector.desktop
+share/kde4/services/calligra/krita_tasksetdocker.desktop
+share/kde4/services/calligra/krita_tga_export.desktop
+share/kde4/services/calligra/krita_tga_import.desktop
+share/kde4/services/calligra/krita_tiff_export.desktop
+share/kde4/services/calligra/krita_tiff_import.desktop
+share/kde4/services/calligra/krita_xcf_import.desktop
+share/kde4/services/calligra/kritabigbrother.desktop
+share/kde4/services/calligra/kritablurfilter.desktop
+share/kde4/services/calligra/kritachalkpaintop.desktop
+share/kde4/services/calligra/kritaclonesarray.desktop
+share/kde4/services/calligra/kritacolorgenerator.desktop
+share/kde4/services/calligra/kritacolorrange.desktop
+share/kde4/services/calligra/kritacolorsfilter.desktop
+share/kde4/services/calligra/kritacolorsmudgepaintop.desktop
+share/kde4/services/calligra/kritacolorspaceconversion.desktop
+share/kde4/services/calligra/kritaconvolutionfilters.desktop
+share/kde4/services/calligra/kritacurvepaintop.desktop
+share/kde4/services/calligra/kritadefaultdockers.desktop
+share/kde4/services/calligra/kritadefaultpaintops.desktop
+share/kde4/services/calligra/kritadefaulttools.desktop
+share/kde4/services/calligra/kritadeformpaintop.desktop
+share/kde4/services/calligra/kritadodgeburn.desktop
+share/kde4/services/calligra/kritadynapaintop.desktop
+share/kde4/services/calligra/kritaembossfilter.desktop
+share/kde4/services/calligra/kritaexample.desktop
+share/kde4/services/calligra/kritaexperimentpaintop.desktop
+share/kde4/services/calligra/kritaextensioncolorsfilters.desktop
+share/kde4/services/calligra/kritafastcolortransfer.desktop
+share/kde4/services/calligra/kritafilterop.desktop
+share/kde4/services/calligra/kritagmic.desktop
+share/kde4/services/calligra/kritagridpaintop.desktop
+share/kde4/services/calligra/kritahairypaintop.desktop
+share/kde4/services/calligra/kritahatchingpaintop.desktop
+share/kde4/services/calligra/kritahistogram.desktop
+share/kde4/services/calligra/kritahistorydocker.desktop
+share/kde4/services/calligra/kritaimagedocker.desktop
+share/kde4/services/calligra/kritaimageenhancement.desktop
+share/kde4/services/calligra/kritaimagesize.desktop
+share/kde4/services/calligra/kritaimagesplit.desktop
+share/kde4/services/calligra/kritaindexcolors.desktop
+share/kde4/services/calligra/kritalayergroupswitcher.desktop
+share/kde4/services/calligra/kritalayersplit.desktop
+share/kde4/services/calligra/kritalevelfilter.desktop
+share/kde4/services/calligra/kritametadataeditor.desktop
+share/kde4/services/calligra/kritamodifyselection.desktop
+share/kde4/services/calligra/kritanoisefilter.desktop
+share/kde4/services/calligra/kritaoffsetimage.desktop
+share/kde4/services/calligra/kritaoilpaintfilter.desktop
+share/kde4/services/calligra/kritaparticlepaintop.desktop
+share/kde4/services/calligra/kritapatterngenerator.desktop
+share/kde4/services/calligra/kritaphongbumpmapfilter.desktop
+share/kde4/services/calligra/kritapixelizefilter.desktop
+share/kde4/services/calligra/kritaposterize.desktop
+share/kde4/services/calligra/kritaraindropsfilter.desktop
+share/kde4/services/calligra/kritarandompickfilter.desktop
+share/kde4/services/calligra/kritaresourcemanager.desktop
+share/kde4/services/calligra/kritarotateimage.desktop
+share/kde4/services/calligra/kritaroundcornersfilter.desktop
+share/kde4/services/calligra/kritarulerassistanttool.desktop
+share/kde4/services/calligra/kritaselectiontools.desktop
+share/kde4/services/calligra/kritaseparatechannels.desktop
+share/kde4/services/calligra/kritashearimage.desktop
+share/kde4/services/calligra/kritasketchpaintop.desktop
+share/kde4/services/calligra/kritasmalltilesfilter.desktop
+share/kde4/services/calligra/kritasobelfilter.desktop
+share/kde4/services/calligra/kritaspraypaintop.desktop
+share/kde4/services/calligra/kritatoolcrop.desktop
+share/kde4/services/calligra/kritatooldyna.desktop
+share/kde4/services/calligra/kritatoolgrid.desktop
+share/kde4/services/calligra/kritatoolperspectivegrid.desktop
+share/kde4/services/calligra/kritatoolpolygon.desktop
+share/kde4/services/calligra/kritatoolpolyline.desktop
+share/kde4/services/calligra/kritatooltext.desktop
+share/kde4/services/calligra/kritatooltransform.desktop
+share/kde4/services/calligra/kritaunsharpfilter.desktop
+share/kde4/services/calligra/kritawavefilter.desktop
+share/kde4/services/calligra/krossmoduleplan.desktop
+share/kde4/services/calligra/krossmodulesheets.desktop
+share/kde4/services/calligra/kspread_plugin_tool_calendar.desktop
+share/kde4/services/calligra/kspreadbitopsmodule.desktop
+share/kde4/services/calligra/kspreadconversionmodule.desktop
+share/kde4/services/calligra/kspreaddatabasemodule.desktop
+share/kde4/services/calligra/kspreaddatetimemodule.desktop
+share/kde4/services/calligra/kspreadengineeringmodule.desktop
+share/kde4/services/calligra/kspreadfinancialmodule.desktop
+share/kde4/services/calligra/kspreadinformationmodule.desktop
+share/kde4/services/calligra/kspreadlogicmodule.desktop
+share/kde4/services/calligra/kspreadmathmodule.desktop
+share/kde4/services/calligra/kspreadreferencemodule.desktop
+share/kde4/services/calligra/kspreadstatisticalmodule.desktop
+share/kde4/services/calligra/kspreadtextmodule.desktop
+share/kde4/services/calligra/kspreadtrigonometrymodule.desktop
+share/kde4/services/calligra/libokularGenerator_doc_calligra.desktop
+share/kde4/services/calligra/libokularGenerator_docx_calligra.desktop
+share/kde4/services/calligra/okularDoc_calligra.desktop
+share/kde4/services/calligra/okularDocx_calligra.desktop
+share/kde4/services/calligra/plan_icalendar_export.desktop
+share/kde4/services/calligra/plan_kplato_import.desktop
+share/kde4/services/calligra/planpart.desktop
+share/kde4/services/calligra/planrcpsscheduler.desktop
+share/kde4/services/calligra/planscripting.desktop
+share/kde4/services/calligra/plantjscheduler.desktop
+share/kde4/services/calligra/planworkpart.desktop
+share/kde4/services/calligra/sheetspart.desktop
+share/kde4/services/calligra/sheetsscripting.desktop
+share/kde4/services/calligra/sheetssolver.desktop
+share/kde4/services/calligra/stagepart.desktop
+share/kde4/services/calligra/wordspart.desktop
+share/kde4/services/calligra_filter_odt2wiki.desktop
 share/kde4/services/calligra_odg_thumbnail.desktop
-share/kde4/services/calligra_semanticitem_contact.desktop
-share/kde4/services/calligra_semanticitem_event.desktop
-share/kde4/services/calligra_semanticitem_location.desktop
-share/kde4/services/calligra_shape_artistictext.desktop
-share/kde4/services/calligra_shape_chart.desktop
-share/kde4/services/calligra_shape_formular.desktop
-share/kde4/services/calligra_shape_music.desktop
-share/kde4/services/calligra_shape_paths.desktop
-share/kde4/services/calligra_shape_picture.desktop
-share/kde4/services/calligra_shape_plugin.desktop
-share/kde4/services/calligra_shape_spreadsheet-deferred.desktop
-share/kde4/services/calligra_shape_spreadsheet.desktop
-share/kde4/services/calligra_shape_text.desktop
-share/kde4/services/calligra_shape_vector.desktop
-share/kde4/services/calligra_shape_video.desktop
-share/kde4/services/calligra_textediting_autocorrect.desktop
-share/kde4/services/calligra_textediting_changecase.desktop
-share/kde4/services/calligra_textediting_spellcheck.desktop
-share/kde4/services/calligra_textediting_thesaurus.desktop
-share/kde4/services/calligra_textinlineobject_variables.desktop
-share/kde4/services/calligra_tool_basicflakes.desktop
-share/kde4/services/calligra_tool_defaults.desktop
-share/kde4/services/calligradocinfopropspage.desktop
-share/kde4/services/calligrastageeventactions.desktop
-share/kde4/services/calligrastagetoolanimation.desktop
-share/kde4/services/flowdockersplugin.desktop
-share/kde4/services/flowpart.desktop
 share/kde4/services/karbon_karbon1x_thumbnail.desktop
 share/kde4/services/karbon_wmf_thumbnail.desktop
 share/kde4/services/karbon_xfig_thumbnail.desktop
-share/kde4/services/karbonfiltereffects.desktop
-share/kde4/services/karbonflattenpathplugin.desktop
-share/kde4/services/karbonpart.desktop
-share/kde4/services/karbonrefinepathplugin.desktop
-share/kde4/services/karbonroundcornersplugin.desktop
-share/kde4/services/karbontools.desktop
-share/kde4/services/karbonwhirlpinchplugin.desktop
-share/kde4/services/kformulapart.desktop
-share/kde4/services/kolcmsengine.desktop
-share/kde4/services/kopabackgroundtool.desktop
-share/kde4/services/kpr_pageeffect_barwipe.desktop
-share/kde4/services/kpr_pageeffect_clockwipe.desktop
-share/kde4/services/kpr_pageeffect_edgewipe.desktop
-share/kde4/services/kpr_pageeffect_fade.desktop
-share/kde4/services/kpr_pageeffect_iriswipe.desktop
-share/kde4/services/kpr_pageeffect_matrixwipe.desktop
-share/kde4/services/kpr_pageeffect_slidewipe.desktop
-share/kde4/services/kpr_pageeffect_spacerotation.desktop
-share/kde4/services/kpr_pageeffect_swapeffect.desktop
-share/kde4/services/kpr_shapeanimation_example.desktop
-share/kde4/services/kprvariables.desktop
-share/kde4/services/krita_artisticcolorselector.desktop
-share/kde4/services/krita_bmp_export.desktop
-share/kde4/services/krita_bmp_import.desktop
-share/kde4/services/krita_channeldocker.desktop
-share/kde4/services/krita_colorselectorng.desktop
-share/kde4/services/krita_colorspaces_extensions_plugin.desktop
-share/kde4/services/krita_compositiondocker.desktop
-share/kde4/services/krita_digitalmixer.desktop
-share/kde4/services/krita_exr_export.desktop
-share/kde4/services/krita_exr_import.desktop
-share/kde4/services/krita_flipbook_import.desktop
-share/kde4/services/krita_jp2_export.desktop
-share/kde4/services/krita_jp2_import.desktop
-share/kde4/services/krita_jpeg_export.desktop
-share/kde4/services/krita_jpeg_import.desktop
 share/kde4/services/krita_kra_thumbnail.desktop
-share/kde4/services/krita_lutdocker.desktop
-share/kde4/services/krita_odg_import.desktop
-share/kde4/services/krita_ora_export.desktop
-share/kde4/services/krita_ora_import.desktop
-share/kde4/services/krita_ora_thumbnail.desktop
-share/kde4/services/krita_overviewdocker.desktop
-share/kde4/services/krita_palettedocker.desktop
-share/kde4/services/krita_patterndocker.desktop
-share/kde4/services/krita_pdf_import.desktop
-share/kde4/services/krita_png_export.desktop
-share/kde4/services/krita_png_import.desktop
-share/kde4/services/krita_ppm_export.desktop
-share/kde4/services/krita_ppm_import.desktop
-share/kde4/services/krita_presetdocker.desktop
-share/kde4/services/krita_psd_export.desktop
-share/kde4/services/krita_psd_import.desktop
-share/kde4/services/krita_qml_export.desktop
-share/kde4/services/krita_raw_import.desktop
-share/kde4/services/krita_smallcolorselector.desktop
-share/kde4/services/krita_specificcolorselector.desktop
-share/kde4/services/krita_tasksetdocker.desktop
-share/kde4/services/krita_tiff_export.desktop
-share/kde4/services/krita_tiff_import.desktop
-share/kde4/services/krita_xcf_import.desktop
-share/kde4/services/kritabigbrother.desktop
-share/kde4/services/kritablurfilter.desktop
-share/kde4/services/kritachalkpaintop.desktop
-share/kde4/services/kritaclonesarray.desktop
-share/kde4/services/kritacolorgenerator.desktop
-share/kde4/services/kritacolorrange.desktop
-share/kde4/services/kritacolorsfilter.desktop
-share/kde4/services/kritacolorsmudgepaintop.desktop
-share/kde4/services/kritacolorspaceconversion.desktop
-share/kde4/services/kritaconvolutionfilters.desktop
-share/kde4/services/kritacurvepaintop.desktop
-share/kde4/services/kritadefaultdockers.desktop
-share/kde4/services/kritadefaultpaintops.desktop
-share/kde4/services/kritadefaulttools.desktop
-share/kde4/services/kritadeformpaintop.desktop
-share/kde4/services/kritadodgeburn.desktop
-share/kde4/services/kritadropshadow.desktop
-share/kde4/services/kritadynapaintop.desktop
-share/kde4/services/kritaembossfilter.desktop
-share/kde4/services/kritaexample.desktop
-share/kde4/services/kritaexperimentpaintop.desktop
-share/kde4/services/kritaextensioncolorsfilters.desktop
-share/kde4/services/kritafastcolortransfer.desktop
-share/kde4/services/kritafilterop.desktop
-share/kde4/services/kritagmic.desktop
-share/kde4/services/kritagridpaintop.desktop
-share/kde4/services/kritahairypaintop.desktop
-share/kde4/services/kritahatchingpaintop.desktop
-share/kde4/services/kritahistogram.desktop
-share/kde4/services/kritahistorydocker.desktop
-share/kde4/services/kritaimagedocker.desktop
-share/kde4/services/kritaimageenhancement.desktop
-share/kde4/services/kritaimagesize.desktop
-share/kde4/services/kritaimagesplit.desktop
-share/kde4/services/kritalayergroupswitcher.desktop
-share/kde4/services/kritalevelfilter.desktop
-share/kde4/services/kritametadataeditor.desktop
-share/kde4/services/kritamodifyselection.desktop
-share/kde4/services/kritanoisefilter.desktop
-share/kde4/services/kritaoffsetimage.desktop
-share/kde4/services/kritaoilpaintfilter.desktop
-share/kde4/services/kritapart.desktop
-share/kde4/services/kritaparticlepaintop.desktop
-share/kde4/services/kritapatterngenerator.desktop
-share/kde4/services/kritaphongbumpmapfilter.desktop
-share/kde4/services/kritapixelizefilter.desktop
-share/kde4/services/kritaraindropsfilter.desktop
-share/kde4/services/kritarandompickfilter.desktop
-share/kde4/services/kritarotateimage.desktop
-share/kde4/services/kritaroundcornersfilter.desktop
-share/kde4/services/kritarulerassistanttool.desktop
-share/kde4/services/kritaselectiontools.desktop
-share/kde4/services/kritaseparatechannels.desktop
-share/kde4/services/kritashearimage.desktop
-share/kde4/services/kritasketchpaintop.desktop
-share/kde4/services/kritasmalltilesfilter.desktop
-share/kde4/services/kritasobelfilter.desktop
-share/kde4/services/kritaspraypaintop.desktop
-share/kde4/services/kritatoolcrop.desktop
-share/kde4/services/kritatooldyna.desktop
-share/kde4/services/kritatoolgrid.desktop
-share/kde4/services/kritatoolperspectivegrid.desktop
-share/kde4/services/kritatoolpolygon.desktop
-share/kde4/services/kritatoolpolyline.desktop
-share/kde4/services/kritatooltext.desktop
-share/kde4/services/kritatooltransform.desktop
-share/kde4/services/kritaunsharpfilter.desktop
-share/kde4/services/kritawavefilter.desktop
-share/kde4/services/krossmoduleplan.desktop
-share/kde4/services/krossmodulesheets.desktop
-share/kde4/services/kspread_plugin_tool_calendar.desktop
-share/kde4/services/kspreadbitopsmodule.desktop
-share/kde4/services/kspreadconversionmodule.desktop
-share/kde4/services/kspreaddatabasemodule.desktop
-share/kde4/services/kspreaddatetimemodule.desktop
-share/kde4/services/kspreadengineeringmodule.desktop
-share/kde4/services/kspreadfinancialmodule.desktop
-share/kde4/services/kspreadinformationmodule.desktop
-share/kde4/services/kspreadlogicmodule.desktop
-share/kde4/services/kspreadmathmodule.desktop
-share/kde4/services/kspreadreferencemodule.desktop
-share/kde4/services/kspreadstatisticalmodule.desktop
-share/kde4/services/kspreadtextmodule.desktop
-share/kde4/services/kspreadtrigonometrymodule.desktop
 share/kde4/services/libokularGenerator_odp.desktop
+share/kde4/services/libokularGenerator_odt.desktop
 share/kde4/services/okularOdp.desktop
-share/kde4/services/plan_icalendar_export.desktop
-share/kde4/services/plan_kplato_import.desktop
-share/kde4/services/planpart.desktop
-share/kde4/services/planrcpsscheduler.desktop
-share/kde4/services/planscripting.desktop
-share/kde4/services/plantjscheduler.desktop
-share/kde4/services/planworkpart.desktop
+share/kde4/services/okularOdt.desktop
+share/kde4/services/qimageioplugins/kra.desktop
+share/kde4/services/qimageioplugins/ora.desktop
 share/kde4/services/sheets_excel_thumbnail.desktop
 share/kde4/services/sheets_ods_thumbnail.desktop
 share/kde4/services/sheets_xlsx_thumbnail.desktop
-share/kde4/services/sheetspart.desktop
-share/kde4/services/sheetsscripting.desktop
-share/kde4/services/sheetssolver.desktop
 share/kde4/services/stage_kpr_thumbnail.desktop
 share/kde4/services/stage_odp_thumbnail.desktop
 share/kde4/services/stage_powerpoint_thumbnail.desktop
 share/kde4/services/stage_pptx_thumbnail.desktop
-share/kde4/services/stagepart.desktop
 share/kde4/services/words_docx_thumbnail.desktop
 share/kde4/services/words_msword_thumbnail.desktop
 share/kde4/services/words_odt_thumbnail.desktop
 share/kde4/services/words_rtf_thumbnail.desktop
-share/kde4/services/wordspart.desktop
 share/kde4/servicetypes/braindump_extensions.desktop
 share/kde4/servicetypes/calligra_application.desktop
 share/kde4/servicetypes/calligra_deferred_plugin.desktop
@@ -7529,11 +7879,14 @@ share/kde4/servicetypes/karbon_dock.desk
 share/kde4/servicetypes/karbon_viewplugin.desktop
 share/kde4/servicetypes/kexihandler.desktop
 share/kde4/servicetypes/keximigration_driver.desktop
+share/kde4/servicetypes/kopa_tool.desktop
 share/kde4/servicetypes/koreport_itemplugin.desktop
 share/kde4/servicetypes/kpr_pageeffect.desktop
 share/kde4/servicetypes/kpr_shapeanimation.desktop
+share/kde4/servicetypes/kpr_tool.desktop
 share/kde4/servicetypes/krita_brush.desktop
 share/kde4/servicetypes/krita_dock.desktop
+share/kde4/servicetypes/krita_filefilter.desktop
 share/kde4/servicetypes/krita_filter.desktop
 share/kde4/servicetypes/krita_generator.desktop
 share/kde4/servicetypes/krita_paintop.desktop
@@ -7554,6 +7907,7 @@ share/mime/packages/calligra_svm.xml
 share/mime/packages/krita.xml
 share/mime/packages/krita_ora.xml
 share/mime/packages/msooxml-all.xml
+share/mime/packages/wiki-format.xml
 share/templates/
 share/templates/.source/
 share/templates/.source/Illustration.odg

Reply | Threaded
Open this post in threaded view
|

Re: Update editors/calligra 2.9.4

Rafael Sadowski

Always the same game ... ping ;-)

On Thu May 07, 2015 at 08:56:00PM +0200, Rafael Sadowski wrote:

> Hi ports@
>
> blow is an maintainer update to Calligra 2.9.4. Tested @amd64
>
> Infos: https://www.calligra.org/news/calligra-2-9-4-released/
>
> Cheers,
>
> Rafael
>
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/editors/calligra/Makefile,v
> retrieving revision 1.7
> diff -u -p -u -p -r1.7 Makefile
> --- Makefile 27 Mar 2015 08:11:26 -0000 1.7
> +++ Makefile 7 May 2015 18:52:54 -0000
> @@ -1,10 +1,9 @@
>  # $OpenBSD: Makefile,v 1.7 2015/03/27 08:11:26 ajacoutot Exp $
>  
>  COMMENT = K Desktop Environment, office suite
> -HOMEPAGE = http://www.calligra-suite.org/
> -DISTNAME = calligra-2.8.7
> +HOMEPAGE = https://www.calligra-suite.org/
> +DISTNAME = calligra-2.9.4
>  CATEGORIES = editors
> -REVISION = 0
>  
>  DIST_SUBDIR = kde
>  MASTER_SITES = ${MASTER_SITE_KDE:=stable/${DISTNAME}/}
> @@ -71,13 +70,17 @@ SHARED_LIBS +=  planprivate            
>  SHARED_LIBS +=  planworkapp               50.0 # 0.0
>  SHARED_LIBS +=  planworkfactory           50.0 # 0.0
>  SHARED_LIBS +=  rcps_plan                 50.0 # 0.0
> -SHARED_LIBS +=  wordsprivate              50.0 # 0.0
>  SHARED_LIBS +=  kformula                  50.0 # 13.0
>  SHARED_LIBS +=  komsooxml                 50.0 # 13.0
>  SHARED_LIBS +=  koodf2                    50.0 # 13.0
>  SHARED_LIBS +=  koodfreader               50.0 # 13.0
>  SHARED_LIBS +=  kotextlayout              50.0 # 13.0
>  SHARED_LIBS +=  kovectorimage             50.0 # 13.0
> +SHARED_LIBS +=  koversion                 0.0 # 14.0
> +SHARED_LIBS +=  kritacolor                0.0 # 14.0
> +SHARED_LIBS +=  wordsprivate              14.0 # 1.0
> +SHARED_LIBS +=  libglobal                 0.0 # 14.0
> +SHARED_LIBS +=  libkispsd                 0.0 # 14.0
>  
>  WANTLIB =  c m pthread z
>  WANTLIB += GL GLEW GLU Half ICE Iex IlmImf IlmThread Imath SM X11 Xext Xi
> @@ -85,23 +88,25 @@ WANTLIB += fontconfig
>  WANTLIB += lib/qt4/QtDeclarative lib/qt4/QtWebKit lib/qt4/QtDBus
>  WANTLIB += lib/qt4/QtGui lib/qt4/QtNetwork lib/qt4/QtSvg lib/qt4/QtOpenGL
>  WANTLIB += lib/qt4/QtScript lib/qt4/QtXml
> -WANTLIB += lib/qt4/Qt3Support lib/qt4/QtSql
> +WANTLIB +=  lib/qt4/QtSql
>  WANTLIB += ${KDE4LIB}/akonadi-contact ${KDE4LIB}/akonadi-kde
>  WANTLIB += ${KDE4LIB}/kabc ${KDE4LIB}/kactivities
>  WANTLIB += ${KDE4LIB}/kcalcore ${KDE4LIB}/kcmutils ${KDE4LIB}/kdcraw
> -WANTLIB += ${KDE4LIB}/kde3support ${KDE4LIB}/kdeclarative
> +WANTLIB += ${KDE4LIB}/kdeclarative
>  WANTLIB += ${KDE4LIB}/kdeui ${KDE4LIB}/kfile ${KDE4LIB}/khtml
>  WANTLIB += ${KDE4LIB}/kio ${KDE4LIB}/kjs ${KDE4LIB}/kmime
> -WANTLIB += ${KDE4LIB}/knewstuff3 ${KDE4LIB}/knotifyconfig
> +WANTLIB += ${KDE4LIB}/knotifyconfig
>  WANTLIB += ${KDE4LIB}/kparts ${KDE4LIB}/kpimutils ${KDE4LIB}/kresources
>  WANTLIB += ${KDE4LIB}/krosscore ${KDE4LIB}/krossui
> -WANTLIB += ${KDE4LIB}/ktexteditor ${KDE4LIB}/marblewidget
> +WANTLIB += ${KDE4LIB}/marblewidget
>  WANTLIB += ${KDE4LIB}/nepomuk ${KDE4LIB}/nepomukutils
>  WANTLIB += ${KDE4LIB}/okularcore
>  WANTLIB += ${KDE4LIB}/phonon_sexperimental ${KDE4LIB}/threadweaver
>  WANTLIB += OpenColorIO exiv2 fftw3 freetype glib-2.0 gsl icui18n icuuc
>  WANTLIB += jpeg lcms2 mysqlclient openjpeg png poppler poppler-qt4 pqxx
>  WANTLIB += qca2 soprano sqlite3 sybdb tiff
> +WANTLIB += boost_system-mt curl ktexteditor gslcblas
> +
>  
>  # kexi needs headers in postgresql,{-main,-server}
>  # kexi needs all db drivers to be present while building
> @@ -109,7 +114,7 @@ BUILD_DEPENDS = devel/boost \
>   databases/mariadb \
>   databases/postgresql,-main \
>   databases/postgresql,-server \
> - math/eigen2 \
> + math/eigen3 \
>   productivity/librcps
>  
>  # kexi needs all db driver installed to run,
> @@ -136,6 +141,7 @@ LIB_DEPENDS = databases/freetds \
>   graphics/png \
>   graphics/tiff \
>   math/fftw3,double \
> + net/curl \
>   print/poppler,,-qt4 \
>   security/qca2 \
>   textproc/icu4c \
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/editors/calligra/distinfo,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 distinfo
> --- distinfo 23 Dec 2014 13:45:17 -0000 1.3
> +++ distinfo 7 May 2015 18:52:54 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (kde/calligra-2.8.7.tar.xz) = r2uLdOoHflu/o5jjrpaGa5o8z7wQIk6fNB5ZZDvoDrU=
> -SIZE (kde/calligra-2.8.7.tar.xz) = 138966248
> +SHA256 (kde/calligra-2.9.4.tar.xz) = qd023HK58kj4HsI5vmWOPn9WfkQYMnbz9AgyLrns9Ng=
> +SIZE (kde/calligra-2.9.4.tar.xz) = 193721936
> Index: patches/patch-cmake_modules_FindPoppler_cmake
> ===================================================================
> RCS file: /cvs/ports/editors/calligra/patches/patch-cmake_modules_FindPoppler_cmake,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 patch-cmake_modules_FindPoppler_cmake
> --- patches/patch-cmake_modules_FindPoppler_cmake 12 Jul 2014 10:44:18 -0000 1.1.1.1
> +++ patches/patch-cmake_modules_FindPoppler_cmake 7 May 2015 18:52:54 -0000
> @@ -1,9 +1,9 @@
>  $OpenBSD: patch-cmake_modules_FindPoppler_cmake,v 1.1.1.1 2014/07/12 10:44:18 zhuk Exp $
> ---- cmake/modules/FindPoppler.cmake.orig Sat Oct 12 10:17:41 2013
> -+++ cmake/modules/FindPoppler.cmake Sun Oct 20 15:12:39 2013
> -@@ -60,6 +60,10 @@ endif(POPPLER_FOUND)
> +--- cmake/modules/FindPoppler.cmake.orig Wed Apr  1 15:27:00 2015
> ++++ cmake/modules/FindPoppler.cmake Mon Apr 27 00:31:55 2015
> +@@ -60,6 +60,10 @@ endif()
>   if (POPPLER_FOUND)
> -   INCLUDE(CheckCXXSourceCompiles)
> +   include(CheckCXXSourceCompiles)
>  
>  +  # Unbreak Qt4 linking after QT_USE_IMPORTED_TARGETS set in KDE config
>  +  set(QT_USE_IMPORTED_TARGETS FALSE)
> Index: patches/patch-kexi_CMakeLists_txt
> ===================================================================
> RCS file: /cvs/ports/editors/calligra/patches/patch-kexi_CMakeLists_txt,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 patch-kexi_CMakeLists_txt
> --- patches/patch-kexi_CMakeLists_txt 12 Jul 2014 10:44:18 -0000 1.1.1.1
> +++ patches/patch-kexi_CMakeLists_txt 7 May 2015 18:52:54 -0000
> @@ -1,13 +1,13 @@
>  $OpenBSD: patch-kexi_CMakeLists_txt,v 1.1.1.1 2014/07/12 10:44:18 zhuk Exp $
>  Upstream bug?
> ---- kexi/CMakeLists.txt.orig Mon Mar 24 15:38:42 2014
> -+++ kexi/CMakeLists.txt Sun May  4 13:19:27 2014
> -@@ -88,7 +88,7 @@ set (PQXX_MAX_VERSION "5.0.0")
> - macro_optional_find_package(PostgreSQL)
> +--- kexi/CMakeLists.txt.orig Wed Apr  1 15:27:01 2015
> ++++ kexi/CMakeLists.txt Mon Apr 27 00:31:55 2015
> +@@ -49,7 +49,7 @@ set (PQXX_MAX_VERSION "5.0.0")
> + macro_optional_find_package(CalligraPostgreSQL)
>   macro_log_feature(POSTGRESQL_FOUND "libpq" "C application programmer's interface to PostgreSQL" "http://www.postgresql.org" FALSE "" "Required by Kexi PostgreSQL driver")
>  
>  -pkg_check_modules (PQXX libpqxx)
>  +macro_optional_find_package (Pqxx)
>  
> - IF (POSTGRESQL_FOUND AND PQXX_FOUND)
> -    IF (PQXX_VERSION VERSION_GREATER PQXX_MIN_VERSION AND PQXX_VERSION VERSION_LESS PQXX_MAX_VERSION)
> + if (POSTGRESQL_FOUND AND PQXX_FOUND)
> +    if (PQXX_VERSION VERSION_GREATER PQXX_MIN_VERSION AND PQXX_VERSION VERSION_LESS PQXX_MAX_VERSION)
> Index: patches/patch-kexi_widget_CMakeLists_txt
> ===================================================================
> RCS file: /cvs/ports/editors/calligra/patches/patch-kexi_widget_CMakeLists_txt,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 patch-kexi_widget_CMakeLists_txt
> --- patches/patch-kexi_widget_CMakeLists_txt 12 Jul 2014 10:44:18 -0000 1.1.1.1
> +++ patches/patch-kexi_widget_CMakeLists_txt 7 May 2015 18:52:54 -0000
> @@ -1,8 +1,8 @@
>  $OpenBSD: patch-kexi_widget_CMakeLists_txt,v 1.1.1.1 2014/07/12 10:44:18 zhuk Exp $
>  Unbreak build.
> ---- kexi/widget/CMakeLists.txt.orig Sun Oct 20 21:40:21 2013
> -+++ kexi/widget/CMakeLists.txt Sun Oct 20 21:54:12 2013
> -@@ -10,7 +10,7 @@ ENDIF(KEXI_MOBILE)
> +--- kexi/widget/CMakeLists.txt.orig Wed Apr  1 15:27:01 2015
> ++++ kexi/widget/CMakeLists.txt Mon Apr 27 00:31:55 2015
> +@@ -10,7 +10,7 @@ endif()
>  
>   add_definitions(-DKDE_DEFAULT_DEBUG_AREA=44023)
>  
> Index: patches/patch-krita_image_kis_painter_cc
> ===================================================================
> RCS file: patches/patch-krita_image_kis_painter_cc
> diff -N patches/patch-krita_image_kis_painter_cc
> --- patches/patch-krita_image_kis_painter_cc 12 Jul 2014 13:06:22 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,22 +0,0 @@
> -$OpenBSD: patch-krita_image_kis_painter_cc,v 1.2 2014/07/12 13:06:22 zhuk Exp $
> -REVIEW: https://git.reviewboard.kde.org/r/119244/
> ---- krita/image/kis_painter.cc.orig Sun Mar  2 15:46:08 2014
> -+++ krita/image/kis_painter.cc Wed Mar  5 21:20:39 2014
> -@@ -1393,7 +1393,7 @@ void KisPainter::drawLine(const QPointF& start, const
> -     int dstX = x2-x1;
> -     int dstY = y2-y1;
> -
> --    qreal _C = dstX*y1 - dstY*x1;
> -+    qreal uniC = dstX*y1 - dstY*x1;
> -     qreal projectionDenominator = 1.0 / (pow((double)dstX, 2) + pow((double)dstY, 2));
> -
> -     qreal subPixel;
> -@@ -1439,7 +1439,7 @@ void KisPainter::drawLine(const QPointF& start, const
> -                 AA_ = qMin( sqrt( pow((double)x - X1_, 2) + pow((double)y - Y1_, 2) ),
> -                             sqrt( pow((double)x - X2_, 2) + pow((double)y - Y2_, 2) ));
> -             }else{
> --                AA_ = qAbs(dstY*x - dstX*y + _C) * denominator;
> -+                AA_ = qAbs(dstY*x - dstX*y + uniC) * denominator;
> -             }
> -
> -             if (AA_>halfWidth) {
> Index: patches/patch-krita_plugins_extensions_gmic_3rdparty_gmic_CImg_h
> ===================================================================
> RCS file: patches/patch-krita_plugins_extensions_gmic_3rdparty_gmic_CImg_h
> diff -N patches/patch-krita_plugins_extensions_gmic_3rdparty_gmic_CImg_h
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-krita_plugins_extensions_gmic_3rdparty_gmic_CImg_h 7 May 2015 18:52:54 -0000
> @@ -0,0 +1,61 @@
> +$OpenBSD$
> +
> +Variables starting by underscore ("_") sign are reserved and should not be used
> +in applications.
> +
> +--- krita/plugins/extensions/gmic/3rdparty/gmic/CImg.h.orig Mon May  4 21:17:23 2015
> ++++ krita/plugins/extensions/gmic/3rdparty/gmic/CImg.h Mon May  4 21:22:58 2015
> +@@ -37389,19 +37389,19 @@ namespace cimg_library_suffixed {
> +             else { if (!visible_cursor) { disp.show_mouse(); visible_cursor = true; }}
> +             const int d = (depth()>1)?depth():0;
> +             int
> +-              _X = (int)X, _Y = (int)Y, _Z = (int)Z,
> ++              uniX = (int)X, uniY = (int)Y, uniZ = (int)Z,
> +               w = disp.width(), W = width() + d,
> +               h = disp.height(), H = height() + d,
> +-              _xp = (int)(_X*(float)w/W), xp = _xp + ((int)(_xp*(float)W/w)!=_X?1:0),
> +-              _yp = (int)(_Y*(float)h/H), yp = _yp + ((int)(_yp*(float)H/h)!=_Y?1:0),
> +-              _xn = (int)((_X+1.0f)*w/W-1), xn = _xn + ((int)((_xn+1.0f)*W/w)!=_X+1?1:0),
> +-              _yn = (int)((_Y+1.0f)*h/H-1), yn = _yn + ((int)((_yn+1.0f)*H/h)!=_Y+1?1:0),
> +-              _zxp = (int)((_Z+width())*(float)w/W), zxp = _zxp + ((int)(_zxp*(float)W/w)!=_Z+width()?1:0),
> +-              _zyp = (int)((_Z+height())*(float)h/H), zyp = _zyp + ((int)(_zyp*(float)H/h)!=_Z+height()?1:0),
> +-              _zxn = (int)((_Z+width()+1.0f)*w/W-1), zxn = _zxn + ((int)((_zxn+1.0f)*W/w)!=_Z+width()+1?1:0),
> +-              _zyn = (int)((_Z+height()+1.0f)*h/H-1), zyn = _zyn + ((int)((_zyn+1.0f)*H/h)!=_Z+height()+1?1:0),
> +-              _xM = (int)(width()*(float)w/W-1), xM = _xM + ((int)((_xM+1.0f)*W/w)!=width()?1:0),
> +-              _yM = (int)(height()*(float)h/H-1), yM = _yM + ((int)((_yM+1.0f)*H/h)!=height()?1:0),
> ++              unixp = (int)(uniX*(float)w/W), xp = unixp + ((int)(unixp*(float)W/w)!=uniX?1:0),
> ++              uniyp = (int)(uniY*(float)h/H), yp = uniyp + ((int)(uniyp*(float)H/h)!=uniY?1:0),
> ++              unixn = (int)((uniX+1.0f)*w/W-1), xn = unixn + ((int)((unixn+1.0f)*W/w)!=uniX+1?1:0),
> ++              uniyn = (int)((uniY+1.0f)*h/H-1), yn = uniyn + ((int)((uniyn+1.0f)*H/h)!=uniY+1?1:0),
> ++              unizxp = (int)((uniZ+width())*(float)w/W), zxp = unizxp + ((int)(unizxp*(float)W/w)!=uniZ+width()?1:0),
> ++              unizyp = (int)((uniZ+height())*(float)h/H), zyp = unizyp + ((int)(unizyp*(float)H/h)!=uniZ+height()?1:0),
> ++              unizxn = (int)((uniZ+width()+1.0f)*w/W-1), zxn = unizxn + ((int)((unizxn+1.0f)*W/w)!=uniZ+width()+1?1:0),
> ++              unizyn = (int)((uniZ+height()+1.0f)*h/H-1), zyn = unizyn + ((int)((unizyn+1.0f)*H/h)!=uniZ+height()+1?1:0),
> ++              unixM = (int)(width()*(float)w/W-1), xM = unixM + ((int)((unixM+1.0f)*W/w)!=width()?1:0),
> ++              uniyM = (int)(height()*(float)h/H-1), yM = uniyM + ((int)((uniyM+1.0f)*H/h)!=height()?1:0),
> +               xc = (xp + xn)/2,
> +               yc = (yp + yn)/2,
> +               zxc = (zxp + zxn)/2,
> +@@ -37439,14 +37439,14 @@ namespace cimg_library_suffixed {
> +             // Draw selection.
> +             if (phase) {
> +               const int
> +-                _xp0 = (int)(X0*(float)w/W), xp0 = _xp0 + ((int)(_xp0*(float)W/w)!=X0?1:0),
> +-                _yp0 = (int)(Y0*(float)h/H), yp0 = _yp0 + ((int)(_yp0*(float)H/h)!=Y0?1:0),
> +-                _xn0 = (int)((X0+1.0f)*w/W-1), xn0 = _xn0 + ((int)((_xn0+1.0f)*W/w)!=X0+1?1:0),
> +-                _yn0 = (int)((Y0+1.0f)*h/H-1), yn0 = _yn0 + ((int)((_yn0+1.0f)*H/h)!=Y0+1?1:0),
> +-                _zxp0 = (int)((Z0+width())*(float)w/W), zxp0 = _zxp0 + ((int)(_zxp0*(float)W/w)!=Z0+width()?1:0),
> +-                _zyp0 = (int)((Z0+height())*(float)h/H), zyp0 = _zyp0 + ((int)(_zyp0*(float)H/h)!=Z0+height()?1:0),
> +-                _zxn0 = (int)((Z0+width()+1.0f)*w/W-1), zxn0 = _zxn0 + ((int)((_zxn0+1.0f)*W/w)!=Z0+width()+1?1:0),
> +-                _zyn0 = (int)((Z0+height()+1.0f)*h/H-1), zyn0 = _zyn0 + ((int)((_zyn0+1.0f)*H/h)!=Z0+height()+1?1:0),
> ++                unixp0 = (int)(X0*(float)w/W), xp0 = unixp0 + ((int)(unixp0*(float)W/w)!=X0?1:0),
> ++                uniyp0 = (int)(Y0*(float)h/H), yp0 = uniyp0 + ((int)(uniyp0*(float)H/h)!=Y0?1:0),
> ++                unixn0 = (int)((X0+1.0f)*w/W-1), xn0 = unixn0 + ((int)((unixn0+1.0f)*W/w)!=X0+1?1:0),
> ++                uniyn0 = (int)((Y0+1.0f)*h/H-1), yn0 = uniyn0 + ((int)((uniyn0+1.0f)*H/h)!=Y0+1?1:0),
> ++                unizxp0 = (int)((Z0+width())*(float)w/W), zxp0 = unizxp0 + ((int)(unizxp0*(float)W/w)!=Z0+width()?1:0),
> ++                unizyp0 = (int)((Z0+height())*(float)h/H), zyp0 = unizyp0 + ((int)(unizyp0*(float)H/h)!=Z0+height()?1:0),
> ++                unizxn0 = (int)((Z0+width()+1.0f)*w/W-1), zxn0 = unizxn0 + ((int)((unizxn0+1.0f)*W/w)!=Z0+width()+1?1:0),
> ++                unizyn0 = (int)((Z0+height()+1.0f)*h/H-1), zyn0 = unizyn0 + ((int)((unizyn0+1.0f)*H/h)!=Z0+height()+1?1:0),
> +                 xc0 = (xp0 + xn0)/2,
> +                 yc0 = (yp0 + yn0)/2,
> +                 zxc0 = (zxp0 + zxn0)/2,
> Index: patches/patch-plan_libs_kernel_tests_CMakeLists_txt
> ===================================================================
> RCS file: /cvs/ports/editors/calligra/patches/patch-plan_libs_kernel_tests_CMakeLists_txt,v
> retrieving revision 1.1
> diff -u -p -u -p -r1.1 patch-plan_libs_kernel_tests_CMakeLists_txt
> --- patches/patch-plan_libs_kernel_tests_CMakeLists_txt 15 Jan 2015 18:13:52 -0000 1.1
> +++ patches/patch-plan_libs_kernel_tests_CMakeLists_txt 7 May 2015 18:52:54 -0000
> @@ -3,9 +3,9 @@ $OpenBSD: patch-plan_libs_kernel_tests_C
>  Rename some targets to avoid generating multiple ninja rules with
>  the same name
>  
> ---- plan/libs/kernel/tests/CMakeLists.txt.orig Sun Nov 30 08:02:20 2014
> -+++ plan/libs/kernel/tests/CMakeLists.txt Thu Jan 15 09:35:44 2015
> -@@ -73,9 +73,9 @@ target_link_libraries(ScheduleTester  ${KDE4_KDECORE_L
> +--- plan/libs/kernel/tests/CMakeLists.txt.orig Wed Apr  1 15:27:05 2015
> ++++ plan/libs/kernel/tests/CMakeLists.txt Mon Apr 27 00:31:55 2015
> +@@ -78,9 +78,9 @@ target_link_libraries(ScheduleTester  ${KDE4_KDECORE_L
>   set(ProjectTester_SRCS ProjectTester.cpp )
>    
>    
> Index: patches/patch-plan_plugins_schedulers_tj_CMakeLists_txt
> ===================================================================
> RCS file: /cvs/ports/editors/calligra/patches/patch-plan_plugins_schedulers_tj_CMakeLists_txt,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 patch-plan_plugins_schedulers_tj_CMakeLists_txt
> --- patches/patch-plan_plugins_schedulers_tj_CMakeLists_txt 12 Jul 2014 10:44:18 -0000 1.1.1.1
> +++ patches/patch-plan_plugins_schedulers_tj_CMakeLists_txt 7 May 2015 18:52:54 -0000
> @@ -1,7 +1,7 @@
>  $OpenBSD: patch-plan_plugins_schedulers_tj_CMakeLists_txt,v 1.1.1.1 2014/07/12 10:44:18 zhuk Exp $
>  XXX allow to build
> ---- plan/plugins/schedulers/tj/CMakeLists.txt.orig Thu Dec 26 13:04:14 2013
> -+++ plan/plugins/schedulers/tj/CMakeLists.txt Thu Dec 26 13:04:40 2013
> +--- plan/plugins/schedulers/tj/CMakeLists.txt.orig Wed Apr  1 15:27:05 2015
> ++++ plan/plugins/schedulers/tj/CMakeLists.txt Mon Apr 27 00:31:55 2015
>  @@ -3,7 +3,7 @@ set(LIBTJ_INCLUDE_DIR taskjuggler)
>   include_directories( ${LIBTJ_INCLUDE_DIR} ${KOODF_INCLUDES} ${CMAKE_SOURCE_DIR}/plan/libs/kernel ${KDE4_INCLUDES} )
>  
> @@ -9,5 +9,5 @@ XXX allow to build
>  -add_subdirectory( tests )
>  +#add_subdirectory( tests )
>  
> - SET ( TJScheduler_SRCS
> + set ( TJScheduler_SRCS
>       PlanTJPlugin.cpp
> Index: patches/patch-plugins_semanticitems_contact_CMakeLists_txt
> ===================================================================
> RCS file: /cvs/ports/editors/calligra/patches/patch-plugins_semanticitems_contact_CMakeLists_txt,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 patch-plugins_semanticitems_contact_CMakeLists_txt
> --- patches/patch-plugins_semanticitems_contact_CMakeLists_txt 12 Jul 2014 10:44:18 -0000 1.1.1.1
> +++ patches/patch-plugins_semanticitems_contact_CMakeLists_txt 7 May 2015 18:52:54 -0000
> @@ -1,12 +1,12 @@
>  $OpenBSD: patch-plugins_semanticitems_contact_CMakeLists_txt,v 1.1.1.1 2014/07/12 10:44:18 zhuk Exp $
>  Unbreak build.
> ---- plugins/semanticitems/contact/CMakeLists.txt.orig Fri Jul 11 19:04:57 2014
> -+++ plugins/semanticitems/contact/CMakeLists.txt Fri Jul 11 19:05:22 2014
> -@@ -25,6 +25,7 @@ endif (KdepimLibs_FOUND)
> +--- plugins/semanticitems/contact/CMakeLists.txt.orig Wed Apr  1 15:28:07 2015
> ++++ plugins/semanticitems/contact/CMakeLists.txt Mon Apr 27 00:31:56 2015
> +@@ -25,6 +25,7 @@ endif ()
>  
>   target_link_libraries(calligra_semanticitem_contact ${KDE4_KDECORE_LIBS}  ${KORDF_LIBS})
>  
>  +add_definitions(-DBOOST_NO_EXCEPTIONS)
>  
>   install(TARGETS calligra_semanticitem_contact  DESTINATION ${PLUGIN_INSTALL_DIR})
> - install(FILES   calligra_semanticitem_contact.desktop  DESTINATION ${SERVICES_INSTALL_DIR})
> + install(FILES   calligra_semanticitem_contact.desktop  DESTINATION ${SERVICES_INSTALL_DIR}/calligra)
> Index: patches/patch-stage_part_CMakeLists_txt
> ===================================================================
> RCS file: /cvs/ports/editors/calligra/patches/patch-stage_part_CMakeLists_txt,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 patch-stage_part_CMakeLists_txt
> --- patches/patch-stage_part_CMakeLists_txt 12 Jul 2014 10:44:18 -0000 1.1.1.1
> +++ patches/patch-stage_part_CMakeLists_txt 7 May 2015 18:52:54 -0000
> @@ -1,9 +1,9 @@
>  $OpenBSD: patch-stage_part_CMakeLists_txt,v 1.1.1.1 2014/07/12 10:44:18 zhuk Exp $
>  Unbreak build.
> ---- stage/part/CMakeLists.txt.orig Fri Jul 11 18:09:42 2014
> -+++ stage/part/CMakeLists.txt Fri Jul 11 18:10:18 2014
> +--- stage/part/CMakeLists.txt.orig Wed Apr  1 15:28:07 2015
> ++++ stage/part/CMakeLists.txt Mon Apr 27 00:31:56 2015
>  @@ -12,6 +12,8 @@ if (!WIN32) ## Disable tests in Windows whilst they br
> - endif(!WIN32)
> + endif()
>   add_subdirectory(tools)
>  
>  +add_definitions(-DBOOST_NO_EXCEPTIONS)
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/editors/calligra/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 PLIST
> --- pkg/PLIST 23 Dec 2014 13:45:17 -0000 1.3
> +++ pkg/PLIST 7 May 2015 18:52:55 -0000
> @@ -1,4 +1,4 @@
> -@comment $OpenBSD: PLIST,v 1.3 2014/12/23 13:45:17 zhuk Exp $
> +@comment $OpenBSD$
>  @conflict koffice-*
>  @bin bin/braindump
>  @bin bin/calligra
> @@ -6,6 +6,8 @@
>  @bin bin/calligraauthor
>  @bin bin/calligraconverter
>  @bin bin/calligraflow
> +@bin bin/calligragemini
> +@bin bin/calligrageminithumbnailhelper
>  @bin bin/calligraplan
>  @bin bin/calligraplanwork
>  @bin bin/calligrasheets
> @@ -18,18 +20,13 @@
>  @bin bin/kexi
>  @bin bin/kexi_sqlite3_dump
>  @bin bin/krita
> -@bin bin/kritagemini
> -@bin bin/kritasketch
>  @bin bin/visualimagecompare
> -include/kde4/KoPABackgroundTool.h
>  include/kde4/calligra/
>  include/kde4/calligra/DebugPigment.h
>  include/kde4/calligra/Ko3dScene.h
>  include/kde4/calligra/KoAnchorInlineObject.h
>  include/kde4/calligra/KoAnchorTextRange.h
>  include/kde4/calligra/KoAnnotationManager.h
> -include/kde4/calligra/KoApplication.h
> -include/kde4/calligra/KoApplicationAdaptor.h
>  include/kde4/calligra/KoBasicHistogramProducers.h
>  include/kde4/calligra/KoBookmark.h
>  include/kde4/calligra/KoBookmarkManager.h
> @@ -83,14 +80,11 @@ include/kde4/calligra/KoDockFactoryBase.
>  include/kde4/calligra/KoDockRegistry.h
>  include/kde4/calligra/KoDockWidgetTitleBar.h
>  include/kde4/calligra/KoDockWidgetTitleBarButton.h
> -include/kde4/calligra/KoDocument.h
> -include/kde4/calligra/KoDocumentEntry.h
> -include/kde4/calligra/KoDocumentInfo.h
> +include/kde4/calligra/KoDocumentBase.h
>  include/kde4/calligra/KoDocumentRdf.h
>  include/kde4/calligra/KoDocumentRdfBase.h
>  include/kde4/calligra/KoDocumentRdfEditWidget.h
>  include/kde4/calligra/KoDocumentResourceManager.h
> -include/kde4/calligra/KoDocumentSectionModel.h
>  include/kde4/calligra/KoDom.h
>  include/kde4/calligra/KoDpi.h
>  include/kde4/calligra/KoDrag.h
> @@ -104,9 +98,6 @@ include/kde4/calligra/KoEventActionRemov
>  include/kde4/calligra/KoFallBackColorTransformation.h
>  include/kde4/calligra/KoFileDialog.h
>  include/kde4/calligra/KoFillConfigWidget.h
> -include/kde4/calligra/KoFilter.h
> -include/kde4/calligra/KoFilterChain.h
> -include/kde4/calligra/KoFilterChainLinkList.h
>  include/kde4/calligra/KoFilterEffect.h
>  include/kde4/calligra/KoFilterEffectConfigWidgetBase.h
>  include/kde4/calligra/KoFilterEffectFactoryBase.h
> @@ -114,16 +105,6 @@ include/kde4/calligra/KoFilterEffectLoad
>  include/kde4/calligra/KoFilterEffectRegistry.h
>  include/kde4/calligra/KoFilterEffectRenderContext.h
>  include/kde4/calligra/KoFilterEffectStack.h
> -include/kde4/calligra/KoFilterEntry.h
> -include/kde4/calligra/KoFilterGraph.h
> -include/kde4/calligra/KoFilterManager.h
> -include/kde4/calligra/KoFilterVertex.h
> -include/kde4/calligra/KoFindBase.h
> -include/kde4/calligra/KoFindMatch.h
> -include/kde4/calligra/KoFindOption.h
> -include/kde4/calligra/KoFindOptionSet.h
> -include/kde4/calligra/KoFindText.h
> -include/kde4/calligra/KoFindToolbar.h
>  include/kde4/calligra/KoFlake.h
>  include/kde4/calligra/KoFontFace.h
>  include/kde4/calligra/KoFrameShape.h
> @@ -155,32 +136,31 @@ include/kde4/calligra/KoLabDarkenColorTr
>  include/kde4/calligra/KoLineStyleSelector.h
>  include/kde4/calligra/KoList.h
>  include/kde4/calligra/KoLoadingShapeUpdater.h
> -include/kde4/calligra/KoMainWindow.h
>  include/kde4/calligra/KoMixColorsOp.h
>  include/kde4/calligra/KoMixColorsOpImpl.h
> -include/kde4/calligra/KoModeBoxFactory.h
>  include/kde4/calligra/KoOasisSettings.h
>  include/kde4/calligra/KoOdf.h
>  include/kde4/calligra/KoOdfBibliographyConfiguration.h
> -include/kde4/calligra/KoOdfDocument.h
>  include/kde4/calligra/KoOdfGraphicProperties.h
>  include/kde4/calligra/KoOdfGraphicStyles.h
> +include/kde4/calligra/KoOdfHeaderFooterProperties.h
>  include/kde4/calligra/KoOdfLineNumberingConfiguration.h
>  include/kde4/calligra/KoOdfLoadingContext.h
>  include/kde4/calligra/KoOdfManifestEntry.h
>  include/kde4/calligra/KoOdfNotesConfiguration.h
>  include/kde4/calligra/KoOdfNumberDefinition.h
>  include/kde4/calligra/KoOdfNumberStyles.h
> +include/kde4/calligra/KoOdfPageLayoutProperties.h
>  include/kde4/calligra/KoOdfParagraphProperties.h
>  include/kde4/calligra/KoOdfPaste.h
>  include/kde4/calligra/KoOdfReadStore.h
>  include/kde4/calligra/KoOdfStyle.h
> +include/kde4/calligra/KoOdfStyleBase.h
>  include/kde4/calligra/KoOdfStyleManager.h
>  include/kde4/calligra/KoOdfStyleProperties.h
>  include/kde4/calligra/KoOdfStylesReader.h
>  include/kde4/calligra/KoOdfTextProperties.h
>  include/kde4/calligra/KoOdfWriteStore.h
> -include/kde4/calligra/KoOpacityConfigWidget.h
>  include/kde4/calligra/KoPABackgroundTool.h
>  include/kde4/calligra/KoPACanvas.h
>  include/kde4/calligra/KoPACanvasBase.h
> @@ -203,10 +183,8 @@ include/kde4/calligra/KoPageLayout.h
>  include/kde4/calligra/KoPageLayoutDialog.h
>  include/kde4/calligra/KoPageLayoutWidget.h
>  include/kde4/calligra/KoPagePreviewWidget.h
> -include/kde4/calligra/KoPageWidgetItem.h
>  include/kde4/calligra/KoPanTool.h
>  include/kde4/calligra/KoParameterToPathCommand.h
> -include/kde4/calligra/KoPart.h
>  include/kde4/calligra/KoPathCombineCommand.h
>  include/kde4/calligra/KoPathControlPointMoveCommand.h
>  include/kde4/calligra/KoPathFillRuleCommand.h
> @@ -223,7 +201,6 @@ include/kde4/calligra/KoPencilTool.h
>  include/kde4/calligra/KoPointedAt.h
>  include/kde4/calligra/KoPointerEvent.h
>  include/kde4/calligra/KoPositionSelector.h
> -include/kde4/calligra/KoPrintJob.h
>  include/kde4/calligra/KoProgressBar.h
>  include/kde4/calligra/KoProgressProxy.h
>  include/kde4/calligra/KoProgressUpdater.h
> @@ -239,6 +216,7 @@ include/kde4/calligra/KoRdfSemanticTree.
>  include/kde4/calligra/KoRdfSemanticTreeWidgetItem.h
>  include/kde4/calligra/KoResourceItemChooser.h
>  include/kde4/calligra/KoResourceItemChooserContextMenu.h
> +include/kde4/calligra/KoResourceModelBase.h
>  include/kde4/calligra/KoResourceSelector.h
>  include/kde4/calligra/KoResourceServer.h
>  include/kde4/calligra/KoResourceServerAdapter.h
> @@ -250,6 +228,9 @@ include/kde4/calligra/KoRgbColorSpaceTra
>  include/kde4/calligra/KoRow.h
>  include/kde4/calligra/KoRowStyle.h
>  include/kde4/calligra/KoSection.h
> +include/kde4/calligra/KoSectionEnd.h
> +include/kde4/calligra/KoSectionManager.h
> +include/kde4/calligra/KoSectionUtils.h
>  include/kde4/calligra/KoSelection.h
>  include/kde4/calligra/KoSemanticStylesheet.h
>  include/kde4/calligra/KoSemanticStylesheetsEditor.h
> @@ -293,7 +274,6 @@ include/kde4/calligra/KoShapeUngroupComm
>  include/kde4/calligra/KoShapeUserData.h
>  include/kde4/calligra/KoSharedSavingData.h
>  include/kde4/calligra/KoSizeGroup.h
> -include/kde4/calligra/KoStandardAction.h
>  include/kde4/calligra/KoStore.h
>  include/kde4/calligra/KoStoreDevice.h
>  include/kde4/calligra/KoStrokeConfigWidget.h
> @@ -335,17 +315,11 @@ include/kde4/calligra/KoToolProxy.h
>  include/kde4/calligra/KoToolRegistry.h
>  include/kde4/calligra/KoToolSelection.h
>  include/kde4/calligra/KoTriangleColorSelector.h
> -include/kde4/calligra/KoUniColorChooser.h
> -include/kde4/calligra/KoUniColorDialog.h
>  include/kde4/calligra/KoUnit.h
>  include/kde4/calligra/KoUpdater.h
>  include/kde4/calligra/KoVariable.h
>  include/kde4/calligra/KoVariableManager.h
> -include/kde4/calligra/KoVersionDialog.h
> -include/kde4/calligra/KoView.h
> -include/kde4/calligra/KoViewAdaptor.h
>  include/kde4/calligra/KoViewConverter.h
> -include/kde4/calligra/KoXYColorSelector.h
>  include/kde4/calligra/KoXmlNS.h
>  include/kde4/calligra/KoXmlReader.h
>  include/kde4/calligra/KoXmlReaderForward.h
> @@ -357,7 +331,6 @@ include/kde4/calligra/KoZoomController.h
>  include/kde4/calligra/KoZoomHandler.h
>  include/kde4/calligra/KoZoomInput.h
>  include/kde4/calligra/KoZoomMode.h
> -include/kde4/calligra/MacSupport.h
>  include/kde4/calligra/RdfForward.h
>  include/kde4/calligra/RdfSemanticTreeWidgetAction.h
>  include/kde4/calligra/RdfSemanticTreeWidgetSelectAction.h
> @@ -372,18 +345,19 @@ include/kde4/calligra/changetracker/KoDe
>  include/kde4/calligra/changetracker/KoDeletedRowColumnDataStore.h
>  include/kde4/calligra/changetracker/KoDeletedRowData.cpp
>  include/kde4/calligra/flake_export.h
> -include/kde4/calligra/komain_export.h
>  include/kde4/calligra/koodf2_export.h
>  include/kde4/calligra/koodf_export.h
>  include/kde4/calligra/kopageapp_export.h
>  include/kde4/calligra/kordf_export.h
>  include/kde4/calligra/kotext_export.h
>  include/kde4/calligra/kotextlayout_export.h
> +include/kde4/calligra/koversion_export.h
>  include/kde4/calligra/kowidgets_export.h
>  include/kde4/calligra/kowidgetutils_export.h
>  include/kde4/calligra/kundo2_export.h
>  include/kde4/calligra/kundo2command.h
>  include/kde4/calligra/kundo2group.h
> +include/kde4/calligra/kundo2magicstring.h
>  include/kde4/calligra/kundo2model.h
>  include/kde4/calligra/kundo2qstack.h
>  include/kde4/calligra/kundo2stack.h
> @@ -400,17 +374,8 @@ include/kde4/calligra/styles/KoTableCell
>  include/kde4/calligra/styles/KoTableColumnStyle.h
>  include/kde4/calligra/styles/KoTableRowStyle.h
>  include/kde4/calligra/styles/KoTableStyle.h
> -include/kde4/kexi/
> -include/kde4/kexi/forms/
> -include/kde4/kexi/forms/FormWidget.h
> -include/kde4/kexi/forms/FormWidgetInterface.h
> -include/kde4/kexi/forms/WidgetInfo.h
> -include/kde4/kexi/forms/WidgetTreeWidget.h
> -include/kde4/kexi/forms/objecttree.h
> -include/kde4/kexi/forms/widgetfactory.h
> -include/kde4/kexi/forms/widgetlibrary.h
> -include/kde4/kexi/forms/widgetwithsubpropertiesinterface.h
>  include/kde4/krita/
> +include/kde4/krita/KisViewManager.h
>  include/kde4/krita/fill_processing_visitor.h
>  include/kde4/krita/kis_base_node.h
>  include/kde4/krita/kis_base_processor.h
> @@ -435,6 +400,9 @@ include/kde4/krita/kis_generator.h
>  include/kde4/krita/kis_generator_registry.h
>  include/kde4/krita/kis_global.h
>  include/kde4/krita/kis_image.h
> +include/kde4/krita/kis_locked_properties.h
> +include/kde4/krita/kis_locked_properties_proxy.h
> +include/kde4/krita/kis_locked_properties_server.h
>  include/kde4/krita/kis_mask.h
>  include/kde4/krita/kis_multi_bool_filter_widget.h
>  include/kde4/krita/kis_multi_double_filter_widget.h
> @@ -454,14 +422,12 @@ include/kde4/krita/kis_selection.h
>  include/kde4/krita/kis_serializable_configuration.h
>  include/kde4/krita/kis_shared.h
>  include/kde4/krita/kis_shared_ptr.h
> -include/kde4/krita/kis_shared_ptr_vector.h
>  include/kde4/krita/kis_tiled_data_manager.h
>  include/kde4/krita/kis_tool.h
>  include/kde4/krita/kis_transaction.h
>  include/kde4/krita/kis_transform_worker.h
>  include/kde4/krita/kis_types.h
>  include/kde4/krita/kis_ui_types.h
> -include/kde4/krita/kis_view2.h
>  include/kde4/krita/kis_warptransform_worker.h
>  include/kde4/krita/krita_export.h
>  include/kde4/sheets/
> @@ -495,6 +461,10 @@ include/kde4/sheets/commands/
>  include/kde4/sheets/commands/AbstractRegionCommand.h
>  include/kde4/sheets/commands/DataManipulators.h
>  include/kde4/sheets/commands/SortManipulator.h
> +include/kde4/sheets/commands/pivot.h
> +include/kde4/sheets/commands/pivotfilters.h
> +include/kde4/sheets/commands/pivotmain.h
> +include/kde4/sheets/commands/pivotoptions.h
>  include/kde4/sheets/database/
>  include/kde4/sheets/database/Database.h
>  include/kde4/sheets/database/Filter.h
> @@ -556,222 +526,20 @@ include/kde4/words/part/frames/KWTextFra
>  include/kde4/words/part/words_export.h
>  lib/calligra/
>  lib/calligra/imports/
> +lib/calligra/imports/Calligra/
> +lib/calligra/imports/Calligra/Gemini/
> +lib/calligra/imports/Calligra/Gemini/Dropbox/
> +lib/calligra/imports/Calligra/Gemini/Dropbox/libcalligrageminidropboxplugin.so
> +lib/calligra/imports/Calligra/Gemini/Dropbox/qmldir
>  lib/calligra/imports/org/
> +lib/calligra/imports/org/calligra/
> +lib/calligra/imports/org/calligra/CalligraComponents/
> +lib/calligra/imports/org/calligra/CalligraComponents/libcalligraqtquickcomponentsplugin.so
> +lib/calligra/imports/org/calligra/CalligraComponents/qmldir
>  lib/calligra/imports/org/krita/
>  lib/calligra/imports/org/krita/draganddrop/
>  lib/calligra/imports/org/krita/draganddrop/libdraganddropplugin.so
>  lib/calligra/imports/org/krita/draganddrop/qmldir
> -lib/calligra/imports/org/krita/sketch/
> -lib/calligra/imports/org/krita/sketch/HelpPage.qml
> -lib/calligra/imports/org/krita/sketch/KritaSketchBase.qml
> -lib/calligra/imports/org/krita/sketch/MainPage.qml
> -lib/calligra/imports/org/krita/sketch/OpenImagePage.qml
> -lib/calligra/imports/org/krita/sketch/SaveImagePage.qml
> -lib/calligra/imports/org/krita/sketch/SettingsPage.qml
> -lib/calligra/imports/org/krita/sketch/WelcomePage.qml
> -lib/calligra/imports/org/krita/sketch/components/
> -lib/calligra/imports/org/krita/sketch/components/BusyIndicator.qml
> -lib/calligra/imports/org/krita/sketch/components/Button.qml
> -lib/calligra/imports/org/krita/sketch/components/CategorySwitcher.qml
> -lib/calligra/imports/org/krita/sketch/components/CheckBox.qml
> -lib/calligra/imports/org/krita/sketch/components/ColorSwatch.qml
> -lib/calligra/imports/org/krita/sketch/components/Dialog.qml
> -lib/calligra/imports/org/krita/sketch/components/Divider.qml
> -lib/calligra/imports/org/krita/sketch/components/DropShadow.qml
> -lib/calligra/imports/org/krita/sketch/components/ExpandingListView.qml
> -lib/calligra/imports/org/krita/sketch/components/Header.qml
> -lib/calligra/imports/org/krita/sketch/components/Label.qml
> -lib/calligra/imports/org/krita/sketch/components/ListItem.qml
> -lib/calligra/imports/org/krita/sketch/components/MessageStack.qml
> -lib/calligra/imports/org/krita/sketch/components/NewImageList.qml
> -lib/calligra/imports/org/krita/sketch/components/NewsList.qml
> -lib/calligra/imports/org/krita/sketch/components/Page.qml
> -lib/calligra/imports/org/krita/sketch/components/PageStack.js
> -lib/calligra/imports/org/krita/sketch/components/PageStack.qml
> -lib/calligra/imports/org/krita/sketch/components/PanelTextField.qml
> -lib/calligra/imports/org/krita/sketch/components/RangeInput.qml
> -lib/calligra/imports/org/krita/sketch/components/RecentFilesList.qml
> -lib/calligra/imports/org/krita/sketch/components/ScrollDecorator.qml
> -lib/calligra/imports/org/krita/sketch/components/Slider.qml
> -lib/calligra/imports/org/krita/sketch/components/TextField.qml
> -lib/calligra/imports/org/krita/sketch/components/TextFieldMultiline.qml
> -lib/calligra/imports/org/krita/sketch/components/VirtualKeyboard.qml
> -lib/calligra/imports/org/krita/sketch/images/
> -lib/calligra/imports/org/krita/sketch/images/blue.png
> -lib/calligra/imports/org/krita/sketch/images/busyindicator.png
> -lib/calligra/imports/org/krita/sketch/images/camera-web.png
> -lib/calligra/imports/org/krita/sketch/images/configure.png
> -lib/calligra/imports/org/krita/sketch/images/divider.png
> -lib/calligra/imports/org/krita/sketch/images/divider2.png
> -lib/calligra/imports/org/krita/sketch/images/document-new.png
> -lib/calligra/imports/org/krita/sketch/images/document-open.png
> -lib/calligra/imports/org/krita/sketch/images/document-save-as.png
> -lib/calligra/imports/org/krita/sketch/images/document-save.png
> -lib/calligra/imports/org/krita/sketch/images/document-share.png
> -lib/calligra/imports/org/krita/sketch/images/edit-copy.png
> -lib/calligra/imports/org/krita/sketch/images/edit-cut.png
> -lib/calligra/imports/org/krita/sketch/images/edit-paste.png
> -lib/calligra/imports/org/krita/sketch/images/edit-redo.png
> -lib/calligra/imports/org/krita/sketch/images/edit-select.png
> -lib/calligra/imports/org/krita/sketch/images/edit-undo.png
> -lib/calligra/imports/org/krita/sketch/images/green.png
> -lib/calligra/imports/org/krita/sketch/images/handle-menu.png
> -lib/calligra/imports/org/krita/sketch/images/header_krita_sketch.png
> -lib/calligra/imports/org/krita/sketch/images/header_krita_sketch_light.png
> -lib/calligra/imports/org/krita/sketch/images/header_red.png
> -lib/calligra/imports/org/krita/sketch/images/help-about.png
> -lib/calligra/imports/org/krita/sketch/images/image-x-generic.png
> -lib/calligra/imports/org/krita/sketch/images/krita.png
> -lib/calligra/imports/org/krita/sketch/images/kritasketch.png
> -lib/calligra/imports/org/krita/sketch/images/red.png
> -lib/calligra/imports/org/krita/sketch/images/shadow-bc.png
> -lib/calligra/imports/org/krita/sketch/images/shadow-bl.png
> -lib/calligra/imports/org/krita/sketch/images/shadow-br.png
> -lib/calligra/imports/org/krita/sketch/images/shadow-lc.png
> -lib/calligra/imports/org/krita/sketch/images/shadow-rc.png
> -lib/calligra/imports/org/krita/sketch/images/shadow-smooth.png
> -lib/calligra/imports/org/krita/sketch/images/shadow-tc.png
> -lib/calligra/imports/org/krita/sketch/images/shadow-tl.png
> -lib/calligra/imports/org/krita/sketch/images/shadow-tr.png
> -lib/calligra/imports/org/krita/sketch/images/svg/
> -lib/calligra/imports/org/krita/sketch/images/svg/checker-small.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/combo-arrows-white.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-A4landscape-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-A4portrait-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-add-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-add.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-apply-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-apply.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-back.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-camera-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-cancel-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-close.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-color_wheel.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-colorpicker.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-crop-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-crop.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-delete-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-delete.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-down.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-edit.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-erase.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-fileclip-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-filenew-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-filenew.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-fileopen-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-fileopen.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-filesave.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-filesaveas.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-fileshare.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-fill-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-fill.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-filter_delete-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-filter_load-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-filter_save-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-forward.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-gradient-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-gradient.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-help.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-krita_sketch.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-layer_filter-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-layer_group-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-layer_paint-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-locked_off-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-locked_on-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-minimize.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-mirror_c-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-mirror_h-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-mirror_v-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-move-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-move.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-paint-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-paint.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-palette-add-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-palette-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-palette-delete-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-palette.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-redo.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-select-add.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-select-apply.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-select-area.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-select-color.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-select-deselect.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-select-hide.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-select-intersect.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-select-polygon.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-select-rectangle.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-select-replace.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-select-reselect.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-select-show.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-select-sub.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-settings.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-switch.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-transform-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-transform.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-undo.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-up.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-visible_off-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-visible_off.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-visible_on-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-visible_on.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-web.svg
> -lib/calligra/imports/org/krita/sketch/libkritasketchplugin.so
> -lib/calligra/imports/org/krita/sketch/panels/
> -lib/calligra/imports/org/krita/sketch/panels/ColorPanel.qml
> -lib/calligra/imports/org/krita/sketch/panels/EditLayerPage.qml
> -lib/calligra/imports/org/krita/sketch/panels/EditPresetPage.qml
> -lib/calligra/imports/org/krita/sketch/panels/FilterPanel.qml
> -lib/calligra/imports/org/krita/sketch/panels/LayersPanel.qml
> -lib/calligra/imports/org/krita/sketch/panels/MenuPanel.qml
> -lib/calligra/imports/org/krita/sketch/panels/NewImagePanel.qml
> -lib/calligra/imports/org/krita/sketch/panels/OpenImagePanel.qml
> -lib/calligra/imports/org/krita/sketch/panels/Panel.qml
> -lib/calligra/imports/org/krita/sketch/panels/PanelBar.qml
> -lib/calligra/imports/org/krita/sketch/panels/PanelDropArea.qml
> -lib/calligra/imports/org/krita/sketch/panels/PresetsPanel.qml
> -lib/calligra/imports/org/krita/sketch/panels/SelectPanel.qml
> -lib/calligra/imports/org/krita/sketch/panels/ToolOverlayPanel.qml
> -lib/calligra/imports/org/krita/sketch/panels/ToolPanel.qml
> -lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/
> -lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/blur.qml
> -lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/brightnesscontrast.qml
> -lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/burn.qml
> -lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/colortoalpha.qml
> -lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/colortransfer.qml
> -lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/dodge.qml
> -lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/emboss.qml
> -lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/gaussian blur.qml
> -lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/gaussiannoisereducer.qml
> -lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/hsvadjustment.qml
> -lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/lens blur.qml
> -lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/levels.qml
> -lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/motion blur.qml
> -lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/noise.qml
> -lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/nothing-to-configure.qml
> -lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/oilpaint.qml
> -lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/perchannel.qml
> -lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/phongbumpmap.qml
> -lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/pixelize.qml
> -lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/raindrops.qml
> -lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/randompick.qml
> -lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/roundcorners.qml
> -lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/smalltiles.qml
> -lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/sobel.qml
> -lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/unsharp.qml
> -lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/wave.qml
> -lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/waveletnoisereducer.qml
> -lib/calligra/imports/org/krita/sketch/panels/toolconfigpages/
> -lib/calligra/imports/org/krita/sketch/panels/toolconfigpages/crop.qml
> -lib/calligra/imports/org/krita/sketch/panels/toolconfigpages/fill.qml
> -lib/calligra/imports/org/krita/sketch/panels/toolconfigpages/gradient.qml
> -lib/calligra/imports/org/krita/sketch/panels/toolconfigpages/move.qml
> -lib/calligra/imports/org/krita/sketch/panels/toolconfigpages/paint.qml
> -lib/calligra/imports/org/krita/sketch/panels/toolconfigpages/transform.qml
> -lib/calligra/imports/org/krita/sketch/panels/tooloverlays/
> -lib/calligra/imports/org/krita/sketch/panels/tooloverlays/move.qml
> -lib/calligra/imports/org/krita/sketch/panels/tooloverlays/none.qml
> -lib/calligra/imports/org/krita/sketch/panels/tooloverlays/transform.qml
> -lib/calligra/imports/org/krita/sketch/qmldir
>  lib/kde4/authorpart.so
>  lib/kde4/braindump_shape_state.so
>  lib/kde4/braindump_shape_web.so
> @@ -793,9 +561,11 @@ lib/kde4/calligra_filter_kpr2odp.so
>  lib/kde4/calligra_filter_kspread2tex.so
>  lib/kde4/calligra_filter_mpxj2plan.so
>  lib/kde4/calligra_filter_odt2ascii.so
> +lib/kde4/calligra_filter_odt2docx.so
>  lib/kde4/calligra_filter_odt2epub2.so
>  lib/kde4/calligra_filter_odt2html.so
>  lib/kde4/calligra_filter_odt2mobi.so
> +lib/kde4/calligra_filter_odt2wiki.so
>  lib/kde4/calligra_filter_opencalc2sheets.so
>  lib/kde4/calligra_filter_pdf2svg.so
>  lib/kde4/calligra_filter_ppt2odp.so
> @@ -905,6 +675,7 @@ lib/kde4/kritacolorgenerator.so
>  lib/kde4/kritacolorrange.so
>  lib/kde4/kritacolorselectorng.so
>  lib/kde4/kritacolorsfilters.so
> +lib/kde4/kritacolorslider.so
>  lib/kde4/kritacolorsmudgepaintop.so
>  lib/kde4/kritacolorspaceconversion.so
>  lib/kde4/kritacompositiondocker.so
> @@ -916,7 +687,6 @@ lib/kde4/kritadefaulttools.so
>  lib/kde4/kritadeformpaintop.so
>  lib/kde4/kritadigitalmixer.so
>  lib/kde4/kritadodgeburn.so
> -lib/kde4/kritadropshadow.so
>  lib/kde4/kritadynapaintop.so
>  lib/kde4/kritaembossfilter.so
>  lib/kde4/kritaexample.so
> @@ -926,22 +696,25 @@ lib/kde4/kritaexrimport.so
>  lib/kde4/kritaextensioncolorsfilters.so
>  lib/kde4/kritafastcolortransferfilter.so
>  lib/kde4/kritafilterop.so
> -lib/kde4/kritaflipbookimport.so
>  lib/kde4/kritagmic.so
>  lib/kde4/kritagridpaintop.so
>  lib/kde4/kritahairypaintop.so
>  lib/kde4/kritahatchingpaintop.so
> +lib/kde4/kritaheightmapexport.so
> +lib/kde4/kritaheightmapimport.so
>  lib/kde4/kritahistogram.so
>  lib/kde4/kritahistorydocker.so
>  lib/kde4/kritaimagedocker.so
>  lib/kde4/kritaimageenhancement.so
>  lib/kde4/kritaimagesize.so
>  lib/kde4/kritaimagesplit.so
> +lib/kde4/kritaindexcolors.so
>  lib/kde4/kritajp2export.so
>  lib/kde4/kritajp2import.so
>  lib/kde4/kritajpegexport.so
>  lib/kde4/kritajpegimport.so
>  lib/kde4/kritalayergroupswitcher.so
> +lib/kde4/kritalayersplit.so
>  lib/kde4/kritalevelfilter.so
>  lib/kde4/kritalutdocker.so
>  lib/kde4/kritametadataeditor.so
> @@ -954,7 +727,6 @@ lib/kde4/kritaoraexport.so
>  lib/kde4/kritaoraimport.so
>  lib/kde4/kritaoverviewdocker.so
>  lib/kde4/kritapalettedocker.so
> -lib/kde4/kritapart.so
>  lib/kde4/kritaparticlepaintop.so
>  lib/kde4/kritapatterndocker.so
>  lib/kde4/kritapatterngenerator.so
> @@ -963,6 +735,7 @@ lib/kde4/kritaphongbumpmap.so
>  lib/kde4/kritapixelizefilter.so
>  lib/kde4/kritapngexport.so
>  lib/kde4/kritapngimport.so
> +lib/kde4/kritaposterize.so
>  lib/kde4/kritappmexport.so
>  lib/kde4/kritappmimport.so
>  lib/kde4/kritapresetdocker.so
> @@ -971,6 +744,7 @@ lib/kde4/kritapsdimport.so
>  lib/kde4/kritaqmlexport.so
>  lib/kde4/kritaraindropsfilter.so
>  lib/kde4/kritarandompickfilter.so
> +lib/kde4/kritaresourcemanager.so
>  lib/kde4/kritarotateimage.so
>  lib/kde4/kritaroundcornersfilter.so
>  lib/kde4/kritarulerassistanttool.so
> @@ -984,6 +758,9 @@ lib/kde4/kritasobelfilter.so
>  lib/kde4/kritaspecificcolorselector.so
>  lib/kde4/kritaspraypaintop.so
>  lib/kde4/kritatasksetdocker.so
> +lib/kde4/kritatgaexport.so
> +lib/kde4/kritatgaimport.so
> +lib/kde4/kritathumbnail.so
>  lib/kde4/kritatiffexport.so
>  lib/kde4/kritatiffimport.so
>  lib/kde4/kritatoolcrop.so
> @@ -1015,6 +792,7 @@ lib/kde4/kspreadstatisticalmodule.so
>  lib/kde4/kspreadtextmodule.so
>  lib/kde4/kspreadtrigonometrymodule.so
>  lib/kde4/okularGenerator_odp.so
> +lib/kde4/okularGenerator_odt.so
>  lib/kde4/planconvert/
>  lib/kde4/planconvert/PlanConvert.jar
>  lib/kde4/planicalexport.so
> @@ -1022,6 +800,8 @@ lib/kde4/plankplatoimport.so
>  lib/kde4/planpart.so
>  lib/kde4/plantjscheduler.so
>  lib/kde4/planworkpart.so
> +lib/kde4/plugins/imageformats/kimg_kra.so
> +lib/kde4/plugins/imageformats/kimg_ora.so
>  lib/kde4/sheetssolver.so
>  lib/kde4/wordspart.so
>  @lib lib/libRtfReader.so.${LIBRtfReader_VERSION}
> @@ -1045,7 +825,6 @@ lib/libkdeinit4_calligrasheets.so
>  lib/libkdeinit4_calligrastage.so
>  lib/libkdeinit4_calligrawords.so
>  lib/libkdeinit4_karbon.so
> -lib/libkdeinit4_krita.so
>  @lib lib/libkexicore.so.${LIBkexicore_VERSION}
>  @lib lib/libkexidatatable.so.${LIBkexidatatable_VERSION}
>  @lib lib/libkexidataviewcommon.so.${LIBkexidataviewcommon_VERSION}
> @@ -1073,29 +852,42 @@ lib/libkdeinit4_krita.so
>  @lib lib/libkotext.so.${LIBkotext_VERSION}
>  @lib lib/libkotextlayout.so.${LIBkotextlayout_VERSION}
>  @lib lib/libkovectorimage.so.${LIBkovectorimage_VERSION}
> +@lib lib/libkoversion.so.${LIBkoversion_VERSION}
>  @lib lib/libkowidgets.so.${LIBkowidgets_VERSION}
>  @lib lib/libkowidgetutils.so.${LIBkowidgetutils_VERSION}
>  @lib lib/libkowv2.so.${LIBkowv2_VERSION}
>  @lib lib/libkplatokernel.so.${LIBkplatokernel_VERSION}
>  @lib lib/libkplatomodels.so.${LIBkplatomodels_VERSION}
>  @lib lib/libkplatoui.so.${LIBkplatoui_VERSION}
> +@lib lib/libkritacolor.so.${LIBkritacolor_VERSION}
> +lib/libkritacolord.so
>  @lib lib/libkritaimage.so.${LIBkritaimage_VERSION}
>  @lib lib/libkritalibbrush.so.${LIBkritalibbrush_VERSION}
>  @lib lib/libkritalibpaintop.so.${LIBkritalibpaintop_VERSION}
> -lib/libkritasketchlib.so
>  @lib lib/libkritaui.so.${LIBkritaui_VERSION}
>  @lib lib/libkundo2.so.${LIBkundo2_VERSION}
> +@lib lib/liblibglobal.so.${LIBlibglobal_VERSION}
> +@lib lib/liblibkispsd.so.${LIBlibkispsd_VERSION}
>  @lib lib/libpigmentcms.so.${LIBpigmentcms_VERSION}
>  @lib lib/libplanprivate.so.${LIBplanprivate_VERSION}
>  @lib lib/libplanworkapp.so.${LIBplanworkapp_VERSION}
>  @lib lib/libplanworkfactory.so.${LIBplanworkfactory_VERSION}
>  @lib lib/librcps_plan.so.${LIBrcps_plan_VERSION}
>  @lib lib/libwordsprivate.so.${LIBwordsprivate_VERSION}
> +share/appdata/braindump.appdata.xml
> +share/appdata/flow.appdata.xml
> +share/appdata/karbon.appdata.xml
> +share/appdata/kexi.appdata.xml
>  share/appdata/krita.appdata.xml
> -share/applications/calligraactive.desktop
> +share/appdata/plan.appdata.xml
> +share/appdata/sheets.appdata.xml
> +share/appdata/stage.appdata.xml
> +share/appdata/words.appdata.xml
>  share/applications/kde4/author.desktop
>  share/applications/kde4/braindump.desktop
>  share/applications/kde4/calligra.desktop
> +share/applications/kde4/calligraactive.desktop
> +share/applications/kde4/calligragemini.desktop
>  share/applications/kde4/calligrawords_ascii.desktop
>  share/applications/kde4/flow.desktop
>  share/applications/kde4/karbon.desktop
> @@ -1103,7 +895,7 @@ share/applications/kde4/kexi.desktop
>  share/applications/kde4/krita.desktop
>  share/applications/kde4/krita_bmp.desktop
>  share/applications/kde4/krita_exr.desktop
> -share/applications/kde4/krita_flipbook.desktop
> +share/applications/kde4/krita_heightmap.desktop
>  share/applications/kde4/krita_jp2.desktop
>  share/applications/kde4/krita_jpeg.desktop
>  share/applications/kde4/krita_odg.desktop
> @@ -1113,11 +905,13 @@ share/applications/kde4/krita_png.deskto
>  share/applications/kde4/krita_ppm.desktop
>  share/applications/kde4/krita_psd.desktop
>  share/applications/kde4/krita_raw.desktop
> +share/applications/kde4/krita_tga.desktop
>  share/applications/kde4/krita_tiff.desktop
>  share/applications/kde4/krita_xcf.desktop
> -share/applications/kde4/kritagemini.desktop
> -share/applications/kde4/kritasketch.desktop
> +share/applications/kde4/okularApplication_doc_calligra.desktop
> +share/applications/kde4/okularApplication_docx_calligra.desktop
>  share/applications/kde4/okularApplication_odp.desktop
> +share/applications/kde4/okularApplication_odt.desktop
>  share/applications/kde4/plan.desktop
>  share/applications/kde4/planwork.desktop
>  share/applications/kde4/sheets.desktop
> @@ -1151,6 +945,7 @@ share/apps/calligra/icons/hicolor/128x12
>  share/apps/calligra/icons/hicolor/128x128/actions/template_ratio_1610.png
>  share/apps/calligra/icons/hicolor/128x128/actions/template_ratio_2391.png
>  share/apps/calligra/icons/hicolor/128x128/actions/template_ratio_43.png
> +share/apps/calligra/icons/hicolor/128x128/actions/template_web_design.png
>  share/apps/calligra/icons/hicolor/16x16/
>  share/apps/calligra/icons/hicolor/16x16/actions/
>  share/apps/calligra/icons/hicolor/16x16/actions/abs.png
> @@ -1425,18 +1220,322 @@ share/apps/calligra/palettes/swatch-colo
>  share/apps/calligra/palettes/swatch-rgb.gpl
>  share/apps/calligra/palettes/swatche.gpl
>  share/apps/calligra/palettes/web.gpl
> +share/apps/calligra/pics/
> +share/apps/calligra/pics/dark_docker_close.png
> +share/apps/calligra/pics/dark_docker_collapse_a.png
> +share/apps/calligra/pics/dark_docker_collapse_b.png
> +share/apps/calligra/pics/dark_docker_float.png
> +share/apps/calligra/pics/dark_docker_lock_a.png
> +share/apps/calligra/pics/dark_docker_lock_b.png
> +share/apps/calligra/pics/light_docker_close.png
> +share/apps/calligra/pics/light_docker_collapse_a.png
> +share/apps/calligra/pics/light_docker_collapse_b.png
> +share/apps/calligra/pics/light_docker_float.png
> +share/apps/calligra/pics/light_docker_lock_a.png
> +share/apps/calligra/pics/light_docker_lock_b.png
>  share/apps/calligra/styles/
>  share/apps/calligra/styles/markers.xml
>  share/apps/calligra/thesaurus/
>  share/apps/calligra/thesaurus/thesaurus.txt
> +share/apps/calligragemini/
> +share/apps/calligragemini/calligragemini.qml
> +share/apps/calligragemini/qml/
> +share/apps/calligragemini/qml/MainPage.qml
> +share/apps/calligragemini/qml/PresentationDJMode.qml
> +share/apps/calligragemini/qml/StageDocumentPage.qml
> +share/apps/calligragemini/qml/WelcomePage.qml
> +share/apps/calligragemini/qml/WordsDocumentPage.qml
> +share/apps/calligragemini/qml/components/
> +share/apps/calligragemini/qml/components/BusyIndicator.qml
> +share/apps/calligragemini/qml/components/Button.qml
> +share/apps/calligragemini/qml/components/CategorySwitcher.qml
> +share/apps/calligragemini/qml/components/CheckBox.qml
> +share/apps/calligragemini/qml/components/CohereButton.qml
> +share/apps/calligragemini/qml/components/ColorSwatch.qml
> +share/apps/calligragemini/qml/components/Dialog.qml
> +share/apps/calligragemini/qml/components/Divider.qml
> +share/apps/calligragemini/qml/components/DropShadow.qml
> +share/apps/calligragemini/qml/components/ExpandingListView.qml
> +share/apps/calligragemini/qml/components/Header.qml
> +share/apps/calligragemini/qml/components/Label.qml
> +share/apps/calligragemini/qml/components/ListItem.qml
> +share/apps/calligragemini/qml/components/MessageStack.qml
> +share/apps/calligragemini/qml/components/NewImageList.qml
> +share/apps/calligragemini/qml/components/NewsList.qml
> +share/apps/calligragemini/qml/components/Page.qml
> +share/apps/calligragemini/qml/components/PageStack.js
> +share/apps/calligragemini/qml/components/PageStack.qml
> +share/apps/calligragemini/qml/components/PanelTextField.qml
> +share/apps/calligragemini/qml/components/ProgressBar.qml
> +share/apps/calligragemini/qml/components/RangeInput.qml
> +share/apps/calligragemini/qml/components/RecentFilesList.qml
> +share/apps/calligragemini/qml/components/ScrollDecorator.qml
> +share/apps/calligragemini/qml/components/Shadow.qml
> +share/apps/calligragemini/qml/components/Slider.qml
> +share/apps/calligragemini/qml/components/TextField.qml
> +share/apps/calligragemini/qml/components/TextFieldMultiline.qml
> +share/apps/calligragemini/qml/components/Tooltip.qml
> +share/apps/calligragemini/qml/components/VirtualKeyboard.qml
> +share/apps/calligragemini/qml/panels/
> +share/apps/calligragemini/qml/panels/ImageToolsPanel.qml
> +share/apps/calligragemini/qml/panels/NotesPanel.qml
> +share/apps/calligragemini/qml/panels/OptionsPanel.qml
> +share/apps/calligragemini/qml/panels/TextStylePanel.qml
> +share/apps/calligragemini/qml/panels/notespanelpages/
> +share/apps/calligragemini/qml/panels/notespanelpages/NotesPanelAddCustom.qml
> +share/apps/calligragemini/qml/panels/notespanelpages/NotesPanelMain.qml
> +share/apps/calligragemini/qml/panels/notespanelpages/NotesPanelSummary.qml
> +share/apps/calligragemini/qml/welcomepages/
> +share/apps/calligragemini/qml/welcomepages/CustomDocWords.qml
> +share/apps/calligragemini/qml/welcomepages/TemplatesWords.qml
> +share/apps/calligragemini/qml/welcomepages/VariantSelector.qml
> +share/apps/calligragemini/qml/welcomepages/WelcomePageCloud.qml
> +share/apps/calligragemini/qml/welcomepages/WelcomePageCustom.qml
> +share/apps/calligragemini/qml/welcomepages/WelcomePageFilebrowser.qml
> +share/apps/calligragemini/qml/welcomepages/WelcomePageRecent.qml
> +share/apps/calligragemini/qml/welcomepages/WelcomePageStage.qml
> +share/apps/calligragemini/qml/welcomepages/WelcomePageWords.qml
> +share/apps/calligragemini/qml/welcomepages/cloud/
> +share/apps/calligragemini/qml/welcomepages/cloud/AddDropbox.qml
> +share/apps/calligragemini/qml/welcomepages/cloud/AddGit.qml
> +share/apps/calligragemini/qml/welcomepages/cloud/AddWebdav.qml
> +share/apps/calligragemini/qml/welcomepages/cloud/CloudAccounts.qml
> +share/apps/calligragemini/qml/welcomepages/cloud/Dropbox.qml
> +share/apps/calligragemini/qml/welcomepages/cloud/EditDetailsBase.qml
> +share/apps/calligragemini/qml/welcomepages/cloud/EditGit.qml
> +share/apps/calligragemini/qml/welcomepages/cloud/Git.qml
> +share/apps/calligragemini/qml/welcomepages/cloud/RemoveAccountDlg.qml
> +share/apps/calligragemini/qml/welcomepages/cloud/Webdav.qml
> +share/apps/calligragemini/qml/welcomepages/cloud/dropbox/
> +share/apps/calligragemini/qml/welcomepages/cloud/dropbox/DropboxWebView.qml
> +share/apps/calligragemini/qml/welcomepages/cloud/dropbox/FileNavigator.qml
> +share/apps/calligragemini/qml/welcomepages/cloud/dropbox/InfoBanner.qml
> +share/apps/calligragemini/qml/welcomepages/cloud/dropbox/LoginPage.qml
> +share/apps/calligragemini/qml/welcomepages/cloud/dropbox/SetupPage.qml
> +share/apps/calligragemini/qml/welcomepages/cloud/git/
> +share/apps/calligragemini/qml/welcomepages/cloud/git/CreateCheckout.qml
> +share/apps/calligragemini/qml/welcomepages/cloud/git/GetUserCredentials.qml
> +share/apps/calligragemini/qml/welcomepages/cloud/git/RepositoryContent.qml
> +share/apps/calligragemini/qml/welcomepages/cloud/git/createCheckoutContainer.qml
> +share/apps/calligragemini/qml/welcomepages/cloud/git/repositoryContentContainer.qml
> +share/apps/calligragemini/qml/welcomepages/cloud/git/userCredentialsContainer.qml
> +share/apps/calligragemini/themes/
> +share/apps/calligragemini/themes/default/
> +share/apps/calligragemini/themes/default/colors.js
> +share/apps/calligragemini/themes/default/fonts/
> +share/apps/calligragemini/themes/default/fonts.js
> +share/apps/calligragemini/themes/default/fonts/PermanentMarker.ttf
> +share/apps/calligragemini/themes/default/fonts/SourceSansPro-Black.otf
> +share/apps/calligragemini/themes/default/fonts/SourceSansPro-BlackIt.otf
> +share/apps/calligragemini/themes/default/fonts/SourceSansPro-Bold.otf
> +share/apps/calligragemini/themes/default/fonts/SourceSansPro-BoldIt.otf
> +share/apps/calligragemini/themes/default/fonts/SourceSansPro-ExtraLight.otf
> +share/apps/calligragemini/themes/default/fonts/SourceSansPro-ExtraLightIt.otf
> +share/apps/calligragemini/themes/default/fonts/SourceSansPro-It.otf
> +share/apps/calligragemini/themes/default/fonts/SourceSansPro-Light.otf
> +share/apps/calligragemini/themes/default/fonts/SourceSansPro-LightIt.otf
> +share/apps/calligragemini/themes/default/fonts/SourceSansPro-Regular.otf
> +share/apps/calligragemini/themes/default/fonts/SourceSansPro-Semibold.otf
> +share/apps/calligragemini/themes/default/fonts/SourceSansPro-SemiboldIt.otf
> +share/apps/calligragemini/themes/default/icons/
> +share/apps/calligragemini/themes/default/icons/A4landscape-black.svg
> +share/apps/calligragemini/themes/default/icons/A4portrait-black.svg
> +share/apps/calligragemini/themes/default/icons/Arrow-Back-FileBrowse-1.svg
> +share/apps/calligragemini/themes/default/icons/Arrow-ScrollDown-1.svg
> +share/apps/calligragemini/themes/default/icons/Arrow-ScrollUp-1.svg
> +share/apps/calligragemini/themes/default/icons/Calligra-MockIcon-1.svg
> +share/apps/calligragemini/themes/default/icons/ColorPalettes-1-04.svg
> +share/apps/calligragemini/themes/default/icons/ColorPalettes-Blue-1.svg
> +share/apps/calligragemini/themes/default/icons/ColorPalettes-Magenta-1.svg
> +share/apps/calligragemini/themes/default/icons/ColorPalettes-Red-1.svg
> +share/apps/calligragemini/themes/default/icons/ColorPalettes-gold-1.svg
> +share/apps/calligragemini/themes/default/icons/Presentaton-Blue.svg
> +share/apps/calligragemini/themes/default/icons/Presentaton-Gold.svg
> +share/apps/calligragemini/themes/default/icons/Presentaton-Magenta.svg
> +share/apps/calligragemini/themes/default/icons/Presentaton-Red.svg
> +share/apps/calligragemini/themes/default/icons/SVG-AddComment-Inline-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Comment-DragHandle-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Exit-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-FXTransition-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-FillLabel-Green-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-FillLabel-Neutral-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-FillLabel-Red-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-FillLabel-Yellow-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Highlighter-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-IMGTOOLS-Brightness-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-IMGTOOLS-Contrast-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-IMGTOOLS-Crop-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-IMGTOOLS-ReplaceImage-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-IMGTOOLS-SliderHandle-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-IMGTOOLS-Sliders-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-IMGTOOLS-Transparency-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-IMGTOOLS-Wand-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-AddNote-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-AddPhotoComment-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-AddShape-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-AddSlide-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-AddVoiceComment-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-Animations-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-Bold-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-BulletList-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-Cloud-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-DesktopMode-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-Fill.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-Find-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-Help-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-Image.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-ImageAdjustment-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-Italic-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-Lines.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-MenuBack-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-MyDocuments-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-NewDocument-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-NewPresentation-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-NewSketch-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-NewSpreadsheet-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-NotesSummary-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-OK-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-Options-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-OptionsWhite-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-Pen.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-PlayPresentation-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-RecentDocuments-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-Shadow.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-SmallX.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-SpellCheck-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-TextAlignment-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-TextBox-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-TextStyle-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-Underline-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Label-Green-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Label-Red-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Label-SelectedRing-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Label-Yellow-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-LargeSelectedFill-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-NextSlide-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-NotesSummary-Counter-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Nudge-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Pointer-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-PreviousSlide-1.svg
> +share/apps/calligragemini/themes/default/icons/add-black.svg
> +share/apps/calligragemini/themes/default/icons/add.svg
> +share/apps/calligragemini/themes/default/icons/apply-black.svg
> +share/apps/calligragemini/themes/default/icons/apply.svg
> +share/apps/calligragemini/themes/default/icons/back.svg
> +share/apps/calligragemini/themes/default/icons/camera-black.svg
> +share/apps/calligragemini/themes/default/icons/cancel-black.svg
> +share/apps/calligragemini/themes/default/icons/checker-small.svg
> +share/apps/calligragemini/themes/default/icons/close.svg
> +share/apps/calligragemini/themes/default/icons/color_wheel.svg
> +share/apps/calligragemini/themes/default/icons/colorpicker.svg
> +share/apps/calligragemini/themes/default/icons/combo-arrows-white.svg
> +share/apps/calligragemini/themes/default/icons/crop-black.svg
> +share/apps/calligragemini/themes/default/icons/crop.svg
> +share/apps/calligragemini/themes/default/icons/delete-black.svg
> +share/apps/calligragemini/themes/default/icons/delete.svg
> +share/apps/calligragemini/themes/default/icons/down.svg
> +share/apps/calligragemini/themes/default/icons/edit.svg
> +share/apps/calligragemini/themes/default/icons/erase.svg
> +share/apps/calligragemini/themes/default/icons/fileclip-black.svg
> +share/apps/calligragemini/themes/default/icons/fileclip.svg
> +share/apps/calligragemini/themes/default/icons/filenew-black.svg
> +share/apps/calligragemini/themes/default/icons/filenew.svg
> +share/apps/calligragemini/themes/default/icons/fileopen-black.svg
> +share/apps/calligragemini/themes/default/icons/fileopen.svg
> +share/apps/calligragemini/themes/default/icons/filesave.svg
> +share/apps/calligragemini/themes/default/icons/filesaveas.svg
> +share/apps/calligragemini/themes/default/icons/fileshare.svg
> +share/apps/calligragemini/themes/default/icons/fill-black.svg
> +share/apps/calligragemini/themes/default/icons/fill.svg
> +share/apps/calligragemini/themes/default/icons/filter_delete-black.svg
> +share/apps/calligragemini/themes/default/icons/filter_load-black.svg
> +share/apps/calligragemini/themes/default/icons/filter_save-black.svg
> +share/apps/calligragemini/themes/default/icons/forward.svg
> +share/apps/calligragemini/themes/default/icons/gradient-black.svg
> +share/apps/calligragemini/themes/default/icons/gradient.svg
> +share/apps/calligragemini/themes/default/icons/help.svg
> +share/apps/calligragemini/themes/default/icons/intel-Words-Handle-cursor.svg
> +share/apps/calligragemini/themes/default/icons/krita_sketch.svg
> +share/apps/calligragemini/themes/default/icons/layer_filter-black.svg
> +share/apps/calligragemini/themes/default/icons/layer_group-black.svg
> +share/apps/calligragemini/themes/default/icons/layer_paint-black.svg
> +share/apps/calligragemini/themes/default/icons/locked_off-black.svg
> +share/apps/calligragemini/themes/default/icons/locked_off-small.svg
> +share/apps/calligragemini/themes/default/icons/locked_on-black.svg
> +share/apps/calligragemini/themes/default/icons/locked_on-small.svg
> +share/apps/calligragemini/themes/default/icons/minimize.svg
> +share/apps/calligragemini/themes/default/icons/mirror_c-black.svg
> +share/apps/calligragemini/themes/default/icons/mirror_h-black.svg
> +share/apps/calligragemini/themes/default/icons/mirror_v-black.svg
> +share/apps/calligragemini/themes/default/icons/move-black.svg
> +share/apps/calligragemini/themes/default/icons/move.svg
> +share/apps/calligragemini/themes/default/icons/paint-black.svg
> +share/apps/calligragemini/themes/default/icons/paint.svg
> +share/apps/calligragemini/themes/default/icons/palette-add-black.svg
> +share/apps/calligragemini/themes/default/icons/palette-black.svg
> +share/apps/calligragemini/themes/default/icons/palette-delete-black.svg
> +share/apps/calligragemini/themes/default/icons/palette.svg
> +share/apps/calligragemini/themes/default/icons/redo.svg
> +share/apps/calligragemini/themes/default/icons/select-add.svg
> +share/apps/calligragemini/themes/default/icons/select-apply.svg
> +share/apps/calligragemini/themes/default/icons/select-area.svg
> +share/apps/calligragemini/themes/default/icons/select-color.svg
> +share/apps/calligragemini/themes/default/icons/select-deselect.svg
> +share/apps/calligragemini/themes/default/icons/select-hide.svg
> +share/apps/calligragemini/themes/default/icons/select-intersect.svg
> +share/apps/calligragemini/themes/default/icons/select-polygon.svg
> +share/apps/calligragemini/themes/default/icons/select-rectangle.svg
> +share/apps/calligragemini/themes/default/icons/select-replace.svg
> +share/apps/calligragemini/themes/default/icons/select-reselect.svg
> +share/apps/calligragemini/themes/default/icons/select-show.svg
> +share/apps/calligragemini/themes/default/icons/select-sub.svg
> +share/apps/calligragemini/themes/default/icons/settings.svg
> +share/apps/calligragemini/themes/default/icons/switch.svg
> +share/apps/calligragemini/themes/default/icons/transform-black.svg
> +share/apps/calligragemini/themes/default/icons/transform.svg
> +share/apps/calligragemini/themes/default/icons/undo.svg
> +share/apps/calligragemini/themes/default/icons/up.svg
> +share/apps/calligragemini/themes/default/icons/visible_off-black.svg
> +share/apps/calligragemini/themes/default/icons/visible_off-small.svg
> +share/apps/calligragemini/themes/default/icons/visible_off.svg
> +share/apps/calligragemini/themes/default/icons/visible_on-black.svg
> +share/apps/calligragemini/themes/default/icons/visible_on-small.svg
> +share/apps/calligragemini/themes/default/icons/visible_on.svg
> +share/apps/calligragemini/themes/default/icons/web.svg
> +share/apps/calligragemini/themes/default/images/
> +share/apps/calligragemini/themes/default/images/Sticker-A.svg
> +share/apps/calligragemini/themes/default/images/Sticker-Apple.svg
> +share/apps/calligragemini/themes/default/images/Sticker-ArrowTarget.svg
> +share/apps/calligragemini/themes/default/images/Sticker-B.svg
> +share/apps/calligragemini/themes/default/images/Sticker-C.svg
> +share/apps/calligragemini/themes/default/images/Sticker-D.svg
> +share/apps/calligragemini/themes/default/images/Sticker-F.svg
> +share/apps/calligragemini/themes/default/images/Sticker-Feather.svg
> +share/apps/calligragemini/themes/default/images/Sticker-Lightbulb.svg
> +share/apps/calligragemini/themes/default/images/Sticker-OK.svg
> +share/apps/calligragemini/themes/default/images/Sticker-Ribbon.svg
> +share/apps/calligragemini/themes/default/images/Sticker-ThumbsUp.svg
> +share/apps/calligragemini/themes/default/images/busyindicator.png
> +share/apps/calligragemini/themes/default/images/divider.png
> +share/apps/calligragemini/themes/default/images/drop-corners.png
> +share/apps/calligragemini/themes/default/images/drop-shadows.png
> +share/apps/calligragemini/themes/default/images/header_krita_sketch.png
> +share/apps/calligragemini/themes/default/images/header_krita_sketch_light.png
> +share/apps/calligragemini/themes/default/images/intel-Stage-Slide-PieChart-Default.svg
> +share/apps/calligragemini/themes/default/images/intel-Stage-Slide-PieChart-PieceTappedOn.svg
> +share/apps/calligragemini/themes/default/images/intel-Words-Note-Circle-Green.svg
> +share/apps/calligragemini/themes/default/images/intel-Words-Note-Circle-Red.svg
> +share/apps/calligragemini/themes/default/images/intel-Words-Note-Circle-Yellow.svg
> +share/apps/calligragemini/themes/default/images/kritasketch.png
> +share/apps/calligragemini/themes/default/images/shadow.png
> +share/apps/calligragemini/themes/default/sizes.js
> +share/apps/calligragemini/themes/default/theme.qml
>  share/apps/cmake/modules/FindCalligraLibs.cmake
>  share/apps/color-schemes/
> -share/apps/color-schemes/Krita50.colors
>  share/apps/color-schemes/KritaBlender.colors
>  share/apps/color-schemes/KritaBright.colors
> -share/apps/color-schemes/KritaBrighter.colors
>  share/apps/color-schemes/KritaDark.colors
> -share/apps/color-schemes/KritaDarker.colors
> +share/apps/color-schemes/KritaNeutral.colors
>  share/apps/flow/
>  share/apps/flow/flow.rc
>  share/apps/flow/icons/
> @@ -5409,8 +5508,8 @@ share/apps/kexi/icons/hicolor/16x16/acti
>  share/apps/kexi/icons/hicolor/16x16/actions/clear_table_contents.png
>  share/apps/kexi/icons/hicolor/16x16/actions/close.png
>  share/apps/kexi/icons/hicolor/16x16/actions/combo.png
> +share/apps/kexi/icons/hicolor/16x16/actions/database-import.png
>  share/apps/kexi/icons/hicolor/16x16/actions/delete_table_row.png
> -share/apps/kexi/icons/hicolor/16x16/actions/document_import_database.png
>  share/apps/kexi/icons/hicolor/16x16/actions/form.png
>  share/apps/kexi/icons/hicolor/16x16/actions/form_action.png
>  share/apps/kexi/icons/hicolor/16x16/actions/form_newobj.png
> @@ -5438,12 +5537,9 @@ share/apps/kexi/icons/hicolor/16x16/acti
>  share/apps/kexi/icons/hicolor/16x16/actions/report_newobj.png
>  share/apps/kexi/icons/hicolor/16x16/actions/script.png
>  share/apps/kexi/icons/hicolor/16x16/actions/script_newobj.png
> -share/apps/kexi/icons/hicolor/16x16/actions/spring.png
> -share/apps/kexi/icons/hicolor/16x16/actions/spring_vertical.png
>  share/apps/kexi/icons/hicolor/16x16/actions/state_data.png
>  share/apps/kexi/icons/hicolor/16x16/actions/state_edit.png
>  share/apps/kexi/icons/hicolor/16x16/actions/state_sql.png
> -share/apps/kexi/icons/hicolor/16x16/actions/state_text.png
>  share/apps/kexi/icons/hicolor/16x16/actions/subform.png
>  share/apps/kexi/icons/hicolor/16x16/actions/table.png
>  share/apps/kexi/icons/hicolor/16x16/actions/table_newobj.png
> @@ -5475,10 +5571,10 @@ share/apps/kexi/icons/hicolor/22x22/acti
>  share/apps/kexi/icons/hicolor/22x22/actions/clear_table_contents.png
>  share/apps/kexi/icons/hicolor/22x22/actions/close.png
>  share/apps/kexi/icons/hicolor/22x22/actions/combo.png
> +share/apps/kexi/icons/hicolor/22x22/actions/database-import.png
>  share/apps/kexi/icons/hicolor/22x22/actions/dateedit.png
>  share/apps/kexi/icons/hicolor/22x22/actions/datetimeedit.png
>  share/apps/kexi/icons/hicolor/22x22/actions/delete_table_row.png
> -share/apps/kexi/icons/hicolor/22x22/actions/document_import_database.png
>  share/apps/kexi/icons/hicolor/22x22/actions/form.png
>  share/apps/kexi/icons/hicolor/22x22/actions/form_action.png
>  share/apps/kexi/icons/hicolor/22x22/actions/form_edit.png
> @@ -5514,12 +5610,9 @@ share/apps/kexi/icons/hicolor/22x22/acti
>  share/apps/kexi/icons/hicolor/22x22/actions/signalslot.png
>  share/apps/kexi/icons/hicolor/22x22/actions/slider.png
>  share/apps/kexi/icons/hicolor/22x22/actions/spin.png
> -share/apps/kexi/icons/hicolor/22x22/actions/spring.png
> -share/apps/kexi/icons/hicolor/22x22/actions/spring_vertical.png
>  share/apps/kexi/icons/hicolor/22x22/actions/state_data.png
>  share/apps/kexi/icons/hicolor/22x22/actions/state_edit.png
>  share/apps/kexi/icons/hicolor/22x22/actions/state_sql.png
> -share/apps/kexi/icons/hicolor/22x22/actions/state_text.png
>  share/apps/kexi/icons/hicolor/22x22/actions/subform.png
>  share/apps/kexi/icons/hicolor/22x22/actions/table.png
>  share/apps/kexi/icons/hicolor/22x22/actions/table_newobj.png
> @@ -5538,8 +5631,8 @@ share/apps/kexi/icons/hicolor/32x32/acti
>  share/apps/kexi/icons/hicolor/32x32/actions/business_user.png
>  share/apps/kexi/icons/hicolor/32x32/actions/clear_table_contents.png
>  share/apps/kexi/icons/hicolor/32x32/actions/close.png
> +share/apps/kexi/icons/hicolor/32x32/actions/database-import.png
>  share/apps/kexi/icons/hicolor/32x32/actions/delete_table_row.png
> -share/apps/kexi/icons/hicolor/32x32/actions/document_import_database.png
>  share/apps/kexi/icons/hicolor/32x32/actions/form.png
>  share/apps/kexi/icons/hicolor/32x32/actions/form_action.png
>  share/apps/kexi/icons/hicolor/32x32/actions/form_newobj.png
> @@ -5554,15 +5647,13 @@ share/apps/kexi/icons/hicolor/32x32/acti
>  share/apps/kexi/icons/hicolor/32x32/actions/query_newobj.png
>  share/apps/kexi/icons/hicolor/32x32/actions/report.png
>  share/apps/kexi/icons/hicolor/32x32/actions/report_newobj.png
> -share/apps/kexi/icons/hicolor/32x32/actions/spring.png
>  share/apps/kexi/icons/hicolor/32x32/actions/state_data.png
>  share/apps/kexi/icons/hicolor/32x32/actions/state_sql.png
> -share/apps/kexi/icons/hicolor/32x32/actions/state_text.png
>  share/apps/kexi/icons/hicolor/32x32/actions/table.png
>  share/apps/kexi/icons/hicolor/32x32/actions/table_newobj.png
>  share/apps/kexi/icons/hicolor/48x48/
>  share/apps/kexi/icons/hicolor/48x48/actions/
> -share/apps/kexi/icons/hicolor/48x48/actions/document_import_database.png
> +share/apps/kexi/icons/hicolor/48x48/actions/database-import.png
>  share/apps/kexi/icons/hicolor/48x48/actions/form_action.png
>  share/apps/kexi/icons/hicolor/48x48/actions/key.png
>  share/apps/kexi/icons/hicolor/64x64/
> @@ -5591,8 +5682,13 @@ share/apps/kexi/icons/oxygen/16x16/mimet
>  share/apps/kexi/icons/oxygen/16x16/mimetypes/application-x-kexiproject-sqlite3.png
>  share/apps/kexi/icons/oxygen/16x16/mimetypes/application-x-sqlite2.png
>  share/apps/kexi/icons/oxygen/16x16/mimetypes/application-x-sqlite3.png
> +share/apps/kexi/icons/oxygen/16x16/places/
> +share/apps/kexi/icons/oxygen/16x16/places/breeze-kexi-file-database.svgz
> +share/apps/kexi/icons/oxygen/16x16/places/breeze-network-server-database.svgz
>  share/apps/kexi/icons/oxygen/22x22/
>  share/apps/kexi/icons/oxygen/22x22/actions/
> +share/apps/kexi/icons/oxygen/22x22/actions/breeze-database-import.svgz
> +share/apps/kexi/icons/oxygen/22x22/actions/breeze-kexi-document-empty.svgz
>  share/apps/kexi/icons/oxygen/22x22/actions/data-source-tag.png
>  share/apps/kexi/icons/oxygen/22x22/actions/table.png
>  share/apps/kexi/icons/oxygen/22x22/mimetypes/
> @@ -5603,8 +5699,14 @@ share/apps/kexi/icons/oxygen/22x22/mimet
>  share/apps/kexi/icons/oxygen/22x22/mimetypes/application-x-kexiproject-sqlite3.png
>  share/apps/kexi/icons/oxygen/22x22/mimetypes/application-x-sqlite2.png
>  share/apps/kexi/icons/oxygen/22x22/mimetypes/application-x-sqlite3.png
> +share/apps/kexi/icons/oxygen/22x22/places/
> +share/apps/kexi/icons/oxygen/22x22/places/breeze-kexi-file-database.svgz
> +share/apps/kexi/icons/oxygen/22x22/places/breeze-network-server-database.svgz
>  share/apps/kexi/icons/oxygen/32x32/
>  share/apps/kexi/icons/oxygen/32x32/actions/
> +share/apps/kexi/icons/oxygen/32x32/actions/breeze-kexi-document-empty.svgz
> +share/apps/kexi/icons/oxygen/32x32/actions/kexi-document-empty.png
> +share/apps/kexi/icons/oxygen/32x32/actions/kexi-document-empty.svgz
>  share/apps/kexi/icons/oxygen/32x32/actions/table.png
>  share/apps/kexi/icons/oxygen/32x32/mimetypes/
>  share/apps/kexi/icons/oxygen/32x32/mimetypes/application-x-kexi-connectiondata.png
> @@ -5614,7 +5716,12 @@ share/apps/kexi/icons/oxygen/32x32/mimet
>  share/apps/kexi/icons/oxygen/32x32/mimetypes/application-x-kexiproject-sqlite3.png
>  share/apps/kexi/icons/oxygen/32x32/mimetypes/application-x-sqlite2.png
>  share/apps/kexi/icons/oxygen/32x32/mimetypes/application-x-sqlite3.png
> +share/apps/kexi/icons/oxygen/32x32/places/
> +share/apps/kexi/icons/oxygen/32x32/places/breeze-kexi-file-database.svgz
> +share/apps/kexi/icons/oxygen/32x32/places/breeze-network-server-database.svgz
>  share/apps/kexi/icons/oxygen/48x48/
> +share/apps/kexi/icons/oxygen/48x48/actions/
> +share/apps/kexi/icons/oxygen/48x48/actions/kexi-document-empty.png
>  share/apps/kexi/icons/oxygen/48x48/mimetypes/
>  share/apps/kexi/icons/oxygen/48x48/mimetypes/application-x-kexi-connectiondata.png
>  share/apps/kexi/icons/oxygen/48x48/mimetypes/application-x-kexiproject-shortcut.png
> @@ -5624,6 +5731,8 @@ share/apps/kexi/icons/oxygen/48x48/mimet
>  share/apps/kexi/icons/oxygen/48x48/mimetypes/application-x-sqlite2.png
>  share/apps/kexi/icons/oxygen/48x48/mimetypes/application-x-sqlite3.png
>  share/apps/kexi/icons/oxygen/64x64/
> +share/apps/kexi/icons/oxygen/64x64/actions/
> +share/apps/kexi/icons/oxygen/64x64/actions/kexi-document-empty.svgz
>  share/apps/kexi/icons/oxygen/64x64/mimetypes/
>  share/apps/kexi/icons/oxygen/64x64/mimetypes/application-x-kexi-connectiondata.png
>  share/apps/kexi/icons/oxygen/64x64/mimetypes/application-x-kexiproject-shortcut.png
> @@ -5677,15 +5786,13 @@ share/apps/kexi/pics/
>  share/apps/kexi/pics/calligra-logo-black-glow.png
>  share/apps/kexi/pics/calligra-logo-white-glow.png
>  share/apps/kexi/pics/external-link.png
> -share/apps/kexi/pics/kexi-logo-white.png
> -share/apps/kexi/pics/kexi-logo.png
>  share/apps/kexi/status/
> -share/apps/kexi/status/2.8.6/
> -share/apps/kexi/status/2.8.6/contribution_details.ui
> -share/apps/kexi/status/2.8.6/contribution_help.ui
> -share/apps/kexi/status/2.8.6/status.rcc
> -share/apps/kexi/status/2.8.6/status.ui
> -share/apps/kexi/status/2.8.6/status_strings.ui
> +share/apps/kexi/status/2.9.0/
> +share/apps/kexi/status/2.9.0/contribution_details.ui
> +share/apps/kexi/status/2.9.0/contribution_help.ui
> +share/apps/kexi/status/2.9.0/status.rcc
> +share/apps/kexi/status/2.9.0/status.ui
> +share/apps/kexi/status/2.9.0/status_strings.ui
>  share/apps/koproperty/
>  share/apps/koproperty/icons/
>  share/apps/koproperty/icons/hicolor/
> @@ -5693,6 +5800,28 @@ share/apps/koproperty/icons/hicolor/16x1
>  share/apps/koproperty/icons/hicolor/16x16/actions/
>  share/apps/koproperty/icons/hicolor/16x16/actions/button_no.png
>  share/apps/krita/
> +share/apps/krita/actions/
> +share/apps/krita/actions/ArtisticTextToolFactoryID.action
> +share/apps/krita/actions/InteractionTool.action
> +share/apps/krita/actions/KisRulerAssistantTool.action
> +share/apps/krita/actions/KisToolCrop.action
> +share/apps/krita/actions/KisToolGrid.action
> +share/apps/krita/actions/KisToolPath.action
> +share/apps/krita/actions/KisToolPencil.action
> +share/apps/krita/actions/KisToolPerspectiveGrid.action
> +share/apps/krita/actions/KisToolPolygon.action
> +share/apps/krita/actions/KisToolPolyline.action
> +share/apps/krita/actions/KisToolSelectContiguous.action
> +share/apps/krita/actions/KisToolSelectElliptical.action
> +share/apps/krita/actions/KisToolSelectOutline.action
> +share/apps/krita/actions/KisToolSelectPath.action
> +share/apps/krita/actions/KisToolSelectPolygonal.action
> +share/apps/krita/actions/KisToolSelectRectangular.action
> +share/apps/krita/actions/KisToolSelectSimilar.action
> +share/apps/krita/actions/KisToolTransform.action
> +share/apps/krita/actions/PathToolFactoryId.action
> +share/apps/krita/actions/TextToolFactory_ID.action
> +share/apps/krita/actions/krita.action
>  share/apps/krita/brushes/
>  share/apps/krita/brushes/3_brush.png
>  share/apps/krita/brushes/3_dotted-flat.png
> @@ -5857,6 +5986,8 @@ share/apps/krita/brushes/z_study_pencil_
>  share/apps/krita/brushes/z_study_pencil_2Hb.gih
>  share/apps/krita/brushes/z_study_pencil_H.gih
>  share/apps/krita/brushes/z_study_pencil_H_h.gih
> +share/apps/krita/bundles/
> +share/apps/krita/bundles/README
>  share/apps/krita/defaultpresets/
>  share/apps/krita/defaultpresets/chalkbrush.kpp
>  share/apps/krita/defaultpresets/colorsmudge.kpp
> @@ -5905,7 +6036,6 @@ share/apps/krita/icons/hicolor/128x128/
>  share/apps/krita/icons/hicolor/128x128/actions/
>  share/apps/krita/icons/hicolor/128x128/actions/template_comics_empty.png
>  share/apps/krita/icons/hicolor/128x128/actions/template_dslr.png
> -share/apps/krita/icons/hicolor/128x128/actions/template_film.png
>  share/apps/krita/icons/hicolor/128x128/actions/template_texture.png
>  share/apps/krita/images/
>  share/apps/krita/images/krita-chalk.png
> @@ -5943,17 +6073,28 @@ share/apps/krita/paintoppresets/Airbrush
>  share/apps/krita/paintoppresets/Airbrush_linear_noisy.kpp
>  share/apps/krita/paintoppresets/Airbrush_pressure.kpp
>  share/apps/krita/paintoppresets/Basic_circle.kpp
> -share/apps/krita/paintoppresets/Basic_circle_wet.kpp
> +share/apps/krita/paintoppresets/Basic_mix.kpp
> +share/apps/krita/paintoppresets/Basic_mix_soft.kpp
>  share/apps/krita/paintoppresets/Basic_tip_default.kpp
>  share/apps/krita/paintoppresets/Basic_tip_gaussian.kpp
>  share/apps/krita/paintoppresets/Basic_tip_soft.kpp
> +share/apps/krita/paintoppresets/Basic_wet.kpp
> +share/apps/krita/paintoppresets/Basic_wet_soft.kpp
>  share/apps/krita/paintoppresets/Block_basic.kpp
>  share/apps/krita/paintoppresets/Block_bristles.kpp
>  share/apps/krita/paintoppresets/Block_fuzzy.kpp
>  share/apps/krita/paintoppresets/Block_mix_tilt.kpp
>  share/apps/krita/paintoppresets/Block_tilt.kpp
> +share/apps/krita/paintoppresets/Block_wet_tilt.kpp
> +share/apps/krita/paintoppresets/Bristle_Details.kpp
> +share/apps/krita/paintoppresets/Bristle_Large.kpp
> +share/apps/krita/paintoppresets/Bristle_Special_Blender.kpp
> +share/apps/krita/paintoppresets/Bristle_Squared.kpp
> +share/apps/krita/paintoppresets/Bristle_Tapered.kpp
> +share/apps/krita/paintoppresets/Bristle_Texture.kpp
>  share/apps/krita/paintoppresets/Bristle_frottis.kpp
>  share/apps/krita/paintoppresets/Bristles_hairy.kpp
> +share/apps/krita/paintoppresets/Bristles_mix.kpp
>  share/apps/krita/paintoppresets/Bristles_textured.kpp
>  share/apps/krita/paintoppresets/Bristles_wet.kpp
>  share/apps/krita/paintoppresets/Chalk_brush.kpp
> @@ -5974,12 +6115,6 @@ share/apps/krita/paintoppresets/FX_splat
>  share/apps/krita/paintoppresets/Fill_block.kpp
>  share/apps/krita/paintoppresets/Fill_circle.kpp
>  share/apps/krita/paintoppresets/Grid_square_25.kpp
> -share/apps/krita/paintoppresets/Hairy_Details.kpp
> -share/apps/krita/paintoppresets/Hairy_Large.kpp
> -share/apps/krita/paintoppresets/Hairy_Special_Blender.kpp
> -share/apps/krita/paintoppresets/Hairy_Squared.kpp
> -share/apps/krita/paintoppresets/Hairy_Tapered.kpp
> -share/apps/krita/paintoppresets/Hairy_Texture.kpp
>  share/apps/krita/paintoppresets/Hatch_crispy.kpp
>  share/apps/krita/paintoppresets/Hatch_cross_regular.kpp
>  share/apps/krita/paintoppresets/Hatch_cross_small.kpp
> @@ -5999,14 +6134,6 @@ share/apps/krita/paintoppresets/Layout_b
>  share/apps/krita/paintoppresets/Layout_circle_soft.kpp
>  share/apps/krita/paintoppresets/Layout_oval.kpp
>  share/apps/krita/paintoppresets/Layout_pen.kpp
> -share/apps/krita/paintoppresets/Mix_dull.kpp
> -share/apps/krita/paintoppresets/Mix_smear.kpp
> -share/apps/krita/paintoppresets/Mix_smear_soft.kpp
> -share/apps/krita/paintoppresets/Mixover_dull.kpp
> -share/apps/krita/paintoppresets/Mixover_dull_bristle_soft.kpp
> -share/apps/krita/paintoppresets/Mixover_dull_bristles.kpp
> -share/apps/krita/paintoppresets/Mixover_oil.kpp
> -share/apps/krita/paintoppresets/Mixover_smear.kpp
>  share/apps/krita/paintoppresets/Move_tool.kpp
>  share/apps/krita/paintoppresets/Pastel_texture_large.kpp
>  share/apps/krita/paintoppresets/Pastel_texture_thin.kpp
> @@ -6036,12 +6163,15 @@ share/apps/krita/paintoppresets/Smudge_r
>  share/apps/krita/paintoppresets/Smudge_rake_2.kpp
>  share/apps/krita/paintoppresets/Smudge_soft.kpp
>  share/apps/krita/paintoppresets/Smudge_textured.kpp
> +share/apps/krita/paintoppresets/Sparkle_wet.kpp
> +share/apps/krita/paintoppresets/Sparkle_wet_soft.kpp
>  share/apps/krita/paintoppresets/Special_FuzzyColor.kpp
>  share/apps/krita/paintoppresets/Special_dyna_dots.kpp
>  share/apps/krita/paintoppresets/Special_particles_crazy.kpp
>  share/apps/krita/paintoppresets/Splat_mix_cells.kpp
>  share/apps/krita/paintoppresets/Splat_texture.kpp
>  share/apps/krita/paintoppresets/Splat_texture_2.kpp
> +share/apps/krita/paintoppresets/Splat_wet_cells.kpp
>  share/apps/krita/paintoppresets/Splatter_thin.kpp
>  share/apps/krita/paintoppresets/Sponge_texture.kpp
>  share/apps/krita/paintoppresets/Spray_splat.kpp
> @@ -6135,6 +6265,8 @@ share/apps/krita/pics/
>  share/apps/krita/pics/AboutKrita.png
>  share/apps/krita/pics/addlayer.png
>  share/apps/krita/pics/addtofolder.png
> +share/apps/krita/pics/arrow-down.png
> +share/apps/krita/pics/arrow-right.png
>  share/apps/krita/pics/arrow_east.png
>  share/apps/krita/pics/arrow_north.png
>  share/apps/krita/pics/arrow_north_east.png
> @@ -6154,12 +6286,72 @@ share/apps/krita/pics/cursor-cross.xpm
>  share/apps/krita/pics/cursor-round.xpm
>  share/apps/krita/pics/cursor-triangle_lefthanded.xpm
>  share/apps/krita/pics/cursor-triangle_righthanded.xpm
> +share/apps/krita/pics/dark_addlayer.png
> +share/apps/krita/pics/dark_addtofolder.png
> +share/apps/krita/pics/dark_arrowdown.png
> +share/apps/krita/pics/dark_arrowupblr.png
> +share/apps/krita/pics/dark_calligraphy.png
> +share/apps/krita/pics/dark_deletelayer.png
> +share/apps/krita/pics/dark_draw-text.png
> +share/apps/krita/pics/dark_duplicatelayer.png
> +share/apps/krita/pics/dark_format-fill-color.png
> +share/apps/krita/pics/dark_krita_draw_path.png
> +share/apps/krita/pics/dark_krita_tool_color_fill.png
> +share/apps/krita/pics/dark_krita_tool_color_picker.png
> +share/apps/krita/pics/dark_krita_tool_dyna.png
> +share/apps/krita/pics/dark_krita_tool_editpath.png
> +share/apps/krita/pics/dark_krita_tool_ellipse.png
> +share/apps/krita/pics/dark_krita_tool_freehand.png
> +share/apps/krita/pics/dark_krita_tool_freehandvector.png
> +share/apps/krita/pics/dark_krita_tool_gradient.png
> +share/apps/krita/pics/dark_krita_tool_grid.png
> +share/apps/krita/pics/dark_krita_tool_line.png
> +share/apps/krita/pics/dark_krita_tool_measure.png
> +share/apps/krita/pics/dark_krita_tool_move.png
> +share/apps/krita/pics/dark_krita_tool_multihand.png
> +share/apps/krita/pics/dark_krita_tool_rectangle.png
> +share/apps/krita/pics/dark_krita_tool_ruler_assistant.png
> +share/apps/krita/pics/dark_krita_tool_transform.png
> +share/apps/krita/pics/dark_pattern.png
> +share/apps/krita/pics/dark_polyline.png
> +share/apps/krita/pics/dark_properties.png
> +share/apps/krita/pics/dark_removefromfolder.png
> +share/apps/krita/pics/dark_select.png
> +share/apps/krita/pics/dark_selection-mode_ants.png
> +share/apps/krita/pics/dark_selection-mode_invisible.png
> +share/apps/krita/pics/dark_selection-mode_mask.png
> +share/apps/krita/pics/dark_symmetry-horizontal.png
> +share/apps/krita/pics/dark_symmetry-vertical.png
> +share/apps/krita/pics/dark_tool_contiguous_selection.png
> +share/apps/krita/pics/dark_tool_crop.png
> +share/apps/krita/pics/dark_tool_elliptical_selection.png
> +share/apps/krita/pics/dark_tool_outline_selection.png
> +share/apps/krita/pics/dark_tool_path_selection.png
> +share/apps/krita/pics/dark_tool_perspectivegrid.png
> +share/apps/krita/pics/dark_tool_polygon.png
> +share/apps/krita/pics/dark_tool_polygonal_selection.png
> +share/apps/krita/pics/dark_tool_rect_selection.png
> +share/apps/krita/pics/dark_tool_similar_selection.png
> +share/apps/krita/pics/dark_transform_icons_cage.png
> +share/apps/krita/pics/dark_transform_icons_liquify_erase.png
> +share/apps/krita/pics/dark_transform_icons_liquify_main.png
> +share/apps/krita/pics/dark_transform_icons_liquify_move.png
> +share/apps/krita/pics/dark_transform_icons_liquify_offset.png
> +share/apps/krita/pics/dark_transform_icons_liquify_resize.png
> +share/apps/krita/pics/dark_transform_icons_liquify_rotate.png
> +share/apps/krita/pics/dark_transform_icons_liquify_rotateCCW.png
> +share/apps/krita/pics/dark_transform_icons_main.png
> +share/apps/krita/pics/dark_transform_icons_penPressure.png
> +share/apps/krita/pics/dark_transform_icons_perspective.png
> +share/apps/krita/pics/dark_transform_icons_warp.png
>  share/apps/krita/pics/delete.png
>  share/apps/krita/pics/deletelayer.png
>  share/apps/krita/pics/duplicatelayer.png
>  share/apps/krita/pics/eraser-toggle.png
> +share/apps/krita/pics/exposure-cursor-gesture.xpm
>  share/apps/krita/pics/extended_color_selector.png
>  share/apps/krita/pics/folder.png
> +share/apps/krita/pics/gamma-cursor-gesture.xpm
>  share/apps/krita/pics/height.png
>  share/apps/krita/pics/height_icon.png
>  share/apps/krita/pics/hi16-add_dialog.png
> @@ -6173,7 +6365,6 @@ share/apps/krita/pics/krita_tool_color_f
>  share/apps/krita/pics/krita_tool_color_picker.png
>  share/apps/krita/pics/krita_tool_dyna.png
>  share/apps/krita/pics/krita_tool_ellipse.png
> -share/apps/krita/pics/krita_tool_freehand.png
>  share/apps/krita/pics/krita_tool_freehandvector.png
>  share/apps/krita/pics/krita_tool_gradient.png
>  share/apps/krita/pics/krita_tool_grid.png
> @@ -6186,14 +6377,77 @@ share/apps/krita/pics/krita_tool_ruler_a
>  share/apps/krita/pics/krita_tool_transform.png
>  share/apps/krita/pics/krita_tool_transform_recursive.png
>  share/apps/krita/pics/landscape.png
> +share/apps/krita/pics/light_addlayer.png
> +share/apps/krita/pics/light_addtofolder.png
> +share/apps/krita/pics/light_arrowdown.png
> +share/apps/krita/pics/light_arrowupblr.png
> +share/apps/krita/pics/light_calligraphy.png
> +share/apps/krita/pics/light_deletelayer.png
> +share/apps/krita/pics/light_draw-text.png
> +share/apps/krita/pics/light_duplicatelayer.png
> +share/apps/krita/pics/light_format-fill-color.png
> +share/apps/krita/pics/light_krita_draw_path.png
> +share/apps/krita/pics/light_krita_tool_color_fill.png
> +share/apps/krita/pics/light_krita_tool_color_picker.png
> +share/apps/krita/pics/light_krita_tool_dyna.png
> +share/apps/krita/pics/light_krita_tool_editpath.png
> +share/apps/krita/pics/light_krita_tool_ellipse.png
> +share/apps/krita/pics/light_krita_tool_freehand.png
> +share/apps/krita/pics/light_krita_tool_freehandvector.png
> +share/apps/krita/pics/light_krita_tool_gradient.png
> +share/apps/krita/pics/light_krita_tool_grid.png
> +share/apps/krita/pics/light_krita_tool_line.png
> +share/apps/krita/pics/light_krita_tool_measure.png
> +share/apps/krita/pics/light_krita_tool_move.png
> +share/apps/krita/pics/light_krita_tool_multihand.png
> +share/apps/krita/pics/light_krita_tool_rectangle.png
> +share/apps/krita/pics/light_krita_tool_ruler_assistant.png
> +share/apps/krita/pics/light_krita_tool_transform.png
> +share/apps/krita/pics/light_pattern.png
> +share/apps/krita/pics/light_polyline.png
> +share/apps/krita/pics/light_properties.png
> +share/apps/krita/pics/light_removefromfolder.png
> +share/apps/krita/pics/light_select.png
> +share/apps/krita/pics/light_selection-mode_ants.png
> +share/apps/krita/pics/light_selection-mode_invisible.png
> +share/apps/krita/pics/light_selection-mode_mask.png
> +share/apps/krita/pics/light_symmetry-horizontal.png
> +share/apps/krita/pics/light_symmetry-vertical.png
> +share/apps/krita/pics/light_tool_contiguous_selection.png
> +share/apps/krita/pics/light_tool_crop.png
> +share/apps/krita/pics/light_tool_elliptical_selection.png
> +share/apps/krita/pics/light_tool_outline_selection.png
> +share/apps/krita/pics/light_tool_path_selection.png
> +share/apps/krita/pics/light_tool_perspectivegrid.png
> +share/apps/krita/pics/light_tool_polygon.png
> +share/apps/krita/pics/light_tool_polygonal_selection.png
> +share/apps/krita/pics/light_tool_rect_selection.png
> +share/apps/krita/pics/light_tool_similar_selection.png
> +share/apps/krita/pics/light_transform_icons_cage.png
> +share/apps/krita/pics/light_transform_icons_liquify_erase.png
> +share/apps/krita/pics/light_transform_icons_liquify_main.png
> +share/apps/krita/pics/light_transform_icons_liquify_move.png
> +share/apps/krita/pics/light_transform_icons_liquify_offset.png
> +share/apps/krita/pics/light_transform_icons_liquify_resize.png
> +share/apps/krita/pics/light_transform_icons_liquify_rotate.png
> +share/apps/krita/pics/light_transform_icons_liquify_rotateCCW.png
> +share/apps/krita/pics/light_transform_icons_main.png
> +share/apps/krita/pics/light_transform_icons_penPressure.png
> +share/apps/krita/pics/light_transform_icons_perspective.png
> +share/apps/krita/pics/light_transform_icons_warp.png
>  share/apps/krita/pics/linked.png
> +share/apps/krita/pics/linked2.png
>  share/apps/krita/pics/local_selection_active.png
>  share/apps/krita/pics/local_selection_inactive.png
>  share/apps/krita/pics/locked.png
> +share/apps/krita/pics/mirrorAxis-HorizontalMove.png
> +share/apps/krita/pics/mirrorAxis-VerticalMove.png
>  share/apps/krita/pics/newlayer.png
>  share/apps/krita/pics/novisible.png
>  share/apps/krita/pics/offset_horizontal.png
>  share/apps/krita/pics/offset_vertical.png
> +share/apps/krita/pics/onionA.png
> +share/apps/krita/pics/onionB.png
>  share/apps/krita/pics/paintop_presets_disabled.png
>  share/apps/krita/pics/paintop_settings_01.png
>  share/apps/krita/pics/paintop_settings_02.png
> @@ -6201,15 +6455,14 @@ share/apps/krita/pics/paintop_settings_d
>  share/apps/krita/pics/polyline.png
>  share/apps/krita/pics/portrait.png
>  share/apps/krita/pics/precise-pick-layer-icon.xpm
> -share/apps/krita/pics/properties.png
>  share/apps/krita/pics/ratio_icon.png
> +share/apps/krita/pics/reload_preset.png
>  share/apps/krita/pics/removefromfolder.png
>  share/apps/krita/pics/rotate_cursor.xpm
>  share/apps/krita/pics/rotate_discrete.xpm
>  share/apps/krita/pics/rotate_smooth.xpm
>  share/apps/krita/pics/select_pixel.png
>  share/apps/krita/pics/select_shape.png
> -share/apps/krita/pics/selection-info.png
>  share/apps/krita/pics/selection_add.png
>  share/apps/krita/pics/selection_exclude.png
>  share/apps/krita/pics/selection_intersect.png
> @@ -6218,11 +6471,8 @@ share/apps/krita/pics/selection_subtract
>  share/apps/krita/pics/shade.png
>  share/apps/krita/pics/shear_horizontal.png
>  share/apps/krita/pics/shear_vertical.png
> -share/apps/krita/pics/symmetry-horyzontal.png
> -share/apps/krita/pics/symmetry-vertical.png
> +share/apps/krita/pics/sidebaricon.png
>  share/apps/krita/pics/tablet.png
> -share/apps/krita/pics/tool_brush_selection.png
> -share/apps/krita/pics/tool_brush_selection_cursor.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
> @@ -6236,8 +6486,6 @@ share/apps/krita/pics/tool_fill_cursor.p
>  share/apps/krita/pics/tool_freehand_cursor.png
>  share/apps/krita/pics/tool_gradient_cursor.png
>  share/apps/krita/pics/tool_line_cursor.png
> -share/apps/krita/pics/tool_magneticoutline_selection.png
> -share/apps/krita/pics/tool_magneticoutline_selection_cursor.png
>  share/apps/krita/pics/tool_outline_selection.png
>  share/apps/krita/pics/tool_outline_selection_cursor.png
>  share/apps/krita/pics/tool_path_selection.png
> @@ -6282,20 +6530,38 @@ share/apps/krita/predefined_image_sizes/
>  share/apps/krita/predefined_image_sizes/A5__600_ppi_.predefinedimage
>  share/apps/krita/predefined_image_sizes/A6__300_ppi_.predefinedimage
>  share/apps/krita/predefined_image_sizes/A6__600_ppi_.predefinedimage
> +share/apps/krita/predefined_image_sizes/Texture_1024x1024.predefinedimage
> +share/apps/krita/predefined_image_sizes/Texture_2048x2048.predefinedimage
> +share/apps/krita/predefined_image_sizes/Texture_256x256.predefinedimage
> +share/apps/krita/predefined_image_sizes/Texture_4096x4096.predefinedimage
> +share/apps/krita/predefined_image_sizes/Texture_512x512.predefinedimage
> +share/apps/krita/predefined_image_sizes/US_Legal__300_ppi_.predefinedimage
> +share/apps/krita/predefined_image_sizes/US_Letter__300_ppi_.predefinedimage
> +share/apps/krita/predefined_image_sizes/US_Tabloid__300_ppi_.predefinedimage
>  share/apps/krita/shaders/
>  share/apps/krita/shaders/bilinear_gradient.frag
>  share/apps/krita/shaders/conical_gradient.frag
>  share/apps/krita/shaders/conical_symetric_gradient.frag
>  share/apps/krita/shaders/cursor.frag
>  share/apps/krita/shaders/cursor.vert
> -share/apps/krita/shaders/highq_downscale.frag
> +share/apps/krita/shaders/highq_downscale_main.frag.inc
> +share/apps/krita/shaders/highq_downscale_main_ocio.frag.inc
> +share/apps/krita/shaders/highq_downscale_preface.frag.inc
>  share/apps/krita/shaders/linear_gradient.frag
>  share/apps/krita/shaders/matrix_transform.vert
>  share/apps/krita/shaders/matrix_transform_legacy.vert
>  share/apps/krita/shaders/radial_gradient.frag
>  share/apps/krita/shaders/simple_texture.frag
>  share/apps/krita/shaders/simple_texture_legacy.frag
> +share/apps/krita/shaders/simple_texture_legacy_main.frag.inc
> +share/apps/krita/shaders/simple_texture_legacy_main_ocio.frag.inc
> +share/apps/krita/shaders/simple_texture_legacy_preface.frag.inc
> +share/apps/krita/shaders/simple_texture_main.frag.inc
> +share/apps/krita/shaders/simple_texture_main_ocio.frag.inc
> +share/apps/krita/shaders/simple_texture_preface.frag.inc
>  share/apps/krita/shaders/square_gradient.frag
> +share/apps/krita/tags/
> +share/apps/krita/tags/kis_paintoppresets_tags.xml
>  share/apps/krita/templates/
>  share/apps/krita/templates/comics/
>  share/apps/krita/templates/comics/.directory
> @@ -6316,11 +6582,13 @@ share/apps/krita/templates/design/.sourc
>  share/apps/krita/templates/design/.source/DesignpresentationA3Landscape_4960x3508_300dpiRGB_8bit_.kra
>  share/apps/krita/templates/design/.source/DesignpresentationA4portrait_2480x3508_300dpiRGB_8bit_.kra
>  share/apps/krita/templates/design/.source/Designscreen4_3_2250x1680_96dpiRGB_8bit_.kra
> +share/apps/krita/templates/design/.source/web_design.kra
>  share/apps/krita/templates/design/Designcinema16_10_2484x1200_96dpiRGB_8bit_.desktop
>  share/apps/krita/templates/design/Designcinema2.39_1_2484x1040_96dpiRGB_8bit_.desktop
>  share/apps/krita/templates/design/DesignpresentationA3Landscape_4960x3508_300dpiRGB_8bit_.desktop
>  share/apps/krita/templates/design/DesignpresentationA4portrait_2480x3508_300dpiRGB_8bit_.desktop
>  share/apps/krita/templates/design/Designscreen4_3_2250x1680_96dpiRGB_8bit_.desktop
> +share/apps/krita/templates/design/web_design.desktop
>  share/apps/krita/templates/dslr/
>  share/apps/krita/templates/dslr/.directory
>  share/apps/krita/templates/dslr/.source/
> @@ -6334,102 +6602,71 @@ share/apps/krita/templates/dslr/Canon_5D
>  share/apps/krita/templates/dslr/Nikon_D3000_3872x2592.desktop
>  share/apps/krita/templates/dslr/Nikon_D5000_4288x2848.desktop
>  share/apps/krita/templates/dslr/Nikon_D7000_4928x3264.desktop
> -share/apps/krita/templates/film/
> -share/apps/krita/templates/film/.directory
> -share/apps/krita/templates/film/.source/
> -share/apps/krita/templates/film/.source/1K_super35_fullAp_1024x778.kra
> -share/apps/krita/templates/film/.source/2K_super35_fullAp_2048x1556.kra
> -share/apps/krita/templates/film/.source/4K_super35_fullAp_4096x3112.kra
> -share/apps/krita/templates/film/.source/HD_720p_1280x720.kra
> -share/apps/krita/templates/film/.source/HD_full_1920x1080.kra
> -share/apps/krita/templates/film/.source/HD_half_960x540.kra
> -share/apps/krita/templates/film/1K_super35_fullAp_1024x778.desktop
> -share/apps/krita/templates/film/2K_super35_fullAp_2048x1556.desktop
> -share/apps/krita/templates/film/4K_super35_fullAp_4096x3112.desktop
> -share/apps/krita/templates/film/HD_720p_1280x720.desktop
> -share/apps/krita/templates/film/HD_full_1920x1080.desktop
> -share/apps/krita/templates/film/HD_half_960x540.desktop
>  share/apps/krita/templates/texture/
>  share/apps/krita/templates/texture/.directory
>  share/apps/krita/templates/texture/.source/
> -share/apps/krita/templates/texture/.source/Texture1k16bitfloatrgb.kra
> -share/apps/krita/templates/texture/.source/Texture1k16bitscalar.kra
> +share/apps/krita/templates/texture/.source/Texture1024x10248bitsrgb.kra
>  share/apps/krita/templates/texture/.source/Texture1k32bitscalar.kra
>  share/apps/krita/templates/texture/.source/Texture1k8bitsrgb.kra
> -share/apps/krita/templates/texture/.source/Texture2k16bitfloatrgb.kra
> -share/apps/krita/templates/texture/.source/Texture2k16bitscalar.kra
> +share/apps/krita/templates/texture/.source/Texture2048x20488bitsrgb.kra
> +share/apps/krita/templates/texture/.source/Texture256x2568bitsrgb.kra
>  share/apps/krita/templates/texture/.source/Texture2k32bitscalar.kra
>  share/apps/krita/templates/texture/.source/Texture2k8bitsrgb.kra
> -share/apps/krita/templates/texture/.source/Texture4k16bitfloatrgb.kra
> -share/apps/krita/templates/texture/.source/Texture4k16bitscalar.kra
> +share/apps/krita/templates/texture/.source/Texture4096x40968bitsrgb.kra
>  share/apps/krita/templates/texture/.source/Texture4k32bitscalar.kra
>  share/apps/krita/templates/texture/.source/Texture4k8bitsrgb.kra
> +share/apps/krita/templates/texture/.source/Texture512x5128bitsrgb.kra
> +share/apps/krita/templates/texture/.source/Texture8k32bitscalar.kra
>  share/apps/krita/templates/texture/.source/Texture8k8bitsrgb.kra
> -share/apps/krita/templates/texture/Texture1k16bitfloatrgb.desktop
> -share/apps/krita/templates/texture/Texture1k16bitscalar.desktop
> +share/apps/krita/templates/texture/Texture1024x10248bitsrgb.desktop
>  share/apps/krita/templates/texture/Texture1k32bitscalar.desktop
>  share/apps/krita/templates/texture/Texture1k8bitsrgb.desktop
> -share/apps/krita/templates/texture/Texture2k16bitfloatrgb.desktop
> -share/apps/krita/templates/texture/Texture2k16bitscalar.desktop
> +share/apps/krita/templates/texture/Texture2048x20488bitsrgb.desktop
> +share/apps/krita/templates/texture/Texture256x2568bitsrgb.desktop
>  share/apps/krita/templates/texture/Texture2k32bitscalar.desktop
>  share/apps/krita/templates/texture/Texture2k8bitsrgb.desktop
> -share/apps/krita/templates/texture/Texture4k16bitfloatrgb.desktop
> -share/apps/krita/templates/texture/Texture4k16bitscalar.desktop
> +share/apps/krita/templates/texture/Texture4096x40968bitsrgb.desktop
>  share/apps/krita/templates/texture/Texture4k32bitscalar.desktop
>  share/apps/krita/templates/texture/Texture4k8bitsrgb.desktop
> -share/apps/krita/templates/texture/Texture8k16bitfloatrgb.desktop
> -share/apps/krita/templates/texture/Texture8k16bitscalar.desktop
> +share/apps/krita/templates/texture/Texture512x5128bitsrgb.desktop
>  share/apps/krita/templates/texture/Texture8k32bitscalar.desktop
>  share/apps/krita/templates/texture/Texture8k8bitsrgb.desktop
>  share/apps/krita/workspaces/
> -share/apps/krita/workspaces/Default.kws
> -share/apps/krita/workspaces/PaintingHD.kws
> -share/apps/krita/workspaces/PaintingHD_2Panels.kws
> -share/apps/krita/workspaces/PaintingSD.kws
> -share/apps/krita/workspaces/VectorHD.kws
> -share/apps/krita/workspaces/VectorSD.kws
> +share/apps/krita/workspaces/Big_Paint.kws
> +share/apps/krita/workspaces/Big_Paint_2.kws
> +share/apps/krita/workspaces/Big_Vector.kws
> +share/apps/krita/workspaces/Small_Paint.kws
> +share/apps/krita/workspaces/Small_Vector.kws
> +share/apps/krita/workspaces/VFX_Paint.kws
> +share/apps/kritaanimation/
> +share/apps/kritaanimation/input/
> +share/apps/kritaanimation/input/kritadefault.profile
>  share/apps/kritagemini/
>  share/apps/kritagemini/input/
>  share/apps/kritagemini/input/kritadefault.profile
> -share/apps/kritagemini/kritagemini.qml
>  share/apps/kritaplugins/
>  share/apps/kritaplugins/bigbrother.rc
>  share/apps/kritaplugins/clonesarray.rc
>  share/apps/kritaplugins/colorrange.rc
>  share/apps/kritaplugins/colorspaceconversion.rc
> -share/apps/kritaplugins/dropshadow.rc
>  share/apps/kritaplugins/gmic.rc
>  share/apps/kritaplugins/histogram.rc
>  share/apps/kritaplugins/imageseparate.rc
>  share/apps/kritaplugins/imagesize.rc
>  share/apps/kritaplugins/imagesplit.rc
> +share/apps/kritaplugins/layersplit.rc
>  share/apps/kritaplugins/metadataeditor/
>  share/apps/kritaplugins/metadataeditor.rc
>  share/apps/kritaplugins/metadataeditor/dublincore.rc
> -share/apps/kritaplugins/metadataeditor/dublincore.ui
>  share/apps/kritaplugins/metadataeditor/exif.rc
> -share/apps/kritaplugins/metadataeditor/exif.ui
>  share/apps/kritaplugins/modify_selection.rc
>  share/apps/kritaplugins/offsetimage.rc
> +share/apps/kritaplugins/resourcemanager.rc
>  share/apps/kritaplugins/rotateimage.rc
>  share/apps/kritaplugins/shearimage.rc
>  share/apps/kritasketch/
> -share/apps/kritasketch/fonts/
> -share/apps/kritasketch/fonts/SourceSansPro-Black.otf
> -share/apps/kritasketch/fonts/SourceSansPro-BlackIt.otf
> -share/apps/kritasketch/fonts/SourceSansPro-Bold.otf
> -share/apps/kritasketch/fonts/SourceSansPro-BoldIt.otf
> -share/apps/kritasketch/fonts/SourceSansPro-ExtraLight.otf
> -share/apps/kritasketch/fonts/SourceSansPro-ExtraLightIt.otf
> -share/apps/kritasketch/fonts/SourceSansPro-It.otf
> -share/apps/kritasketch/fonts/SourceSansPro-Light.otf
> -share/apps/kritasketch/fonts/SourceSansPro-LightIt.otf
> -share/apps/kritasketch/fonts/SourceSansPro-Regular.otf
> -share/apps/kritasketch/fonts/SourceSansPro-Semibold.otf
> -share/apps/kritasketch/fonts/SourceSansPro-SemiboldIt.otf
>  share/apps/kritasketch/input/
>  share/apps/kritasketch/input/kritadefault.profile
> -share/apps/kritasketch/kritasketch.qml
>  share/apps/musicshape/
>  share/apps/musicshape/fonts/
>  share/apps/musicshape/fonts/Emmentaler-14.ttf
> @@ -6791,6 +7028,10 @@ share/apps/stage/icons/hicolor/64x64/act
>  share/apps/stage/icons/hicolor/64x64/actions/zoom_animation.png
>  share/apps/stage/icons/hicolor/scalable/
>  share/apps/stage/icons/hicolor/scalable/actions/
> +share/apps/stage/icons/hicolor/scalable/actions/cohere-blue.svgz
> +share/apps/stage/icons/hicolor/scalable/actions/cohere-gold.svgz
> +share/apps/stage/icons/hicolor/scalable/actions/cohere-magenta.svgz
> +share/apps/stage/icons/hicolor/scalable/actions/cohere-red.svgz
>  share/apps/stage/icons/hicolor/scalable/actions/template_emptylandscape.svgz
>  share/apps/stage/pics/
>  share/apps/stage/pics/layout-elements.svg
> @@ -6818,6 +7059,10 @@ share/apps/stage/templates/odf/.source/
>  share/apps/stage/templates/odf/.source/blue_orange_vector.otp
>  share/apps/stage/templates/odf/.source/burning_desire.otp
>  share/apps/stage/templates/odf/.source/business.otp
> +share/apps/stage/templates/odf/.source/cohere-blue.otp
> +share/apps/stage/templates/odf/.source/cohere-gold.otp
> +share/apps/stage/templates/odf/.source/cohere-magenta.otp
> +share/apps/stage/templates/odf/.source/cohere-red.otp
>  share/apps/stage/templates/odf/.source/curious_penguin.otp
>  share/apps/stage/templates/odf/.source/flood_light.otp
>  share/apps/stage/templates/odf/.source/kde_events.otp
> @@ -6830,9 +7075,33 @@ share/apps/stage/templates/odf/.source/s
>  share/apps/stage/templates/odf/.source/skyline_night.otp
>  share/apps/stage/templates/odf/.source/skyline_night_wide.otp
>  share/apps/stage/templates/odf/.source/strange_far_hills.otp
> +share/apps/stage/templates/odf/.thumbnail/
> +share/apps/stage/templates/odf/.thumbnail/blue_orange_vector.png
> +share/apps/stage/templates/odf/.thumbnail/burning_desire.png
> +share/apps/stage/templates/odf/.thumbnail/business.png
> +share/apps/stage/templates/odf/.thumbnail/cohere-blue.png
> +share/apps/stage/templates/odf/.thumbnail/cohere-gold.png
> +share/apps/stage/templates/odf/.thumbnail/cohere-magenta.png
> +share/apps/stage/templates/odf/.thumbnail/cohere-red.png
> +share/apps/stage/templates/odf/.thumbnail/curious_penguin.png
> +share/apps/stage/templates/odf/.thumbnail/flood_light.png
> +share/apps/stage/templates/odf/.thumbnail/kde_events.png
> +share/apps/stage/templates/odf/.thumbnail/rounded_square.png
> +share/apps/stage/templates/odf/.thumbnail/simple_waves.png
> +share/apps/stage/templates/odf/.thumbnail/skyline_monotone.png
> +share/apps/stage/templates/odf/.thumbnail/skyline_monotone_wide.png
> +share/apps/stage/templates/odf/.thumbnail/skyline_morning.png
> +share/apps/stage/templates/odf/.thumbnail/skyline_morning_wide.png
> +share/apps/stage/templates/odf/.thumbnail/skyline_night.png
> +share/apps/stage/templates/odf/.thumbnail/skyline_night_wide.png
> +share/apps/stage/templates/odf/.thumbnail/strange_far_hills.png
>  share/apps/stage/templates/odf/blue_orange_vector.desktop
>  share/apps/stage/templates/odf/burning_desire.desktop
>  share/apps/stage/templates/odf/business.desktop
> +share/apps/stage/templates/odf/cohere-blue.desktop
> +share/apps/stage/templates/odf/cohere-gold.desktop
> +share/apps/stage/templates/odf/cohere-magenta.desktop
> +share/apps/stage/templates/odf/cohere-red.desktop
>  share/apps/stage/templates/odf/curious_penguin.desktop
>  share/apps/stage/templates/odf/flood_light.desktop
>  share/apps/stage/templates/odf/kde_events.desktop
> @@ -6886,6 +7155,11 @@ share/apps/words/templates/Normal/.sourc
>  share/apps/words/templates/Normal/.source/FaxLetter.odt
>  share/apps/words/templates/Normal/.source/ProfessionalA4.odt
>  share/apps/words/templates/Normal/.source/ProfessionalLetter.odt
> +share/apps/words/templates/Normal/.thumbnail/
> +share/apps/words/templates/Normal/.thumbnail/a4.png
> +share/apps/words/templates/Normal/.thumbnail/colorful.png
> +share/apps/words/templates/Normal/.thumbnail/fax.png
> +share/apps/words/templates/Normal/.thumbnail/professional.png
>  share/apps/words/templates/Normal/A4.desktop
>  share/apps/words/templates/Normal/ColorfulA4.desktop
>  share/apps/words/templates/Normal/ColorfulLetter.desktop
> @@ -6912,20 +7186,64 @@ share/calligraactive/qml/RecentFiles.qml
>  share/calligraactive/qml/SlideSelector.qml
>  share/calligraactive/qml/SpreadsheetLeftToolbar.qml
>  share/calligraactive/qml/SpreadsheetRightToolbar.qml
> +share/calligraactive/qml/Test.qml
>  share/calligraactive/qml/TextDocumentCenterOverlay.qml
>  share/calligraactive/qml/TextDocumentEditingToolbar.qml
>  share/calligraactive/qml/Toolbars.qml
>  share/color/
>  share/color/icc/
>  share/color/icc/krita/
> +share/color/icc/krita/AllColorsRGB-elle-V2-g10.icc
> +share/color/icc/krita/AllColorsRGB-elle-V2-srgbtrc.icc
> +share/color/icc/krita/AllColorsRGB-elle-V4-g10.icc
> +share/color/icc/krita/AllColorsRGB-elle-V4-srgbtrc.icc
> +share/color/icc/krita/CIERGB-elle-V2-g10.icc
> +share/color/icc/krita/CIERGB-elle-V2-g22.icc
> +share/color/icc/krita/CIERGB-elle-V2-srgbtrc.icc
> +share/color/icc/krita/CIERGB-elle-V4-g10.icc
> +share/color/icc/krita/CIERGB-elle-V4-g22.icc
> +share/color/icc/krita/CIERGB-elle-V4-srgbtrc.icc
> +share/color/icc/krita/CMakeLists.txt
> +share/color/icc/krita/ClayRGB-elle-V2-g10.icc
> +share/color/icc/krita/ClayRGB-elle-V2-g22.icc
> +share/color/icc/krita/ClayRGB-elle-V2-srgbtrc.icc
> +share/color/icc/krita/ClayRGB-elle-V4-g10.icc
> +share/color/icc/krita/ClayRGB-elle-V4-g22.icc
> +share/color/icc/krita/ClayRGB-elle-V4-srgbtrc.icc
> +share/color/icc/krita/Gray-D50-elle-V2-g10.icc
> +share/color/icc/krita/Gray-D50-elle-V2-g18.icc
> +share/color/icc/krita/Gray-D50-elle-V2-g22.icc
> +share/color/icc/krita/Gray-D50-elle-V2-srgbtrc.icc
> +share/color/icc/krita/Gray-D50-elle-V4-g10.icc
> +share/color/icc/krita/Gray-D50-elle-V4-g18.icc
> +share/color/icc/krita/Gray-D50-elle-V4-g22.icc
> +share/color/icc/krita/Gray-D50-elle-V4-srgbtrc.icc
> +share/color/icc/krita/IdentityRGB-elle-V2-g10.icc
> +share/color/icc/krita/IdentityRGB-elle-V2-srgbtrc.icc
> +share/color/icc/krita/IdentityRGB-elle-V4-g10.icc
> +share/color/icc/krita/IdentityRGB-elle-V4-srgbtrc.icc
> +share/color/icc/krita/Lab-D50-Identity-elle-V2.icc
> +share/color/icc/krita/Lab-D50-Identity-elle-V4.icc
> +share/color/icc/krita/LargeRGB-elle-V2-g10.icc
> +share/color/icc/krita/LargeRGB-elle-V2-g18.icc
> +share/color/icc/krita/LargeRGB-elle-V2-srgbtrc.icc
> +share/color/icc/krita/LargeRGB-elle-V4-g10.icc
> +share/color/icc/krita/LargeRGB-elle-V4-g18.icc
> +share/color/icc/krita/LargeRGB-elle-V4-srgbtrc.icc
>  share/color/icc/krita/README
> -share/color/icc/krita/WideGamut.icm
> +share/color/icc/krita/WideRGB-elle-V2-g10.icc
> +share/color/icc/krita/WideRGB-elle-V2-g22.icc
> +share/color/icc/krita/WideRGB-elle-V2-srgbtrc.icc
> +share/color/icc/krita/WideRGB-elle-V4-g10.icc
> +share/color/icc/krita/WideRGB-elle-V4-g22.icc
> +share/color/icc/krita/WideRGB-elle-V4-srgbtrc.icc
> +share/color/icc/krita/cmyk.icm
>  share/color/icc/krita/krita25_lcms-builtin-sRGB_g100-truegamma.icc
> -share/color/icc/krita/sRGB.icm
> +share/color/icc/krita/sRGB-elle-V2-g10.icc
> +share/color/icc/krita/sRGB-elle-V2-srgbtrc.icc
> +share/color/icc/krita/sRGB-elle-V4-g10.icc
> +share/color/icc/krita/sRGB-elle-V4-srgbtrc.icc
>  share/color/icc/krita/scRGB.icm
> -share/color/icc/pigment/
> -share/color/icc/pigment/CMY.icm
> -share/color/icc/pigment/fogra27l.icm
>  share/config.kcfg/plansettings.kcfg
>  share/config.kcfg/planworksettings.kcfg
>  share/config.kcfg/sheets.kcfg
> @@ -6935,15 +7253,11 @@ share/config/flowrc
>  share/config/karbonrc
>  share/config/kexirc
>  share/config/kritabrushes.knsrc
> -share/config/kritageminipanelsrc
> -share/config/kritageminirc
>  share/config/kritagradients.knsrc
>  share/config/kritaiccprofiles.knsrc
>  share/config/kritapatterns.knsrc
>  share/config/kritapresets.knsrc
>  share/config/kritarc
> -share/config/kritasketchpanelsrc
> -share/config/kritasketchrc
>  share/config/planrc
>  share/config/planworkrc
>  share/config/sheetsrc
> @@ -7067,6 +7381,7 @@ share/icons/hicolor/1024x1024/apps/
>  share/icons/hicolor/1024x1024/apps/braindump.png
>  share/icons/hicolor/1024x1024/apps/calligraauthor.png
>  share/icons/hicolor/1024x1024/apps/calligraflow.png
> +share/icons/hicolor/1024x1024/apps/calligragemini.png
>  share/icons/hicolor/1024x1024/apps/calligrakarbon.png
>  share/icons/hicolor/1024x1024/apps/calligrakexi.png
>  share/icons/hicolor/1024x1024/apps/calligrakrita.png
> @@ -7077,6 +7392,7 @@ share/icons/hicolor/1024x1024/apps/calli
>  share/icons/hicolor/128x128/apps/braindump.png
>  share/icons/hicolor/128x128/apps/calligraauthor.png
>  share/icons/hicolor/128x128/apps/calligraflow.png
> +share/icons/hicolor/128x128/apps/calligragemini.png
>  share/icons/hicolor/128x128/apps/calligrakarbon.png
>  share/icons/hicolor/128x128/apps/calligrakexi.png
>  share/icons/hicolor/128x128/apps/calligrakrita.png
> @@ -7085,6 +7401,8 @@ share/icons/hicolor/128x128/apps/calligr
>  share/icons/hicolor/128x128/apps/calligrasheets.png
>  share/icons/hicolor/128x128/apps/calligrastage.png
>  share/icons/hicolor/128x128/apps/calligrawords.png
> +share/icons/hicolor/128x128/apps/kritagemini.png
> +share/icons/hicolor/128x128/apps/kritasketch.png
>  share/icons/hicolor/128x128/mimetypes/application-x-vnd.kde.kplato.png
>  share/icons/hicolor/128x128/mimetypes/application-x-vnd.kde.kplato.work.png
>  share/icons/hicolor/128x128/mimetypes/application-x-vnd.kde.plan.png
> @@ -7095,6 +7413,7 @@ share/icons/hicolor/16x16/actions/pen.pn
>  share/icons/hicolor/16x16/apps/braindump.png
>  share/icons/hicolor/16x16/apps/calligraauthor.png
>  share/icons/hicolor/16x16/apps/calligraflow.png
> +share/icons/hicolor/16x16/apps/calligragemini.png
>  share/icons/hicolor/16x16/apps/calligrakarbon.png
>  share/icons/hicolor/16x16/apps/calligrakexi.png
>  share/icons/hicolor/16x16/apps/calligrakrita.png
> @@ -7103,6 +7422,8 @@ share/icons/hicolor/16x16/apps/calligrap
>  share/icons/hicolor/16x16/apps/calligrasheets.png
>  share/icons/hicolor/16x16/apps/calligrastage.png
>  share/icons/hicolor/16x16/apps/calligrawords.png
> +share/icons/hicolor/16x16/apps/kritagemini.png
> +share/icons/hicolor/16x16/apps/kritasketch.png
>  share/icons/hicolor/16x16/mimetypes/application-x-vnd.kde.kplato.work.png
>  share/icons/hicolor/16x16/mimetypes/application-x-vnd.kde.plan.work.png
>  share/icons/hicolor/22x22/actions/stateshape.png
> @@ -7111,6 +7432,7 @@ share/icons/hicolor/22x22/actions/tool_p
>  share/icons/hicolor/22x22/apps/braindump.png
>  share/icons/hicolor/22x22/apps/calligraauthor.png
>  share/icons/hicolor/22x22/apps/calligraflow.png
> +share/icons/hicolor/22x22/apps/calligragemini.png
>  share/icons/hicolor/22x22/apps/calligrakarbon.png
>  share/icons/hicolor/22x22/apps/calligrakexi.png
>  share/icons/hicolor/22x22/apps/calligrakrita.png
> @@ -7119,11 +7441,14 @@ share/icons/hicolor/22x22/apps/calligrap
>  share/icons/hicolor/22x22/apps/calligrasheets.png
>  share/icons/hicolor/22x22/apps/calligrastage.png
>  share/icons/hicolor/22x22/apps/calligrawords.png
> +share/icons/hicolor/22x22/apps/kritagemini.png
> +share/icons/hicolor/22x22/apps/kritasketch.png
>  share/icons/hicolor/22x22/mimetypes/application-x-vnd.kde.kplato.work.png
>  share/icons/hicolor/22x22/mimetypes/application-x-vnd.kde.plan.work.png
>  share/icons/hicolor/256x256/apps/braindump.png
>  share/icons/hicolor/256x256/apps/calligraauthor.png
>  share/icons/hicolor/256x256/apps/calligraflow.png
> +share/icons/hicolor/256x256/apps/calligragemini.png
>  share/icons/hicolor/256x256/apps/calligrakarbon.png
>  share/icons/hicolor/256x256/apps/calligrakexi.png
>  share/icons/hicolor/256x256/apps/calligrakrita.png
> @@ -7131,9 +7456,12 @@ share/icons/hicolor/256x256/apps/calligr
>  share/icons/hicolor/256x256/apps/calligrasheets.png
>  share/icons/hicolor/256x256/apps/calligrastage.png
>  share/icons/hicolor/256x256/apps/calligrawords.png
> +share/icons/hicolor/256x256/apps/kritagemini.png
> +share/icons/hicolor/256x256/apps/kritasketch.png
>  share/icons/hicolor/32x32/apps/braindump.png
>  share/icons/hicolor/32x32/apps/calligraauthor.png
>  share/icons/hicolor/32x32/apps/calligraflow.png
> +share/icons/hicolor/32x32/apps/calligragemini.png
>  share/icons/hicolor/32x32/apps/calligrakarbon.png
>  share/icons/hicolor/32x32/apps/calligrakexi.png
>  share/icons/hicolor/32x32/apps/calligrakrita.png
> @@ -7142,11 +7470,14 @@ share/icons/hicolor/32x32/apps/calligrap
>  share/icons/hicolor/32x32/apps/calligrasheets.png
>  share/icons/hicolor/32x32/apps/calligrastage.png
>  share/icons/hicolor/32x32/apps/calligrawords.png
> +share/icons/hicolor/32x32/apps/kritagemini.png
> +share/icons/hicolor/32x32/apps/kritasketch.png
>  share/icons/hicolor/32x32/mimetypes/application-x-vnd.kde.kplato.work.png
>  share/icons/hicolor/32x32/mimetypes/application-x-vnd.kde.plan.work.png
>  share/icons/hicolor/48x48/apps/braindump.png
>  share/icons/hicolor/48x48/apps/calligraauthor.png
>  share/icons/hicolor/48x48/apps/calligraflow.png
> +share/icons/hicolor/48x48/apps/calligragemini.png
>  share/icons/hicolor/48x48/apps/calligrakarbon.png
>  share/icons/hicolor/48x48/apps/calligrakexi.png
>  share/icons/hicolor/48x48/apps/calligrakrita.png
> @@ -7155,13 +7486,14 @@ share/icons/hicolor/48x48/apps/calligrap
>  share/icons/hicolor/48x48/apps/calligrasheets.png
>  share/icons/hicolor/48x48/apps/calligrastage.png
>  share/icons/hicolor/48x48/apps/calligrawords.png
> +share/icons/hicolor/48x48/apps/kritagemini.png
> +share/icons/hicolor/48x48/apps/kritasketch.png
>  share/icons/hicolor/48x48/mimetypes/application-x-vnd.kde.kplato.work.png
>  share/icons/hicolor/48x48/mimetypes/application-x-vnd.kde.plan.work.png
> -share/icons/hicolor/512x512/
> -share/icons/hicolor/512x512/apps/
>  share/icons/hicolor/512x512/apps/braindump.png
>  share/icons/hicolor/512x512/apps/calligraauthor.png
>  share/icons/hicolor/512x512/apps/calligraflow.png
> +share/icons/hicolor/512x512/apps/calligragemini.png
>  share/icons/hicolor/512x512/apps/calligrakarbon.png
>  share/icons/hicolor/512x512/apps/calligrakexi.png
>  share/icons/hicolor/512x512/apps/calligrakrita.png
> @@ -7172,6 +7504,7 @@ share/icons/hicolor/512x512/apps/calligr
>  share/icons/hicolor/64x64/apps/braindump.png
>  share/icons/hicolor/64x64/apps/calligraauthor.png
>  share/icons/hicolor/64x64/apps/calligraflow.png
> +share/icons/hicolor/64x64/apps/calligragemini.png
>  share/icons/hicolor/64x64/apps/calligrakarbon.png
>  share/icons/hicolor/64x64/apps/calligrakexi.png
>  share/icons/hicolor/64x64/apps/calligrakrita.png
> @@ -7180,6 +7513,8 @@ share/icons/hicolor/64x64/apps/calligrap
>  share/icons/hicolor/64x64/apps/calligrasheets.png
>  share/icons/hicolor/64x64/apps/calligrastage.png
>  share/icons/hicolor/64x64/apps/calligrawords.png
> +share/icons/hicolor/64x64/apps/kritagemini.png
> +share/icons/hicolor/64x64/apps/kritasketch.png
>  share/icons/hicolor/64x64/mimetypes/application-x-vnd.kde.kplato.png
>  share/icons/hicolor/64x64/mimetypes/application-x-vnd.kde.kplato.work.png
>  share/icons/hicolor/64x64/mimetypes/application-x-vnd.kde.plan.png
> @@ -7232,16 +7567,90 @@ share/icons/oxygen/scalable/
>  share/icons/oxygen/scalable/actions/
>  share/icons/oxygen/scalable/actions/table.svgz
>  share/kde4/services/ServiceMenus/
> -share/kde4/services/ServiceMenus/flow_print.desktop
> -share/kde4/services/ServiceMenus/karbon_print.desktop
> -share/kde4/services/ServiceMenus/krita_print.desktop
> -share/kde4/services/ServiceMenus/sheets_print.desktop
> -share/kde4/services/ServiceMenus/stage_print.desktop
> -share/kde4/services/ServiceMenus/words_print.desktop
> -share/kde4/services/authorpart.desktop
> -share/kde4/services/braindump_shape_state.desktop
> -share/kde4/services/braindump_shape_web.desktop
> +share/kde4/services/ServiceMenus/calligra/
> +share/kde4/services/ServiceMenus/calligra/flow_print.desktop
> +share/kde4/services/ServiceMenus/calligra/karbon_print.desktop
> +share/kde4/services/ServiceMenus/calligra/krita_print.desktop
> +share/kde4/services/ServiceMenus/calligra/sheets_print.desktop
> +share/kde4/services/ServiceMenus/calligra/stage_print.desktop
> +share/kde4/services/ServiceMenus/calligra/words_print.desktop
>  share/kde4/services/calligra/
> +share/kde4/services/calligra/authorpart.desktop
> +share/kde4/services/calligra/braindump_shape_state.desktop
> +share/kde4/services/calligra/braindump_shape_web.desktop
> +share/kde4/services/calligra/calligra_docker_defaults.desktop
> +share/kde4/services/calligra/calligra_filter_applixspread2kspread.desktop
> +share/kde4/services/calligra/calligra_filter_applixword2odt.desktop
> +share/kde4/services/calligra/calligra_filter_ascii2words.desktop
> +share/kde4/services/calligra/calligra_filter_csv2sheets.desktop
> +share/kde4/services/calligra/calligra_filter_dbase2kspread.desktop
> +share/kde4/services/calligra/calligra_filter_doc2odt.desktop
> +share/kde4/services/calligra/calligra_filter_docx2odt.desktop
> +share/kde4/services/calligra/calligra_filter_gnumeric2sheets.desktop
> +share/kde4/services/calligra/calligra_filter_html2ods.desktop
> +share/kde4/services/calligra/calligra_filter_karbon1x2karbon.desktop
> +share/kde4/services/calligra/calligra_filter_karbon2image.desktop
> +share/kde4/services/calligra/calligra_filter_karbon2svg.desktop
> +share/kde4/services/calligra/calligra_filter_karbon2wmf.desktop
> +share/kde4/services/calligra/calligra_filter_kpr2odp.desktop
> +share/kde4/services/calligra/calligra_filter_kspread2tex.desktop
> +share/kde4/services/calligra/calligra_filter_mpp2plan.desktop
> +share/kde4/services/calligra/calligra_filter_mpx2plan.desktop
> +share/kde4/services/calligra/calligra_filter_odt2ascii.desktop
> +share/kde4/services/calligra/calligra_filter_odt2docx.desktop
> +share/kde4/services/calligra/calligra_filter_odt2epub2.desktop
> +share/kde4/services/calligra/calligra_filter_odt2html.desktop
> +share/kde4/services/calligra/calligra_filter_odt2mobi.desktop
> +share/kde4/services/calligra/calligra_filter_opencalc2sheets.desktop
> +share/kde4/services/calligra/calligra_filter_pdf2svg.desktop
> +share/kde4/services/calligra/calligra_filter_planner2plan.desktop
> +share/kde4/services/calligra/calligra_filter_ppt2odp.desktop
> +share/kde4/services/calligra/calligra_filter_pptx2odp.desktop
> +share/kde4/services/calligra/calligra_filter_qpro2sheets.desktop
> +share/kde4/services/calligra/calligra_filter_rtf2odt.desktop
> +share/kde4/services/calligra/calligra_filter_sheets2csv.desktop
> +share/kde4/services/calligra/calligra_filter_sheets2gnumeric.desktop
> +share/kde4/services/calligra/calligra_filter_sheets2html.desktop
> +share/kde4/services/calligra/calligra_filter_sheets2opencalc.desktop
> +share/kde4/services/calligra/calligra_filter_svg2karbon.desktop
> +share/kde4/services/calligra/calligra_filter_wmf2svg.desktop
> +share/kde4/services/calligra/calligra_filter_xfig2odg.desktop
> +share/kde4/services/calligra/calligra_filter_xls2ods.desktop
> +share/kde4/services/calligra/calligra_filter_xlsx2ods.desktop
> +share/kde4/services/calligra/calligra_semanticitem_contact.desktop
> +share/kde4/services/calligra/calligra_semanticitem_event.desktop
> +share/kde4/services/calligra/calligra_semanticitem_location.desktop
> +share/kde4/services/calligra/calligra_shape_artistictext.desktop
> +share/kde4/services/calligra/calligra_shape_chart.desktop
> +share/kde4/services/calligra/calligra_shape_formular.desktop
> +share/kde4/services/calligra/calligra_shape_music.desktop
> +share/kde4/services/calligra/calligra_shape_paths.desktop
> +share/kde4/services/calligra/calligra_shape_picture.desktop
> +share/kde4/services/calligra/calligra_shape_plugin.desktop
> +share/kde4/services/calligra/calligra_shape_spreadsheet-deferred.desktop
> +share/kde4/services/calligra/calligra_shape_spreadsheet.desktop
> +share/kde4/services/calligra/calligra_shape_text.desktop
> +share/kde4/services/calligra/calligra_shape_vector.desktop
> +share/kde4/services/calligra/calligra_shape_video.desktop
> +share/kde4/services/calligra/calligra_textediting_autocorrect.desktop
> +share/kde4/services/calligra/calligra_textediting_changecase.desktop
> +share/kde4/services/calligra/calligra_textediting_spellcheck.desktop
> +share/kde4/services/calligra/calligra_textediting_thesaurus.desktop
> +share/kde4/services/calligra/calligra_textinlineobject_variables.desktop
> +share/kde4/services/calligra/calligra_tool_basicflakes.desktop
> +share/kde4/services/calligra/calligra_tool_defaults.desktop
> +share/kde4/services/calligra/calligradocinfopropspage.desktop
> +share/kde4/services/calligra/calligrastageeventactions.desktop
> +share/kde4/services/calligra/calligrastagetoolanimation.desktop
> +share/kde4/services/calligra/flowdockersplugin.desktop
> +share/kde4/services/calligra/flowpart.desktop
> +share/kde4/services/calligra/karbonfiltereffects.desktop
> +share/kde4/services/calligra/karbonflattenpathplugin.desktop
> +share/kde4/services/calligra/karbonpart.desktop
> +share/kde4/services/calligra/karbonrefinepathplugin.desktop
> +share/kde4/services/calligra/karbonroundcornersplugin.desktop
> +share/kde4/services/calligra/karbontools.desktop
> +share/kde4/services/calligra/karbonwhirlpinchplugin.desktop
>  share/kde4/services/calligra/kexicsv_importexporthandler.desktop
>  share/kde4/services/calligra/kexidb_mysqldriver.desktop
>  share/kde4/services/calligra/kexidb_pqxxsqldriver.desktop
> @@ -7265,251 +7674,192 @@ share/kde4/services/calligra/kformdesign
>  share/kde4/services/calligra/kformdesigner_mapbrowser.desktop
>  share/kde4/services/calligra/kformdesigner_stdwidgets.desktop
>  share/kde4/services/calligra/kformdesigner_webbrowser.desktop
> +share/kde4/services/calligra/kformulapart.desktop
> +share/kde4/services/calligra/kolcmsengine.desktop
> +share/kde4/services/calligra/kopabackgroundtool.desktop
>  share/kde4/services/calligra/koreport_barcodeplugin.desktop
>  share/kde4/services/calligra/koreport_chartplugin.desktop
>  share/kde4/services/calligra/koreport_mapsplugin.desktop
>  share/kde4/services/calligra/koreport_webplugin.desktop
> -share/kde4/services/calligra_docker_defaults.desktop
> -share/kde4/services/calligra_filter_applixspread2kspread.desktop
> -share/kde4/services/calligra_filter_applixword2odt.desktop
> -share/kde4/services/calligra_filter_ascii2words.desktop
> -share/kde4/services/calligra_filter_csv2sheets.desktop
> -share/kde4/services/calligra_filter_dbase2kspread.desktop
> -share/kde4/services/calligra_filter_doc2odt.desktop
> -share/kde4/services/calligra_filter_docx2odt.desktop
> -share/kde4/services/calligra_filter_gnumeric2sheets.desktop
> -share/kde4/services/calligra_filter_html2ods.desktop
> -share/kde4/services/calligra_filter_karbon1x2karbon.desktop
> -share/kde4/services/calligra_filter_karbon2jpg.desktop
> -share/kde4/services/calligra_filter_karbon2png.desktop
> -share/kde4/services/calligra_filter_karbon2svg.desktop
> -share/kde4/services/calligra_filter_karbon2wmf.desktop
> -share/kde4/services/calligra_filter_kpr2odp.desktop
> -share/kde4/services/calligra_filter_kspread2tex.desktop
> -share/kde4/services/calligra_filter_mpp2plan.desktop
> -share/kde4/services/calligra_filter_mpx2plan.desktop
> -share/kde4/services/calligra_filter_odt2ascii.desktop
> -share/kde4/services/calligra_filter_odt2epub2.desktop
> -share/kde4/services/calligra_filter_odt2html.desktop
> -share/kde4/services/calligra_filter_odt2mobi.desktop
> -share/kde4/services/calligra_filter_opencalc2sheets.desktop
> -share/kde4/services/calligra_filter_pdf2svg.desktop
> -share/kde4/services/calligra_filter_planner2plan.desktop
> -share/kde4/services/calligra_filter_ppt2odp.desktop
> -share/kde4/services/calligra_filter_pptx2odp.desktop
> -share/kde4/services/calligra_filter_qpro2sheets.desktop
> -share/kde4/services/calligra_filter_rtf2odt.desktop
> -share/kde4/services/calligra_filter_sheets2csv.desktop
> -share/kde4/services/calligra_filter_sheets2gnumeric.desktop
> -share/kde4/services/calligra_filter_sheets2html.desktop
> -share/kde4/services/calligra_filter_sheets2opencalc.desktop
> -share/kde4/services/calligra_filter_svg2karbon.desktop
> -share/kde4/services/calligra_filter_svgz2karbon.desktop
> -share/kde4/services/calligra_filter_wmf2svg.desktop
> -share/kde4/services/calligra_filter_xfig2odg.desktop
> -share/kde4/services/calligra_filter_xls2ods.desktop
> -share/kde4/services/calligra_filter_xlsx2ods.desktop
> +share/kde4/services/calligra/kpr_pageeffect_barwipe.desktop
> +share/kde4/services/calligra/kpr_pageeffect_clockwipe.desktop
> +share/kde4/services/calligra/kpr_pageeffect_edgewipe.desktop
> +share/kde4/services/calligra/kpr_pageeffect_fade.desktop
> +share/kde4/services/calligra/kpr_pageeffect_iriswipe.desktop
> +share/kde4/services/calligra/kpr_pageeffect_matrixwipe.desktop
> +share/kde4/services/calligra/kpr_pageeffect_slidewipe.desktop
> +share/kde4/services/calligra/kpr_pageeffect_spacerotation.desktop
> +share/kde4/services/calligra/kpr_pageeffect_swapeffect.desktop
> +share/kde4/services/calligra/kpr_shapeanimation_example.desktop
> +share/kde4/services/calligra/kprvariables.desktop
> +share/kde4/services/calligra/krita_artisticcolorselector.desktop
> +share/kde4/services/calligra/krita_bmp_export.desktop
> +share/kde4/services/calligra/krita_bmp_import.desktop
> +share/kde4/services/calligra/krita_channeldocker.desktop
> +share/kde4/services/calligra/krita_colorselectorng.desktop
> +share/kde4/services/calligra/krita_colorslider.desktop
> +share/kde4/services/calligra/krita_colorspaces_extensions_plugin.desktop
> +share/kde4/services/calligra/krita_compositiondocker.desktop
> +share/kde4/services/calligra/krita_digitalmixer.desktop
> +share/kde4/services/calligra/krita_exr_export.desktop
> +share/kde4/services/calligra/krita_exr_import.desktop
> +share/kde4/services/calligra/krita_heightmap_export.desktop
> +share/kde4/services/calligra/krita_heightmap_import.desktop
> +share/kde4/services/calligra/krita_jp2_export.desktop
> +share/kde4/services/calligra/krita_jp2_import.desktop
> +share/kde4/services/calligra/krita_jpeg_export.desktop
> +share/kde4/services/calligra/krita_jpeg_import.desktop
> +share/kde4/services/calligra/krita_lutdocker.desktop
> +share/kde4/services/calligra/krita_odg_import.desktop
> +share/kde4/services/calligra/krita_ora_export.desktop
> +share/kde4/services/calligra/krita_ora_import.desktop
> +share/kde4/services/calligra/krita_ora_thumbnail.desktop
> +share/kde4/services/calligra/krita_overviewdocker.desktop
> +share/kde4/services/calligra/krita_palettedocker.desktop
> +share/kde4/services/calligra/krita_patterndocker.desktop
> +share/kde4/services/calligra/krita_pdf_import.desktop
> +share/kde4/services/calligra/krita_png_export.desktop
> +share/kde4/services/calligra/krita_png_import.desktop
> +share/kde4/services/calligra/krita_ppm_export.desktop
> +share/kde4/services/calligra/krita_ppm_import.desktop
> +share/kde4/services/calligra/krita_presetdocker.desktop
> +share/kde4/services/calligra/krita_psd_export.desktop
> +share/kde4/services/calligra/krita_psd_import.desktop
> +share/kde4/services/calligra/krita_qml_export.desktop
> +share/kde4/services/calligra/krita_raw_import.desktop
> +share/kde4/services/calligra/krita_smallcolorselector.desktop
> +share/kde4/services/calligra/krita_specificcolorselector.desktop
> +share/kde4/services/calligra/krita_tasksetdocker.desktop
> +share/kde4/services/calligra/krita_tga_export.desktop
> +share/kde4/services/calligra/krita_tga_import.desktop
> +share/kde4/services/calligra/krita_tiff_export.desktop
> +share/kde4/services/calligra/krita_tiff_import.desktop
> +share/kde4/services/calligra/krita_xcf_import.desktop
> +share/kde4/services/calligra/kritabigbrother.desktop
> +share/kde4/services/calligra/kritablurfilter.desktop
> +share/kde4/services/calligra/kritachalkpaintop.desktop
> +share/kde4/services/calligra/kritaclonesarray.desktop
> +share/kde4/services/calligra/kritacolorgenerator.desktop
> +share/kde4/services/calligra/kritacolorrange.desktop
> +share/kde4/services/calligra/kritacolorsfilter.desktop
> +share/kde4/services/calligra/kritacolorsmudgepaintop.desktop
> +share/kde4/services/calligra/kritacolorspaceconversion.desktop
> +share/kde4/services/calligra/kritaconvolutionfilters.desktop
> +share/kde4/services/calligra/kritacurvepaintop.desktop
> +share/kde4/services/calligra/kritadefaultdockers.desktop
> +share/kde4/services/calligra/kritadefaultpaintops.desktop
> +share/kde4/services/calligra/kritadefaulttools.desktop
> +share/kde4/services/calligra/kritadeformpaintop.desktop
> +share/kde4/services/calligra/kritadodgeburn.desktop
> +share/kde4/services/calligra/kritadynapaintop.desktop
> +share/kde4/services/calligra/kritaembossfilter.desktop
> +share/kde4/services/calligra/kritaexample.desktop
> +share/kde4/services/calligra/kritaexperimentpaintop.desktop
> +share/kde4/services/calligra/kritaextensioncolorsfilters.desktop
> +share/kde4/services/calligra/kritafastcolortransfer.desktop
> +share/kde4/services/calligra/kritafilterop.desktop
> +share/kde4/services/calligra/kritagmic.desktop
> +share/kde4/services/calligra/kritagridpaintop.desktop
> +share/kde4/services/calligra/kritahairypaintop.desktop
> +share/kde4/services/calligra/kritahatchingpaintop.desktop
> +share/kde4/services/calligra/kritahistogram.desktop
> +share/kde4/services/calligra/kritahistorydocker.desktop
> +share/kde4/services/calligra/kritaimagedocker.desktop
> +share/kde4/services/calligra/kritaimageenhancement.desktop
> +share/kde4/services/calligra/kritaimagesize.desktop
> +share/kde4/services/calligra/kritaimagesplit.desktop
> +share/kde4/services/calligra/kritaindexcolors.desktop
> +share/kde4/services/calligra/kritalayergroupswitcher.desktop
> +share/kde4/services/calligra/kritalayersplit.desktop
> +share/kde4/services/calligra/kritalevelfilter.desktop
> +share/kde4/services/calligra/kritametadataeditor.desktop
> +share/kde4/services/calligra/kritamodifyselection.desktop
> +share/kde4/services/calligra/kritanoisefilter.desktop
> +share/kde4/services/calligra/kritaoffsetimage.desktop
> +share/kde4/services/calligra/kritaoilpaintfilter.desktop
> +share/kde4/services/calligra/kritaparticlepaintop.desktop
> +share/kde4/services/calligra/kritapatterngenerator.desktop
> +share/kde4/services/calligra/kritaphongbumpmapfilter.desktop
> +share/kde4/services/calligra/kritapixelizefilter.desktop
> +share/kde4/services/calligra/kritaposterize.desktop
> +share/kde4/services/calligra/kritaraindropsfilter.desktop
> +share/kde4/services/calligra/kritarandompickfilter.desktop
> +share/kde4/services/calligra/kritaresourcemanager.desktop
> +share/kde4/services/calligra/kritarotateimage.desktop
> +share/kde4/services/calligra/kritaroundcornersfilter.desktop
> +share/kde4/services/calligra/kritarulerassistanttool.desktop
> +share/kde4/services/calligra/kritaselectiontools.desktop
> +share/kde4/services/calligra/kritaseparatechannels.desktop
> +share/kde4/services/calligra/kritashearimage.desktop
> +share/kde4/services/calligra/kritasketchpaintop.desktop
> +share/kde4/services/calligra/kritasmalltilesfilter.desktop
> +share/kde4/services/calligra/kritasobelfilter.desktop
> +share/kde4/services/calligra/kritaspraypaintop.desktop
> +share/kde4/services/calligra/kritatoolcrop.desktop
> +share/kde4/services/calligra/kritatooldyna.desktop
> +share/kde4/services/calligra/kritatoolgrid.desktop
> +share/kde4/services/calligra/kritatoolperspectivegrid.desktop
> +share/kde4/services/calligra/kritatoolpolygon.desktop
> +share/kde4/services/calligra/kritatoolpolyline.desktop
> +share/kde4/services/calligra/kritatooltext.desktop
> +share/kde4/services/calligra/kritatooltransform.desktop
> +share/kde4/services/calligra/kritaunsharpfilter.desktop
> +share/kde4/services/calligra/kritawavefilter.desktop
> +share/kde4/services/calligra/krossmoduleplan.desktop
> +share/kde4/services/calligra/krossmodulesheets.desktop
> +share/kde4/services/calligra/kspread_plugin_tool_calendar.desktop
> +share/kde4/services/calligra/kspreadbitopsmodule.desktop
> +share/kde4/services/calligra/kspreadconversionmodule.desktop
> +share/kde4/services/calligra/kspreaddatabasemodule.desktop
> +share/kde4/services/calligra/kspreaddatetimemodule.desktop
> +share/kde4/services/calligra/kspreadengineeringmodule.desktop
> +share/kde4/services/calligra/kspreadfinancialmodule.desktop
> +share/kde4/services/calligra/kspreadinformationmodule.desktop
> +share/kde4/services/calligra/kspreadlogicmodule.desktop
> +share/kde4/services/calligra/kspreadmathmodule.desktop
> +share/kde4/services/calligra/kspreadreferencemodule.desktop
> +share/kde4/services/calligra/kspreadstatisticalmodule.desktop
> +share/kde4/services/calligra/kspreadtextmodule.desktop
> +share/kde4/services/calligra/kspreadtrigonometrymodule.desktop
> +share/kde4/services/calligra/libokularGenerator_doc_calligra.desktop
> +share/kde4/services/calligra/libokularGenerator_docx_calligra.desktop
> +share/kde4/services/calligra/okularDoc_calligra.desktop
> +share/kde4/services/calligra/okularDocx_calligra.desktop
> +share/kde4/services/calligra/plan_icalendar_export.desktop
> +share/kde4/services/calligra/plan_kplato_import.desktop
> +share/kde4/services/calligra/planpart.desktop
> +share/kde4/services/calligra/planrcpsscheduler.desktop
> +share/kde4/services/calligra/planscripting.desktop
> +share/kde4/services/calligra/plantjscheduler.desktop
> +share/kde4/services/calligra/planworkpart.desktop
> +share/kde4/services/calligra/sheetspart.desktop
> +share/kde4/services/calligra/sheetsscripting.desktop
> +share/kde4/services/calligra/sheetssolver.desktop
> +share/kde4/services/calligra/stagepart.desktop
> +share/kde4/services/calligra/wordspart.desktop
> +share/kde4/services/calligra_filter_odt2wiki.desktop
>  share/kde4/services/calligra_odg_thumbnail.desktop
> -share/kde4/services/calligra_semanticitem_contact.desktop
> -share/kde4/services/calligra_semanticitem_event.desktop
> -share/kde4/services/calligra_semanticitem_location.desktop
> -share/kde4/services/calligra_shape_artistictext.desktop
> -share/kde4/services/calligra_shape_chart.desktop
> -share/kde4/services/calligra_shape_formular.desktop
> -share/kde4/services/calligra_shape_music.desktop
> -share/kde4/services/calligra_shape_paths.desktop
> -share/kde4/services/calligra_shape_picture.desktop
> -share/kde4/services/calligra_shape_plugin.desktop
> -share/kde4/services/calligra_shape_spreadsheet-deferred.desktop
> -share/kde4/services/calligra_shape_spreadsheet.desktop
> -share/kde4/services/calligra_shape_text.desktop
> -share/kde4/services/calligra_shape_vector.desktop
> -share/kde4/services/calligra_shape_video.desktop
> -share/kde4/services/calligra_textediting_autocorrect.desktop
> -share/kde4/services/calligra_textediting_changecase.desktop
> -share/kde4/services/calligra_textediting_spellcheck.desktop
> -share/kde4/services/calligra_textediting_thesaurus.desktop
> -share/kde4/services/calligra_textinlineobject_variables.desktop
> -share/kde4/services/calligra_tool_basicflakes.desktop
> -share/kde4/services/calligra_tool_defaults.desktop
> -share/kde4/services/calligradocinfopropspage.desktop
> -share/kde4/services/calligrastageeventactions.desktop
> -share/kde4/services/calligrastagetoolanimation.desktop
> -share/kde4/services/flowdockersplugin.desktop
> -share/kde4/services/flowpart.desktop
>  share/kde4/services/karbon_karbon1x_thumbnail.desktop
>  share/kde4/services/karbon_wmf_thumbnail.desktop
>  share/kde4/services/karbon_xfig_thumbnail.desktop
> -share/kde4/services/karbonfiltereffects.desktop
> -share/kde4/services/karbonflattenpathplugin.desktop
> -share/kde4/services/karbonpart.desktop
> -share/kde4/services/karbonrefinepathplugin.desktop
> -share/kde4/services/karbonroundcornersplugin.desktop
> -share/kde4/services/karbontools.desktop
> -share/kde4/services/karbonwhirlpinchplugin.desktop
> -share/kde4/services/kformulapart.desktop
> -share/kde4/services/kolcmsengine.desktop
> -share/kde4/services/kopabackgroundtool.desktop
> -share/kde4/services/kpr_pageeffect_barwipe.desktop
> -share/kde4/services/kpr_pageeffect_clockwipe.desktop
> -share/kde4/services/kpr_pageeffect_edgewipe.desktop
> -share/kde4/services/kpr_pageeffect_fade.desktop
> -share/kde4/services/kpr_pageeffect_iriswipe.desktop
> -share/kde4/services/kpr_pageeffect_matrixwipe.desktop
> -share/kde4/services/kpr_pageeffect_slidewipe.desktop
> -share/kde4/services/kpr_pageeffect_spacerotation.desktop
> -share/kde4/services/kpr_pageeffect_swapeffect.desktop
> -share/kde4/services/kpr_shapeanimation_example.desktop
> -share/kde4/services/kprvariables.desktop
> -share/kde4/services/krita_artisticcolorselector.desktop
> -share/kde4/services/krita_bmp_export.desktop
> -share/kde4/services/krita_bmp_import.desktop
> -share/kde4/services/krita_channeldocker.desktop
> -share/kde4/services/krita_colorselectorng.desktop
> -share/kde4/services/krita_colorspaces_extensions_plugin.desktop
> -share/kde4/services/krita_compositiondocker.desktop
> -share/kde4/services/krita_digitalmixer.desktop
> -share/kde4/services/krita_exr_export.desktop
> -share/kde4/services/krita_exr_import.desktop
> -share/kde4/services/krita_flipbook_import.desktop
> -share/kde4/services/krita_jp2_export.desktop
> -share/kde4/services/krita_jp2_import.desktop
> -share/kde4/services/krita_jpeg_export.desktop
> -share/kde4/services/krita_jpeg_import.desktop
>  share/kde4/services/krita_kra_thumbnail.desktop
> -share/kde4/services/krita_lutdocker.desktop
> -share/kde4/services/krita_odg_import.desktop
> -share/kde4/services/krita_ora_export.desktop
> -share/kde4/services/krita_ora_import.desktop
> -share/kde4/services/krita_ora_thumbnail.desktop
> -share/kde4/services/krita_overviewdocker.desktop
> -share/kde4/services/krita_palettedocker.desktop
> -share/kde4/services/krita_patterndocker.desktop
> -share/kde4/services/krita_pdf_import.desktop
> -share/kde4/services/krita_png_export.desktop
> -share/kde4/services/krita_png_import.desktop
> -share/kde4/services/krita_ppm_export.desktop
> -share/kde4/services/krita_ppm_import.desktop
> -share/kde4/services/krita_presetdocker.desktop
> -share/kde4/services/krita_psd_export.desktop
> -share/kde4/services/krita_psd_import.desktop
> -share/kde4/services/krita_qml_export.desktop
> -share/kde4/services/krita_raw_import.desktop
> -share/kde4/services/krita_smallcolorselector.desktop
> -share/kde4/services/krita_specificcolorselector.desktop
> -share/kde4/services/krita_tasksetdocker.desktop
> -share/kde4/services/krita_tiff_export.desktop
> -share/kde4/services/krita_tiff_import.desktop
> -share/kde4/services/krita_xcf_import.desktop
> -share/kde4/services/kritabigbrother.desktop
> -share/kde4/services/kritablurfilter.desktop
> -share/kde4/services/kritachalkpaintop.desktop
> -share/kde4/services/kritaclonesarray.desktop
> -share/kde4/services/kritacolorgenerator.desktop
> -share/kde4/services/kritacolorrange.desktop
> -share/kde4/services/kritacolorsfilter.desktop
> -share/kde4/services/kritacolorsmudgepaintop.desktop
> -share/kde4/services/kritacolorspaceconversion.desktop
> -share/kde4/services/kritaconvolutionfilters.desktop
> -share/kde4/services/kritacurvepaintop.desktop
> -share/kde4/services/kritadefaultdockers.desktop
> -share/kde4/services/kritadefaultpaintops.desktop
> -share/kde4/services/kritadefaulttools.desktop
> -share/kde4/services/kritadeformpaintop.desktop
> -share/kde4/services/kritadodgeburn.desktop
> -share/kde4/services/kritadropshadow.desktop
> -share/kde4/services/kritadynapaintop.desktop
> -share/kde4/services/kritaembossfilter.desktop
> -share/kde4/services/kritaexample.desktop
> -share/kde4/services/kritaexperimentpaintop.desktop
> -share/kde4/services/kritaextensioncolorsfilters.desktop
> -share/kde4/services/kritafastcolortransfer.desktop
> -share/kde4/services/kritafilterop.desktop
> -share/kde4/services/kritagmic.desktop
> -share/kde4/services/kritagridpaintop.desktop
> -share/kde4/services/kritahairypaintop.desktop
> -share/kde4/services/kritahatchingpaintop.desktop
> -share/kde4/services/kritahistogram.desktop
> -share/kde4/services/kritahistorydocker.desktop
> -share/kde4/services/kritaimagedocker.desktop
> -share/kde4/services/kritaimageenhancement.desktop
> -share/kde4/services/kritaimagesize.desktop
> -share/kde4/services/kritaimagesplit.desktop
> -share/kde4/services/kritalayergroupswitcher.desktop
> -share/kde4/services/kritalevelfilter.desktop
> -share/kde4/services/kritametadataeditor.desktop
> -share/kde4/services/kritamodifyselection.desktop
> -share/kde4/services/kritanoisefilter.desktop
> -share/kde4/services/kritaoffsetimage.desktop
> -share/kde4/services/kritaoilpaintfilter.desktop
> -share/kde4/services/kritapart.desktop
> -share/kde4/services/kritaparticlepaintop.desktop
> -share/kde4/services/kritapatterngenerator.desktop
> -share/kde4/services/kritaphongbumpmapfilter.desktop
> -share/kde4/services/kritapixelizefilter.desktop
> -share/kde4/services/kritaraindropsfilter.desktop
> -share/kde4/services/kritarandompickfilter.desktop
> -share/kde4/services/kritarotateimage.desktop
> -share/kde4/services/kritaroundcornersfilter.desktop
> -share/kde4/services/kritarulerassistanttool.desktop
> -share/kde4/services/kritaselectiontools.desktop
> -share/kde4/services/kritaseparatechannels.desktop
> -share/kde4/services/kritashearimage.desktop
> -share/kde4/services/kritasketchpaintop.desktop
> -share/kde4/services/kritasmalltilesfilter.desktop
> -share/kde4/services/kritasobelfilter.desktop
> -share/kde4/services/kritaspraypaintop.desktop
> -share/kde4/services/kritatoolcrop.desktop
> -share/kde4/services/kritatooldyna.desktop
> -share/kde4/services/kritatoolgrid.desktop
> -share/kde4/services/kritatoolperspectivegrid.desktop
> -share/kde4/services/kritatoolpolygon.desktop
> -share/kde4/services/kritatoolpolyline.desktop
> -share/kde4/services/kritatooltext.desktop
> -share/kde4/services/kritatooltransform.desktop
> -share/kde4/services/kritaunsharpfilter.desktop
> -share/kde4/services/kritawavefilter.desktop
> -share/kde4/services/krossmoduleplan.desktop
> -share/kde4/services/krossmodulesheets.desktop
> -share/kde4/services/kspread_plugin_tool_calendar.desktop
> -share/kde4/services/kspreadbitopsmodule.desktop
> -share/kde4/services/kspreadconversionmodule.desktop
> -share/kde4/services/kspreaddatabasemodule.desktop
> -share/kde4/services/kspreaddatetimemodule.desktop
> -share/kde4/services/kspreadengineeringmodule.desktop
> -share/kde4/services/kspreadfinancialmodule.desktop
> -share/kde4/services/kspreadinformationmodule.desktop
> -share/kde4/services/kspreadlogicmodule.desktop
> -share/kde4/services/kspreadmathmodule.desktop
> -share/kde4/services/kspreadreferencemodule.desktop
> -share/kde4/services/kspreadstatisticalmodule.desktop
> -share/kde4/services/kspreadtextmodule.desktop
> -share/kde4/services/kspreadtrigonometrymodule.desktop
>  share/kde4/services/libokularGenerator_odp.desktop
> +share/kde4/services/libokularGenerator_odt.desktop
>  share/kde4/services/okularOdp.desktop
> -share/kde4/services/plan_icalendar_export.desktop
> -share/kde4/services/plan_kplato_import.desktop
> -share/kde4/services/planpart.desktop
> -share/kde4/services/planrcpsscheduler.desktop
> -share/kde4/services/planscripting.desktop
> -share/kde4/services/plantjscheduler.desktop
> -share/kde4/services/planworkpart.desktop
> +share/kde4/services/okularOdt.desktop
> +share/kde4/services/qimageioplugins/kra.desktop
> +share/kde4/services/qimageioplugins/ora.desktop
>  share/kde4/services/sheets_excel_thumbnail.desktop
>  share/kde4/services/sheets_ods_thumbnail.desktop
>  share/kde4/services/sheets_xlsx_thumbnail.desktop
> -share/kde4/services/sheetspart.desktop
> -share/kde4/services/sheetsscripting.desktop
> -share/kde4/services/sheetssolver.desktop
>  share/kde4/services/stage_kpr_thumbnail.desktop
>  share/kde4/services/stage_odp_thumbnail.desktop
>  share/kde4/services/stage_powerpoint_thumbnail.desktop
>  share/kde4/services/stage_pptx_thumbnail.desktop
> -share/kde4/services/stagepart.desktop
>  share/kde4/services/words_docx_thumbnail.desktop
>  share/kde4/services/words_msword_thumbnail.desktop
>  share/kde4/services/words_odt_thumbnail.desktop
>  share/kde4/services/words_rtf_thumbnail.desktop
> -share/kde4/services/wordspart.desktop
>  share/kde4/servicetypes/braindump_extensions.desktop
>  share/kde4/servicetypes/calligra_application.desktop
>  share/kde4/servicetypes/calligra_deferred_plugin.desktop
> @@ -7529,11 +7879,14 @@ share/kde4/servicetypes/karbon_dock.desk
>  share/kde4/servicetypes/karbon_viewplugin.desktop
>  share/kde4/servicetypes/kexihandler.desktop
>  share/kde4/servicetypes/keximigration_driver.desktop
> +share/kde4/servicetypes/kopa_tool.desktop
>  share/kde4/servicetypes/koreport_itemplugin.desktop
>  share/kde4/servicetypes/kpr_pageeffect.desktop
>  share/kde4/servicetypes/kpr_shapeanimation.desktop
> +share/kde4/servicetypes/kpr_tool.desktop
>  share/kde4/servicetypes/krita_brush.desktop
>  share/kde4/servicetypes/krita_dock.desktop
> +share/kde4/servicetypes/krita_filefilter.desktop
>  share/kde4/servicetypes/krita_filter.desktop
>  share/kde4/servicetypes/krita_generator.desktop
>  share/kde4/servicetypes/krita_paintop.desktop
> @@ -7554,6 +7907,7 @@ share/mime/packages/calligra_svm.xml
>  share/mime/packages/krita.xml
>  share/mime/packages/krita_ora.xml
>  share/mime/packages/msooxml-all.xml
> +share/mime/packages/wiki-format.xml
>  share/templates/
>  share/templates/.source/
>  share/templates/.source/Illustration.odg

Reply | Threaded
Open this post in threaded view
|

Fwd: Re: Update editors/calligra 2.9.4

Vadim Zhukov
Unfortunately I won't be able to look in until the beginning of June due to
a couple of real life reasons. :( If someone else among devs uses Calligra,
feel free to review and commit this update.

--
Vadim Zhukov
---------- Переадресованное сообщение ----------
От: "Rafael Sadowski" <[hidden email]>
Дата: 19 мая 2015 г. 1:20
Тема: Re: Update editors/calligra 2.9.4
Кому: <[hidden email]>
Копия:


Always the same game ... ping ;-)

On Thu May 07, 2015 at 08:56:00PM +0200, Rafael Sadowski wrote:

> Hi ports@
>
> blow is an maintainer update to Calligra 2.9.4. Tested @amd64
>
> Infos: https://www.calligra.org/news/calligra-2-9-4-released/
>
> Cheers,
>
> Rafael
>
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/editors/calligra/Makefile,v
> retrieving revision 1.7
> diff -u -p -u -p -r1.7 Makefile
> --- Makefile  27 Mar 2015 08:11:26 -0000      1.7
> +++ Makefile  7 May 2015 18:52:54 -0000
> @@ -1,10 +1,9 @@
>  # $OpenBSD: Makefile,v 1.7 2015/03/27 08:11:26 ajacoutot Exp $
>
>  COMMENT =    K Desktop Environment, office suite
> -HOMEPAGE =   http://www.calligra-suite.org/
> -DISTNAME =   calligra-2.8.7
> +HOMEPAGE =   https://www.calligra-suite.org/
> +DISTNAME =   calligra-2.9.4
>  CATEGORIES = editors
> -REVISION =   0
>
>  DIST_SUBDIR =        kde
>  MASTER_SITES =       ${MASTER_SITE_KDE:=stable/${DISTNAME}/}
> @@ -71,13 +70,17 @@ SHARED_LIBS +=  planprivate
>  SHARED_LIBS +=  planworkapp               50.0 # 0.0
>  SHARED_LIBS +=  planworkfactory           50.0 # 0.0
>  SHARED_LIBS +=  rcps_plan                 50.0 # 0.0
> -SHARED_LIBS +=  wordsprivate              50.0 # 0.0
>  SHARED_LIBS +=  kformula                  50.0 # 13.0
>  SHARED_LIBS +=  komsooxml                 50.0 # 13.0
>  SHARED_LIBS +=  koodf2                    50.0 # 13.0
>  SHARED_LIBS +=  koodfreader               50.0 # 13.0
>  SHARED_LIBS +=  kotextlayout              50.0 # 13.0
>  SHARED_LIBS +=  kovectorimage             50.0 # 13.0
> +SHARED_LIBS +=  koversion                 0.0 # 14.0
> +SHARED_LIBS +=  kritacolor                0.0 # 14.0
> +SHARED_LIBS +=  wordsprivate              14.0 # 1.0
> +SHARED_LIBS +=  libglobal                 0.0 # 14.0
> +SHARED_LIBS +=  libkispsd                 0.0 # 14.0
>
>  WANTLIB =  c m pthread z
>  WANTLIB += GL GLEW GLU Half ICE Iex IlmImf IlmThread Imath SM X11 Xext Xi
> @@ -85,23 +88,25 @@ WANTLIB += fontconfig
>  WANTLIB += lib/qt4/QtDeclarative lib/qt4/QtWebKit lib/qt4/QtDBus
>  WANTLIB += lib/qt4/QtGui lib/qt4/QtNetwork lib/qt4/QtSvg lib/qt4/QtOpenGL
>  WANTLIB += lib/qt4/QtScript lib/qt4/QtXml
> -WANTLIB += lib/qt4/Qt3Support lib/qt4/QtSql
> +WANTLIB +=  lib/qt4/QtSql
>  WANTLIB += ${KDE4LIB}/akonadi-contact ${KDE4LIB}/akonadi-kde
>  WANTLIB += ${KDE4LIB}/kabc ${KDE4LIB}/kactivities
>  WANTLIB += ${KDE4LIB}/kcalcore ${KDE4LIB}/kcmutils ${KDE4LIB}/kdcraw
> -WANTLIB += ${KDE4LIB}/kde3support ${KDE4LIB}/kdeclarative
> +WANTLIB += ${KDE4LIB}/kdeclarative
>  WANTLIB += ${KDE4LIB}/kdeui ${KDE4LIB}/kfile ${KDE4LIB}/khtml
>  WANTLIB += ${KDE4LIB}/kio ${KDE4LIB}/kjs ${KDE4LIB}/kmime
> -WANTLIB += ${KDE4LIB}/knewstuff3 ${KDE4LIB}/knotifyconfig
> +WANTLIB += ${KDE4LIB}/knotifyconfig
>  WANTLIB += ${KDE4LIB}/kparts ${KDE4LIB}/kpimutils ${KDE4LIB}/kresources
>  WANTLIB += ${KDE4LIB}/krosscore ${KDE4LIB}/krossui
> -WANTLIB += ${KDE4LIB}/ktexteditor ${KDE4LIB}/marblewidget
> +WANTLIB += ${KDE4LIB}/marblewidget
>  WANTLIB += ${KDE4LIB}/nepomuk ${KDE4LIB}/nepomukutils
>  WANTLIB += ${KDE4LIB}/okularcore
>  WANTLIB += ${KDE4LIB}/phonon_sexperimental ${KDE4LIB}/threadweaver
>  WANTLIB += OpenColorIO exiv2 fftw3 freetype glib-2.0 gsl icui18n icuuc
>  WANTLIB += jpeg lcms2 mysqlclient openjpeg png poppler poppler-qt4 pqxx
>  WANTLIB += qca2 soprano sqlite3 sybdb tiff
> +WANTLIB += boost_system-mt curl ktexteditor gslcblas
> +
>
>  # kexi needs headers in postgresql,{-main,-server}
>  # kexi needs all db drivers to be present while building
> @@ -109,7 +114,7 @@ BUILD_DEPENDS =   devel/boost \
>               databases/mariadb \
>               databases/postgresql,-main \
>               databases/postgresql,-server \
> -             math/eigen2 \
> +             math/eigen3 \
>               productivity/librcps
>
>  # kexi needs all db driver installed to run,
> @@ -136,6 +141,7 @@ LIB_DEPENDS =     databases/freetds \
>               graphics/png \
>               graphics/tiff \
>               math/fftw3,double \
> +             net/curl \
>               print/poppler,,-qt4 \
>               security/qca2 \
>               textproc/icu4c \
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/editors/calligra/distinfo,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 distinfo
> --- distinfo  23 Dec 2014 13:45:17 -0000      1.3
> +++ distinfo  7 May 2015 18:52:54 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (kde/calligra-2.8.7.tar.xz) =
r2uLdOoHflu/o5jjrpaGa5o8z7wQIk6fNB5ZZDvoDrU=
> -SIZE (kde/calligra-2.8.7.tar.xz) = 138966248
> +SHA256 (kde/calligra-2.9.4.tar.xz) =
qd023HK58kj4HsI5vmWOPn9WfkQYMnbz9AgyLrns9Ng=
> +SIZE (kde/calligra-2.9.4.tar.xz) = 193721936
> Index: patches/patch-cmake_modules_FindPoppler_cmake
> ===================================================================
> RCS file:
/cvs/ports/editors/calligra/patches/patch-cmake_modules_FindPoppler_cmake,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 patch-cmake_modules_FindPoppler_cmake
> --- patches/patch-cmake_modules_FindPoppler_cmake     12 Jul 2014
10:44:18 -0000      1.1.1.1
> +++ patches/patch-cmake_modules_FindPoppler_cmake     7 May 2015 18:52:54
-0000
> @@ -1,9 +1,9 @@
>  $OpenBSD: patch-cmake_modules_FindPoppler_cmake,v 1.1.1.1 2014/07/12
10:44:18 zhuk Exp $

> ---- cmake/modules/FindPoppler.cmake.orig     Sat Oct 12 10:17:41 2013
> -+++ cmake/modules/FindPoppler.cmake  Sun Oct 20 15:12:39 2013
> -@@ -60,6 +60,10 @@ endif(POPPLER_FOUND)
> +--- cmake/modules/FindPoppler.cmake.orig     Wed Apr  1 15:27:00 2015
> ++++ cmake/modules/FindPoppler.cmake  Mon Apr 27 00:31:55 2015
> +@@ -60,6 +60,10 @@ endif()
>   if (POPPLER_FOUND)
> -   INCLUDE(CheckCXXSourceCompiles)
> +   include(CheckCXXSourceCompiles)
>
>  +  # Unbreak Qt4 linking after QT_USE_IMPORTED_TARGETS set in KDE config
>  +  set(QT_USE_IMPORTED_TARGETS FALSE)
> Index: patches/patch-kexi_CMakeLists_txt
> ===================================================================
> RCS file: /cvs/ports/editors/calligra/patches/patch-kexi_CMakeLists_txt,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 patch-kexi_CMakeLists_txt
> --- patches/patch-kexi_CMakeLists_txt 12 Jul 2014 10:44:18 -0000
1.1.1.1
> +++ patches/patch-kexi_CMakeLists_txt 7 May 2015 18:52:54 -0000
> @@ -1,13 +1,13 @@
>  $OpenBSD: patch-kexi_CMakeLists_txt,v 1.1.1.1 2014/07/12 10:44:18 zhuk
Exp $

>  Upstream bug?
> ---- kexi/CMakeLists.txt.orig Mon Mar 24 15:38:42 2014
> -+++ kexi/CMakeLists.txt      Sun May  4 13:19:27 2014
> -@@ -88,7 +88,7 @@ set (PQXX_MAX_VERSION "5.0.0")
> - macro_optional_find_package(PostgreSQL)
> +--- kexi/CMakeLists.txt.orig Wed Apr  1 15:27:01 2015
> ++++ kexi/CMakeLists.txt      Mon Apr 27 00:31:55 2015
> +@@ -49,7 +49,7 @@ set (PQXX_MAX_VERSION "5.0.0")
> + macro_optional_find_package(CalligraPostgreSQL)
>   macro_log_feature(POSTGRESQL_FOUND "libpq" "C application programmer's
interface to PostgreSQL" "http://www.postgresql.org" FALSE "" "Required by
Kexi PostgreSQL driver")
>
>  -pkg_check_modules (PQXX libpqxx)
>  +macro_optional_find_package (Pqxx)
>
> - IF (POSTGRESQL_FOUND AND PQXX_FOUND)
> -    IF (PQXX_VERSION VERSION_GREATER PQXX_MIN_VERSION AND PQXX_VERSION
VERSION_LESS PQXX_MAX_VERSION)
> + if (POSTGRESQL_FOUND AND PQXX_FOUND)
> +    if (PQXX_VERSION VERSION_GREATER PQXX_MIN_VERSION AND PQXX_VERSION
VERSION_LESS PQXX_MAX_VERSION)
> Index: patches/patch-kexi_widget_CMakeLists_txt
> ===================================================================
> RCS file:
/cvs/ports/editors/calligra/patches/patch-kexi_widget_CMakeLists_txt,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 patch-kexi_widget_CMakeLists_txt
> --- patches/patch-kexi_widget_CMakeLists_txt  12 Jul 2014 10:44:18 -0000
    1.1.1.1
> +++ patches/patch-kexi_widget_CMakeLists_txt  7 May 2015 18:52:54 -0000
> @@ -1,8 +1,8 @@
>  $OpenBSD: patch-kexi_widget_CMakeLists_txt,v 1.1.1.1 2014/07/12 10:44:18
zhuk Exp $

>  Unbreak build.
> ---- kexi/widget/CMakeLists.txt.orig  Sun Oct 20 21:40:21 2013
> -+++ kexi/widget/CMakeLists.txt       Sun Oct 20 21:54:12 2013
> -@@ -10,7 +10,7 @@ ENDIF(KEXI_MOBILE)
> +--- kexi/widget/CMakeLists.txt.orig  Wed Apr  1 15:27:01 2015
> ++++ kexi/widget/CMakeLists.txt       Mon Apr 27 00:31:55 2015
> +@@ -10,7 +10,7 @@ endif()
>
>   add_definitions(-DKDE_DEFAULT_DEBUG_AREA=44023)
>
> Index: patches/patch-krita_image_kis_painter_cc
> ===================================================================
> RCS file: patches/patch-krita_image_kis_painter_cc
> diff -N patches/patch-krita_image_kis_painter_cc
> --- patches/patch-krita_image_kis_painter_cc  12 Jul 2014 13:06:22 -0000
    1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,22 +0,0 @@
> -$OpenBSD: patch-krita_image_kis_painter_cc,v 1.2 2014/07/12 13:06:22
zhuk Exp $
> -REVIEW: https://git.reviewboard.kde.org/r/119244/
> ---- krita/image/kis_painter.cc.orig  Sun Mar  2 15:46:08 2014
> -+++ krita/image/kis_painter.cc       Wed Mar  5 21:20:39 2014
> -@@ -1393,7 +1393,7 @@ void KisPainter::drawLine(const QPointF& start,
const
> -     int dstX = x2-x1;
> -     int dstY = y2-y1;
> -
> --    qreal _C = dstX*y1 - dstY*x1;
> -+    qreal uniC = dstX*y1 - dstY*x1;
> -     qreal projectionDenominator = 1.0 / (pow((double)dstX, 2) +
pow((double)dstY, 2));
> -
> -     qreal subPixel;
> -@@ -1439,7 +1439,7 @@ void KisPainter::drawLine(const QPointF& start,
const
> -                 AA_ = qMin( sqrt( pow((double)x - X1_, 2) +
pow((double)y - Y1_, 2) ),
> -                             sqrt( pow((double)x - X2_, 2) +
pow((double)y - Y2_, 2) ));

> -             }else{
> --                AA_ = qAbs(dstY*x - dstX*y + _C) * denominator;
> -+                AA_ = qAbs(dstY*x - dstX*y + uniC) * denominator;
> -             }
> -
> -             if (AA_>halfWidth) {
> Index: patches/patch-krita_plugins_extensions_gmic_3rdparty_gmic_CImg_h
> ===================================================================
> RCS file: patches/patch-krita_plugins_extensions_gmic_3rdparty_gmic_CImg_h
> diff -N patches/patch-krita_plugins_extensions_gmic_3rdparty_gmic_CImg_h
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-krita_plugins_extensions_gmic_3rdparty_gmic_CImg_h  7
May 2015 18:52:54 -0000
> @@ -0,0 +1,61 @@
> +$OpenBSD$
> +
> +Variables starting by underscore ("_") sign are reserved and should not
be used
> +in applications.
> +
> +--- krita/plugins/extensions/gmic/3rdparty/gmic/CImg.h.orig  Mon May  4
21:17:23 2015
> ++++ krita/plugins/extensions/gmic/3rdparty/gmic/CImg.h       Mon May  4
21:22:58 2015
> +@@ -37389,19 +37389,19 @@ namespace cimg_library_suffixed {
> +             else { if (!visible_cursor) { disp.show_mouse();
visible_cursor = true; }}
> +             const int d = (depth()>1)?depth():0;
> +             int
> +-              _X = (int)X, _Y = (int)Y, _Z = (int)Z,
> ++              uniX = (int)X, uniY = (int)Y, uniZ = (int)Z,
> +               w = disp.width(), W = width() + d,
> +               h = disp.height(), H = height() + d,
> +-              _xp = (int)(_X*(float)w/W), xp = _xp +
((int)(_xp*(float)W/w)!=_X?1:0),
> +-              _yp = (int)(_Y*(float)h/H), yp = _yp +
((int)(_yp*(float)H/h)!=_Y?1:0),
> +-              _xn = (int)((_X+1.0f)*w/W-1), xn = _xn +
((int)((_xn+1.0f)*W/w)!=_X+1?1:0),
> +-              _yn = (int)((_Y+1.0f)*h/H-1), yn = _yn +
((int)((_yn+1.0f)*H/h)!=_Y+1?1:0),
> +-              _zxp = (int)((_Z+width())*(float)w/W), zxp = _zxp +
((int)(_zxp*(float)W/w)!=_Z+width()?1:0),
> +-              _zyp = (int)((_Z+height())*(float)h/H), zyp = _zyp +
((int)(_zyp*(float)H/h)!=_Z+height()?1:0),
> +-              _zxn = (int)((_Z+width()+1.0f)*w/W-1), zxn = _zxn +
((int)((_zxn+1.0f)*W/w)!=_Z+width()+1?1:0),
> +-              _zyn = (int)((_Z+height()+1.0f)*h/H-1), zyn = _zyn +
((int)((_zyn+1.0f)*H/h)!=_Z+height()+1?1:0),
> +-              _xM = (int)(width()*(float)w/W-1), xM = _xM +
((int)((_xM+1.0f)*W/w)!=width()?1:0),
> +-              _yM = (int)(height()*(float)h/H-1), yM = _yM +
((int)((_yM+1.0f)*H/h)!=height()?1:0),
> ++              unixp = (int)(uniX*(float)w/W), xp = unixp +
((int)(unixp*(float)W/w)!=uniX?1:0),
> ++              uniyp = (int)(uniY*(float)h/H), yp = uniyp +
((int)(uniyp*(float)H/h)!=uniY?1:0),
> ++              unixn = (int)((uniX+1.0f)*w/W-1), xn = unixn +
((int)((unixn+1.0f)*W/w)!=uniX+1?1:0),
> ++              uniyn = (int)((uniY+1.0f)*h/H-1), yn = uniyn +
((int)((uniyn+1.0f)*H/h)!=uniY+1?1:0),
> ++              unizxp = (int)((uniZ+width())*(float)w/W), zxp = unizxp +
((int)(unizxp*(float)W/w)!=uniZ+width()?1:0),
> ++              unizyp = (int)((uniZ+height())*(float)h/H), zyp = unizyp
+ ((int)(unizyp*(float)H/h)!=uniZ+height()?1:0),
> ++              unizxn = (int)((uniZ+width()+1.0f)*w/W-1), zxn = unizxn +
((int)((unizxn+1.0f)*W/w)!=uniZ+width()+1?1:0),
> ++              unizyn = (int)((uniZ+height()+1.0f)*h/H-1), zyn = unizyn
+ ((int)((unizyn+1.0f)*H/h)!=uniZ+height()+1?1:0),
> ++              unixM = (int)(width()*(float)w/W-1), xM = unixM +
((int)((unixM+1.0f)*W/w)!=width()?1:0),
> ++              uniyM = (int)(height()*(float)h/H-1), yM = uniyM +
((int)((uniyM+1.0f)*H/h)!=height()?1:0),
> +               xc = (xp + xn)/2,
> +               yc = (yp + yn)/2,
> +               zxc = (zxp + zxn)/2,
> +@@ -37439,14 +37439,14 @@ namespace cimg_library_suffixed {
> +             // Draw selection.
> +             if (phase) {
> +               const int
> +-                _xp0 = (int)(X0*(float)w/W), xp0 = _xp0 +
((int)(_xp0*(float)W/w)!=X0?1:0),
> +-                _yp0 = (int)(Y0*(float)h/H), yp0 = _yp0 +
((int)(_yp0*(float)H/h)!=Y0?1:0),
> +-                _xn0 = (int)((X0+1.0f)*w/W-1), xn0 = _xn0 +
((int)((_xn0+1.0f)*W/w)!=X0+1?1:0),
> +-                _yn0 = (int)((Y0+1.0f)*h/H-1), yn0 = _yn0 +
((int)((_yn0+1.0f)*H/h)!=Y0+1?1:0),
> +-                _zxp0 = (int)((Z0+width())*(float)w/W), zxp0 = _zxp0 +
((int)(_zxp0*(float)W/w)!=Z0+width()?1:0),
> +-                _zyp0 = (int)((Z0+height())*(float)h/H), zyp0 = _zyp0 +
((int)(_zyp0*(float)H/h)!=Z0+height()?1:0),
> +-                _zxn0 = (int)((Z0+width()+1.0f)*w/W-1), zxn0 = _zxn0 +
((int)((_zxn0+1.0f)*W/w)!=Z0+width()+1?1:0),
> +-                _zyn0 = (int)((Z0+height()+1.0f)*h/H-1), zyn0 = _zyn0 +
((int)((_zyn0+1.0f)*H/h)!=Z0+height()+1?1:0),
> ++                unixp0 = (int)(X0*(float)w/W), xp0 = unixp0 +
((int)(unixp0*(float)W/w)!=X0?1:0),
> ++                uniyp0 = (int)(Y0*(float)h/H), yp0 = uniyp0 +
((int)(uniyp0*(float)H/h)!=Y0?1:0),
> ++                unixn0 = (int)((X0+1.0f)*w/W-1), xn0 = unixn0 +
((int)((unixn0+1.0f)*W/w)!=X0+1?1:0),
> ++                uniyn0 = (int)((Y0+1.0f)*h/H-1), yn0 = uniyn0 +
((int)((uniyn0+1.0f)*H/h)!=Y0+1?1:0),
> ++                unizxp0 = (int)((Z0+width())*(float)w/W), zxp0 =
unizxp0 + ((int)(unizxp0*(float)W/w)!=Z0+width()?1:0),
> ++                unizyp0 = (int)((Z0+height())*(float)h/H), zyp0 =
unizyp0 + ((int)(unizyp0*(float)H/h)!=Z0+height()?1:0),
> ++                unizxn0 = (int)((Z0+width()+1.0f)*w/W-1), zxn0 =
unizxn0 + ((int)((unizxn0+1.0f)*W/w)!=Z0+width()+1?1:0),
> ++                unizyn0 = (int)((Z0+height()+1.0f)*h/H-1), zyn0 =
unizyn0 + ((int)((unizyn0+1.0f)*H/h)!=Z0+height()+1?1:0),
> +                 xc0 = (xp0 + xn0)/2,
> +                 yc0 = (yp0 + yn0)/2,
> +                 zxc0 = (zxp0 + zxn0)/2,
> Index: patches/patch-plan_libs_kernel_tests_CMakeLists_txt
> ===================================================================
> RCS file:
/cvs/ports/editors/calligra/patches/patch-plan_libs_kernel_tests_CMakeLists_txt,v
> retrieving revision 1.1
> diff -u -p -u -p -r1.1 patch-plan_libs_kernel_tests_CMakeLists_txt
> --- patches/patch-plan_libs_kernel_tests_CMakeLists_txt       15 Jan 2015
18:13:52 -0000      1.1
> +++ patches/patch-plan_libs_kernel_tests_CMakeLists_txt       7 May 2015
18:52:54 -0000
> @@ -3,9 +3,9 @@ $OpenBSD: patch-plan_libs_kernel_tests_C
>  Rename some targets to avoid generating multiple ninja rules with
>  the same name
>
> ---- plan/libs/kernel/tests/CMakeLists.txt.orig       Sun Nov 30 08:02:20
2014
> -+++ plan/libs/kernel/tests/CMakeLists.txt    Thu Jan 15 09:35:44 2015
> -@@ -73,9 +73,9 @@ target_link_libraries(ScheduleTester  ${KDE4_KDECORE_L
> +--- plan/libs/kernel/tests/CMakeLists.txt.orig       Wed Apr  1 15:27:05
2015
> ++++ plan/libs/kernel/tests/CMakeLists.txt    Mon Apr 27 00:31:55 2015
> +@@ -78,9 +78,9 @@ target_link_libraries(ScheduleTester  ${KDE4_KDECORE_L
>   set(ProjectTester_SRCS ProjectTester.cpp )
>
>
> Index: patches/patch-plan_plugins_schedulers_tj_CMakeLists_txt
> ===================================================================
> RCS file:
/cvs/ports/editors/calligra/patches/patch-plan_plugins_schedulers_tj_CMakeLists_txt,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 patch-plan_plugins_schedulers_tj_CMakeLists_txt
> --- patches/patch-plan_plugins_schedulers_tj_CMakeLists_txt   12 Jul 2014
10:44:18 -0000      1.1.1.1
> +++ patches/patch-plan_plugins_schedulers_tj_CMakeLists_txt   7 May 2015
18:52:54 -0000
> @@ -1,7 +1,7 @@
>  $OpenBSD: patch-plan_plugins_schedulers_tj_CMakeLists_txt,v 1.1.1.1
2014/07/12 10:44:18 zhuk Exp $
>  XXX allow to build
> ---- plan/plugins/schedulers/tj/CMakeLists.txt.orig   Thu Dec 26 13:04:14
2013
> -+++ plan/plugins/schedulers/tj/CMakeLists.txt        Thu Dec 26 13:04:40
2013
> +--- plan/plugins/schedulers/tj/CMakeLists.txt.orig   Wed Apr  1 15:27:05
2015
> ++++ plan/plugins/schedulers/tj/CMakeLists.txt        Mon Apr 27 00:31:55
2015
>  @@ -3,7 +3,7 @@ set(LIBTJ_INCLUDE_DIR taskjuggler)
>   include_directories( ${LIBTJ_INCLUDE_DIR} ${KOODF_INCLUDES}
${CMAKE_SOURCE_DIR}/plan/libs/kernel ${KDE4_INCLUDES} )

>
> @@ -9,5 +9,5 @@ XXX allow to build
>  -add_subdirectory( tests )
>  +#add_subdirectory( tests )
>
> - SET ( TJScheduler_SRCS
> + set ( TJScheduler_SRCS
>       PlanTJPlugin.cpp
> Index: patches/patch-plugins_semanticitems_contact_CMakeLists_txt
> ===================================================================
> RCS file:
/cvs/ports/editors/calligra/patches/patch-plugins_semanticitems_contact_CMakeLists_txt,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1
patch-plugins_semanticitems_contact_CMakeLists_txt
> --- patches/patch-plugins_semanticitems_contact_CMakeLists_txt        12
Jul 2014 10:44:18 -0000      1.1.1.1
> +++ patches/patch-plugins_semanticitems_contact_CMakeLists_txt        7
May 2015 18:52:54 -0000
> @@ -1,12 +1,12 @@
>  $OpenBSD: patch-plugins_semanticitems_contact_CMakeLists_txt,v 1.1.1.1
2014/07/12 10:44:18 zhuk Exp $
>  Unbreak build.
> ---- plugins/semanticitems/contact/CMakeLists.txt.orig        Fri Jul 11
19:04:57 2014
> -+++ plugins/semanticitems/contact/CMakeLists.txt     Fri Jul 11 19:05:22
2014
> -@@ -25,6 +25,7 @@ endif (KdepimLibs_FOUND)
> +--- plugins/semanticitems/contact/CMakeLists.txt.orig        Wed Apr  1
15:28:07 2015
> ++++ plugins/semanticitems/contact/CMakeLists.txt     Mon Apr 27 00:31:56
2015
> +@@ -25,6 +25,7 @@ endif ()
>
>   target_link_libraries(calligra_semanticitem_contact
${KDE4_KDECORE_LIBS}  ${KORDF_LIBS})
>
>  +add_definitions(-DBOOST_NO_EXCEPTIONS)
>
>   install(TARGETS calligra_semanticitem_contact  DESTINATION
${PLUGIN_INSTALL_DIR})
> - install(FILES   calligra_semanticitem_contact.desktop  DESTINATION
${SERVICES_INSTALL_DIR})
> + install(FILES   calligra_semanticitem_contact.desktop  DESTINATION
${SERVICES_INSTALL_DIR}/calligra)
> Index: patches/patch-stage_part_CMakeLists_txt
> ===================================================================
> RCS file:
/cvs/ports/editors/calligra/patches/patch-stage_part_CMakeLists_txt,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 patch-stage_part_CMakeLists_txt
> --- patches/patch-stage_part_CMakeLists_txt   12 Jul 2014 10:44:18 -0000
    1.1.1.1
> +++ patches/patch-stage_part_CMakeLists_txt   7 May 2015 18:52:54 -0000
> @@ -1,9 +1,9 @@
>  $OpenBSD: patch-stage_part_CMakeLists_txt,v 1.1.1.1 2014/07/12 10:44:18
zhuk Exp $

>  Unbreak build.
> ---- stage/part/CMakeLists.txt.orig   Fri Jul 11 18:09:42 2014
> -+++ stage/part/CMakeLists.txt        Fri Jul 11 18:10:18 2014
> +--- stage/part/CMakeLists.txt.orig   Wed Apr  1 15:28:07 2015
> ++++ stage/part/CMakeLists.txt        Mon Apr 27 00:31:56 2015
>  @@ -12,6 +12,8 @@ if (!WIN32) ## Disable tests in Windows whilst they br
> - endif(!WIN32)
> + endif()
>   add_subdirectory(tools)
>
>  +add_definitions(-DBOOST_NO_EXCEPTIONS)
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/editors/calligra/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 PLIST
> --- pkg/PLIST 23 Dec 2014 13:45:17 -0000      1.3
> +++ pkg/PLIST 7 May 2015 18:52:55 -0000
> @@ -1,4 +1,4 @@
> -@comment $OpenBSD: PLIST,v 1.3 2014/12/23 13:45:17 zhuk Exp $
> +@comment $OpenBSD$
>  @conflict koffice-*
>  @bin bin/braindump
>  @bin bin/calligra
> @@ -6,6 +6,8 @@
>  @bin bin/calligraauthor
>  @bin bin/calligraconverter
>  @bin bin/calligraflow
> +@bin bin/calligragemini
> +@bin bin/calligrageminithumbnailhelper
>  @bin bin/calligraplan
>  @bin bin/calligraplanwork
>  @bin bin/calligrasheets
> @@ -18,18 +20,13 @@
>  @bin bin/kexi
>  @bin bin/kexi_sqlite3_dump
>  @bin bin/krita
> -@bin bin/kritagemini
> -@bin bin/kritasketch
>  @bin bin/visualimagecompare
> -include/kde4/KoPABackgroundTool.h
>  include/kde4/calligra/
>  include/kde4/calligra/DebugPigment.h
>  include/kde4/calligra/Ko3dScene.h
>  include/kde4/calligra/KoAnchorInlineObject.h
>  include/kde4/calligra/KoAnchorTextRange.h
>  include/kde4/calligra/KoAnnotationManager.h
> -include/kde4/calligra/KoApplication.h
> -include/kde4/calligra/KoApplicationAdaptor.h
>  include/kde4/calligra/KoBasicHistogramProducers.h
>  include/kde4/calligra/KoBookmark.h
>  include/kde4/calligra/KoBookmarkManager.h
> @@ -83,14 +80,11 @@ include/kde4/calligra/KoDockFactoryBase.
>  include/kde4/calligra/KoDockRegistry.h
>  include/kde4/calligra/KoDockWidgetTitleBar.h
>  include/kde4/calligra/KoDockWidgetTitleBarButton.h
> -include/kde4/calligra/KoDocument.h
> -include/kde4/calligra/KoDocumentEntry.h
> -include/kde4/calligra/KoDocumentInfo.h
> +include/kde4/calligra/KoDocumentBase.h
>  include/kde4/calligra/KoDocumentRdf.h
>  include/kde4/calligra/KoDocumentRdfBase.h
>  include/kde4/calligra/KoDocumentRdfEditWidget.h
>  include/kde4/calligra/KoDocumentResourceManager.h
> -include/kde4/calligra/KoDocumentSectionModel.h
>  include/kde4/calligra/KoDom.h
>  include/kde4/calligra/KoDpi.h
>  include/kde4/calligra/KoDrag.h
> @@ -104,9 +98,6 @@ include/kde4/calligra/KoEventActionRemov
>  include/kde4/calligra/KoFallBackColorTransformation.h
>  include/kde4/calligra/KoFileDialog.h
>  include/kde4/calligra/KoFillConfigWidget.h
> -include/kde4/calligra/KoFilter.h
> -include/kde4/calligra/KoFilterChain.h
> -include/kde4/calligra/KoFilterChainLinkList.h
>  include/kde4/calligra/KoFilterEffect.h
>  include/kde4/calligra/KoFilterEffectConfigWidgetBase.h
>  include/kde4/calligra/KoFilterEffectFactoryBase.h
> @@ -114,16 +105,6 @@ include/kde4/calligra/KoFilterEffectLoad
>  include/kde4/calligra/KoFilterEffectRegistry.h
>  include/kde4/calligra/KoFilterEffectRenderContext.h
>  include/kde4/calligra/KoFilterEffectStack.h
> -include/kde4/calligra/KoFilterEntry.h
> -include/kde4/calligra/KoFilterGraph.h
> -include/kde4/calligra/KoFilterManager.h
> -include/kde4/calligra/KoFilterVertex.h
> -include/kde4/calligra/KoFindBase.h
> -include/kde4/calligra/KoFindMatch.h
> -include/kde4/calligra/KoFindOption.h
> -include/kde4/calligra/KoFindOptionSet.h
> -include/kde4/calligra/KoFindText.h
> -include/kde4/calligra/KoFindToolbar.h
>  include/kde4/calligra/KoFlake.h
>  include/kde4/calligra/KoFontFace.h
>  include/kde4/calligra/KoFrameShape.h
> @@ -155,32 +136,31 @@ include/kde4/calligra/KoLabDarkenColorTr
>  include/kde4/calligra/KoLineStyleSelector.h
>  include/kde4/calligra/KoList.h
>  include/kde4/calligra/KoLoadingShapeUpdater.h
> -include/kde4/calligra/KoMainWindow.h
>  include/kde4/calligra/KoMixColorsOp.h
>  include/kde4/calligra/KoMixColorsOpImpl.h
> -include/kde4/calligra/KoModeBoxFactory.h
>  include/kde4/calligra/KoOasisSettings.h
>  include/kde4/calligra/KoOdf.h
>  include/kde4/calligra/KoOdfBibliographyConfiguration.h
> -include/kde4/calligra/KoOdfDocument.h
>  include/kde4/calligra/KoOdfGraphicProperties.h
>  include/kde4/calligra/KoOdfGraphicStyles.h
> +include/kde4/calligra/KoOdfHeaderFooterProperties.h
>  include/kde4/calligra/KoOdfLineNumberingConfiguration.h
>  include/kde4/calligra/KoOdfLoadingContext.h
>  include/kde4/calligra/KoOdfManifestEntry.h
>  include/kde4/calligra/KoOdfNotesConfiguration.h
>  include/kde4/calligra/KoOdfNumberDefinition.h
>  include/kde4/calligra/KoOdfNumberStyles.h
> +include/kde4/calligra/KoOdfPageLayoutProperties.h
>  include/kde4/calligra/KoOdfParagraphProperties.h
>  include/kde4/calligra/KoOdfPaste.h
>  include/kde4/calligra/KoOdfReadStore.h
>  include/kde4/calligra/KoOdfStyle.h
> +include/kde4/calligra/KoOdfStyleBase.h
>  include/kde4/calligra/KoOdfStyleManager.h
>  include/kde4/calligra/KoOdfStyleProperties.h
>  include/kde4/calligra/KoOdfStylesReader.h
>  include/kde4/calligra/KoOdfTextProperties.h
>  include/kde4/calligra/KoOdfWriteStore.h
> -include/kde4/calligra/KoOpacityConfigWidget.h
>  include/kde4/calligra/KoPABackgroundTool.h
>  include/kde4/calligra/KoPACanvas.h
>  include/kde4/calligra/KoPACanvasBase.h
> @@ -203,10 +183,8 @@ include/kde4/calligra/KoPageLayout.h
>  include/kde4/calligra/KoPageLayoutDialog.h
>  include/kde4/calligra/KoPageLayoutWidget.h
>  include/kde4/calligra/KoPagePreviewWidget.h
> -include/kde4/calligra/KoPageWidgetItem.h
>  include/kde4/calligra/KoPanTool.h
>  include/kde4/calligra/KoParameterToPathCommand.h
> -include/kde4/calligra/KoPart.h
>  include/kde4/calligra/KoPathCombineCommand.h
>  include/kde4/calligra/KoPathControlPointMoveCommand.h
>  include/kde4/calligra/KoPathFillRuleCommand.h
> @@ -223,7 +201,6 @@ include/kde4/calligra/KoPencilTool.h
>  include/kde4/calligra/KoPointedAt.h
>  include/kde4/calligra/KoPointerEvent.h
>  include/kde4/calligra/KoPositionSelector.h
> -include/kde4/calligra/KoPrintJob.h
>  include/kde4/calligra/KoProgressBar.h
>  include/kde4/calligra/KoProgressProxy.h
>  include/kde4/calligra/KoProgressUpdater.h
> @@ -239,6 +216,7 @@ include/kde4/calligra/KoRdfSemanticTree.
>  include/kde4/calligra/KoRdfSemanticTreeWidgetItem.h
>  include/kde4/calligra/KoResourceItemChooser.h
>  include/kde4/calligra/KoResourceItemChooserContextMenu.h
> +include/kde4/calligra/KoResourceModelBase.h
>  include/kde4/calligra/KoResourceSelector.h
>  include/kde4/calligra/KoResourceServer.h
>  include/kde4/calligra/KoResourceServerAdapter.h
> @@ -250,6 +228,9 @@ include/kde4/calligra/KoRgbColorSpaceTra
>  include/kde4/calligra/KoRow.h
>  include/kde4/calligra/KoRowStyle.h
>  include/kde4/calligra/KoSection.h
> +include/kde4/calligra/KoSectionEnd.h
> +include/kde4/calligra/KoSectionManager.h
> +include/kde4/calligra/KoSectionUtils.h
>  include/kde4/calligra/KoSelection.h
>  include/kde4/calligra/KoSemanticStylesheet.h
>  include/kde4/calligra/KoSemanticStylesheetsEditor.h
> @@ -293,7 +274,6 @@ include/kde4/calligra/KoShapeUngroupComm
>  include/kde4/calligra/KoShapeUserData.h
>  include/kde4/calligra/KoSharedSavingData.h
>  include/kde4/calligra/KoSizeGroup.h
> -include/kde4/calligra/KoStandardAction.h
>  include/kde4/calligra/KoStore.h
>  include/kde4/calligra/KoStoreDevice.h
>  include/kde4/calligra/KoStrokeConfigWidget.h
> @@ -335,17 +315,11 @@ include/kde4/calligra/KoToolProxy.h
>  include/kde4/calligra/KoToolRegistry.h
>  include/kde4/calligra/KoToolSelection.h
>  include/kde4/calligra/KoTriangleColorSelector.h
> -include/kde4/calligra/KoUniColorChooser.h
> -include/kde4/calligra/KoUniColorDialog.h
>  include/kde4/calligra/KoUnit.h
>  include/kde4/calligra/KoUpdater.h
>  include/kde4/calligra/KoVariable.h
>  include/kde4/calligra/KoVariableManager.h
> -include/kde4/calligra/KoVersionDialog.h
> -include/kde4/calligra/KoView.h
> -include/kde4/calligra/KoViewAdaptor.h
>  include/kde4/calligra/KoViewConverter.h
> -include/kde4/calligra/KoXYColorSelector.h
>  include/kde4/calligra/KoXmlNS.h
>  include/kde4/calligra/KoXmlReader.h
>  include/kde4/calligra/KoXmlReaderForward.h
> @@ -357,7 +331,6 @@ include/kde4/calligra/KoZoomController.h
>  include/kde4/calligra/KoZoomHandler.h
>  include/kde4/calligra/KoZoomInput.h
>  include/kde4/calligra/KoZoomMode.h
> -include/kde4/calligra/MacSupport.h
>  include/kde4/calligra/RdfForward.h
>  include/kde4/calligra/RdfSemanticTreeWidgetAction.h
>  include/kde4/calligra/RdfSemanticTreeWidgetSelectAction.h
> @@ -372,18 +345,19 @@ include/kde4/calligra/changetracker/KoDe
>  include/kde4/calligra/changetracker/KoDeletedRowColumnDataStore.h
>  include/kde4/calligra/changetracker/KoDeletedRowData.cpp
>  include/kde4/calligra/flake_export.h
> -include/kde4/calligra/komain_export.h
>  include/kde4/calligra/koodf2_export.h
>  include/kde4/calligra/koodf_export.h
>  include/kde4/calligra/kopageapp_export.h
>  include/kde4/calligra/kordf_export.h
>  include/kde4/calligra/kotext_export.h
>  include/kde4/calligra/kotextlayout_export.h
> +include/kde4/calligra/koversion_export.h
>  include/kde4/calligra/kowidgets_export.h
>  include/kde4/calligra/kowidgetutils_export.h
>  include/kde4/calligra/kundo2_export.h
>  include/kde4/calligra/kundo2command.h
>  include/kde4/calligra/kundo2group.h
> +include/kde4/calligra/kundo2magicstring.h
>  include/kde4/calligra/kundo2model.h
>  include/kde4/calligra/kundo2qstack.h
>  include/kde4/calligra/kundo2stack.h
> @@ -400,17 +374,8 @@ include/kde4/calligra/styles/KoTableCell
>  include/kde4/calligra/styles/KoTableColumnStyle.h
>  include/kde4/calligra/styles/KoTableRowStyle.h
>  include/kde4/calligra/styles/KoTableStyle.h
> -include/kde4/kexi/
> -include/kde4/kexi/forms/
> -include/kde4/kexi/forms/FormWidget.h
> -include/kde4/kexi/forms/FormWidgetInterface.h
> -include/kde4/kexi/forms/WidgetInfo.h
> -include/kde4/kexi/forms/WidgetTreeWidget.h
> -include/kde4/kexi/forms/objecttree.h
> -include/kde4/kexi/forms/widgetfactory.h
> -include/kde4/kexi/forms/widgetlibrary.h
> -include/kde4/kexi/forms/widgetwithsubpropertiesinterface.h
>  include/kde4/krita/
> +include/kde4/krita/KisViewManager.h
>  include/kde4/krita/fill_processing_visitor.h
>  include/kde4/krita/kis_base_node.h
>  include/kde4/krita/kis_base_processor.h
> @@ -435,6 +400,9 @@ include/kde4/krita/kis_generator.h
>  include/kde4/krita/kis_generator_registry.h
>  include/kde4/krita/kis_global.h
>  include/kde4/krita/kis_image.h
> +include/kde4/krita/kis_locked_properties.h
> +include/kde4/krita/kis_locked_properties_proxy.h
> +include/kde4/krita/kis_locked_properties_server.h
>  include/kde4/krita/kis_mask.h
>  include/kde4/krita/kis_multi_bool_filter_widget.h
>  include/kde4/krita/kis_multi_double_filter_widget.h
> @@ -454,14 +422,12 @@ include/kde4/krita/kis_selection.h
>  include/kde4/krita/kis_serializable_configuration.h
>  include/kde4/krita/kis_shared.h
>  include/kde4/krita/kis_shared_ptr.h
> -include/kde4/krita/kis_shared_ptr_vector.h
>  include/kde4/krita/kis_tiled_data_manager.h
>  include/kde4/krita/kis_tool.h
>  include/kde4/krita/kis_transaction.h
>  include/kde4/krita/kis_transform_worker.h
>  include/kde4/krita/kis_types.h
>  include/kde4/krita/kis_ui_types.h
> -include/kde4/krita/kis_view2.h
>  include/kde4/krita/kis_warptransform_worker.h
>  include/kde4/krita/krita_export.h
>  include/kde4/sheets/
> @@ -495,6 +461,10 @@ include/kde4/sheets/commands/
>  include/kde4/sheets/commands/AbstractRegionCommand.h
>  include/kde4/sheets/commands/DataManipulators.h
>  include/kde4/sheets/commands/SortManipulator.h
> +include/kde4/sheets/commands/pivot.h
> +include/kde4/sheets/commands/pivotfilters.h
> +include/kde4/sheets/commands/pivotmain.h
> +include/kde4/sheets/commands/pivotoptions.h
>  include/kde4/sheets/database/
>  include/kde4/sheets/database/Database.h
>  include/kde4/sheets/database/Filter.h
> @@ -556,222 +526,20 @@ include/kde4/words/part/frames/KWTextFra
>  include/kde4/words/part/words_export.h
>  lib/calligra/
>  lib/calligra/imports/
> +lib/calligra/imports/Calligra/
> +lib/calligra/imports/Calligra/Gemini/
> +lib/calligra/imports/Calligra/Gemini/Dropbox/
>
+lib/calligra/imports/Calligra/Gemini/Dropbox/libcalligrageminidropboxplugin.so
> +lib/calligra/imports/Calligra/Gemini/Dropbox/qmldir
>  lib/calligra/imports/org/
> +lib/calligra/imports/org/calligra/
> +lib/calligra/imports/org/calligra/CalligraComponents/
>
+lib/calligra/imports/org/calligra/CalligraComponents/libcalligraqtquickcomponentsplugin.so

> +lib/calligra/imports/org/calligra/CalligraComponents/qmldir
>  lib/calligra/imports/org/krita/
>  lib/calligra/imports/org/krita/draganddrop/
>  lib/calligra/imports/org/krita/draganddrop/libdraganddropplugin.so
>  lib/calligra/imports/org/krita/draganddrop/qmldir
> -lib/calligra/imports/org/krita/sketch/
> -lib/calligra/imports/org/krita/sketch/HelpPage.qml
> -lib/calligra/imports/org/krita/sketch/KritaSketchBase.qml
> -lib/calligra/imports/org/krita/sketch/MainPage.qml
> -lib/calligra/imports/org/krita/sketch/OpenImagePage.qml
> -lib/calligra/imports/org/krita/sketch/SaveImagePage.qml
> -lib/calligra/imports/org/krita/sketch/SettingsPage.qml
> -lib/calligra/imports/org/krita/sketch/WelcomePage.qml
> -lib/calligra/imports/org/krita/sketch/components/
> -lib/calligra/imports/org/krita/sketch/components/BusyIndicator.qml
> -lib/calligra/imports/org/krita/sketch/components/Button.qml
> -lib/calligra/imports/org/krita/sketch/components/CategorySwitcher.qml
> -lib/calligra/imports/org/krita/sketch/components/CheckBox.qml
> -lib/calligra/imports/org/krita/sketch/components/ColorSwatch.qml
> -lib/calligra/imports/org/krita/sketch/components/Dialog.qml
> -lib/calligra/imports/org/krita/sketch/components/Divider.qml
> -lib/calligra/imports/org/krita/sketch/components/DropShadow.qml
> -lib/calligra/imports/org/krita/sketch/components/ExpandingListView.qml
> -lib/calligra/imports/org/krita/sketch/components/Header.qml
> -lib/calligra/imports/org/krita/sketch/components/Label.qml
> -lib/calligra/imports/org/krita/sketch/components/ListItem.qml
> -lib/calligra/imports/org/krita/sketch/components/MessageStack.qml
> -lib/calligra/imports/org/krita/sketch/components/NewImageList.qml
> -lib/calligra/imports/org/krita/sketch/components/NewsList.qml
> -lib/calligra/imports/org/krita/sketch/components/Page.qml
> -lib/calligra/imports/org/krita/sketch/components/PageStack.js
> -lib/calligra/imports/org/krita/sketch/components/PageStack.qml
> -lib/calligra/imports/org/krita/sketch/components/PanelTextField.qml
> -lib/calligra/imports/org/krita/sketch/components/RangeInput.qml
> -lib/calligra/imports/org/krita/sketch/components/RecentFilesList.qml
> -lib/calligra/imports/org/krita/sketch/components/ScrollDecorator.qml
> -lib/calligra/imports/org/krita/sketch/components/Slider.qml
> -lib/calligra/imports/org/krita/sketch/components/TextField.qml
> -lib/calligra/imports/org/krita/sketch/components/TextFieldMultiline.qml
> -lib/calligra/imports/org/krita/sketch/components/VirtualKeyboard.qml
> -lib/calligra/imports/org/krita/sketch/images/
> -lib/calligra/imports/org/krita/sketch/images/blue.png
> -lib/calligra/imports/org/krita/sketch/images/busyindicator.png
> -lib/calligra/imports/org/krita/sketch/images/camera-web.png
> -lib/calligra/imports/org/krita/sketch/images/configure.png
> -lib/calligra/imports/org/krita/sketch/images/divider.png
> -lib/calligra/imports/org/krita/sketch/images/divider2.png
> -lib/calligra/imports/org/krita/sketch/images/document-new.png
> -lib/calligra/imports/org/krita/sketch/images/document-open.png
> -lib/calligra/imports/org/krita/sketch/images/document-save-as.png
> -lib/calligra/imports/org/krita/sketch/images/document-save.png
> -lib/calligra/imports/org/krita/sketch/images/document-share.png
> -lib/calligra/imports/org/krita/sketch/images/edit-copy.png
> -lib/calligra/imports/org/krita/sketch/images/edit-cut.png
> -lib/calligra/imports/org/krita/sketch/images/edit-paste.png
> -lib/calligra/imports/org/krita/sketch/images/edit-redo.png
> -lib/calligra/imports/org/krita/sketch/images/edit-select.png
> -lib/calligra/imports/org/krita/sketch/images/edit-undo.png
> -lib/calligra/imports/org/krita/sketch/images/green.png
> -lib/calligra/imports/org/krita/sketch/images/handle-menu.png
> -lib/calligra/imports/org/krita/sketch/images/header_krita_sketch.png
>
-lib/calligra/imports/org/krita/sketch/images/header_krita_sketch_light.png

> -lib/calligra/imports/org/krita/sketch/images/header_red.png
> -lib/calligra/imports/org/krita/sketch/images/help-about.png
> -lib/calligra/imports/org/krita/sketch/images/image-x-generic.png
> -lib/calligra/imports/org/krita/sketch/images/krita.png
> -lib/calligra/imports/org/krita/sketch/images/kritasketch.png
> -lib/calligra/imports/org/krita/sketch/images/red.png
> -lib/calligra/imports/org/krita/sketch/images/shadow-bc.png
> -lib/calligra/imports/org/krita/sketch/images/shadow-bl.png
> -lib/calligra/imports/org/krita/sketch/images/shadow-br.png
> -lib/calligra/imports/org/krita/sketch/images/shadow-lc.png
> -lib/calligra/imports/org/krita/sketch/images/shadow-rc.png
> -lib/calligra/imports/org/krita/sketch/images/shadow-smooth.png
> -lib/calligra/imports/org/krita/sketch/images/shadow-tc.png
> -lib/calligra/imports/org/krita/sketch/images/shadow-tl.png
> -lib/calligra/imports/org/krita/sketch/images/shadow-tr.png
> -lib/calligra/imports/org/krita/sketch/images/svg/
> -lib/calligra/imports/org/krita/sketch/images/svg/checker-small.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/combo-arrows-white.svg
>
-lib/calligra/imports/org/krita/sketch/images/svg/icon-A4landscape-black.svg
>
-lib/calligra/imports/org/krita/sketch/images/svg/icon-A4portrait-black.svg

> -lib/calligra/imports/org/krita/sketch/images/svg/icon-add-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-add.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-apply-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-apply.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-back.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-camera-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-cancel-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-close.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-color_wheel.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-colorpicker.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-crop-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-crop.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-delete-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-delete.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-down.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-edit.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-erase.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-fileclip-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-filenew-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-filenew.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-fileopen-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-fileopen.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-filesave.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-filesaveas.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-fileshare.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-fill-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-fill.svg
>
-lib/calligra/imports/org/krita/sketch/images/svg/icon-filter_delete-black.svg
>
-lib/calligra/imports/org/krita/sketch/images/svg/icon-filter_load-black.svg
>
-lib/calligra/imports/org/krita/sketch/images/svg/icon-filter_save-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-forward.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-gradient-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-gradient.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-help.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-krita_sketch.svg
>
-lib/calligra/imports/org/krita/sketch/images/svg/icon-layer_filter-black.svg
>
-lib/calligra/imports/org/krita/sketch/images/svg/icon-layer_group-black.svg
>
-lib/calligra/imports/org/krita/sketch/images/svg/icon-layer_paint-black.svg
>
-lib/calligra/imports/org/krita/sketch/images/svg/icon-locked_off-black.svg

> -lib/calligra/imports/org/krita/sketch/images/svg/icon-locked_on-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-minimize.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-mirror_c-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-mirror_h-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-mirror_v-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-move-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-move.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-paint-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-paint.svg
>
-lib/calligra/imports/org/krita/sketch/images/svg/icon-palette-add-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-palette-black.svg
>
-lib/calligra/imports/org/krita/sketch/images/svg/icon-palette-delete-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-palette.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-redo.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-select-add.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-select-apply.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-select-area.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-select-color.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-select-deselect.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-select-hide.svg
>
-lib/calligra/imports/org/krita/sketch/images/svg/icon-select-intersect.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-select-polygon.svg
>
-lib/calligra/imports/org/krita/sketch/images/svg/icon-select-rectangle.svg

> -lib/calligra/imports/org/krita/sketch/images/svg/icon-select-replace.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-select-reselect.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-select-show.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-select-sub.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-settings.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-switch.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-transform-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-transform.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-undo.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-up.svg
>
-lib/calligra/imports/org/krita/sketch/images/svg/icon-visible_off-black.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-visible_off.svg
>
-lib/calligra/imports/org/krita/sketch/images/svg/icon-visible_on-black.svg

> -lib/calligra/imports/org/krita/sketch/images/svg/icon-visible_on.svg
> -lib/calligra/imports/org/krita/sketch/images/svg/icon-web.svg
> -lib/calligra/imports/org/krita/sketch/libkritasketchplugin.so
> -lib/calligra/imports/org/krita/sketch/panels/
> -lib/calligra/imports/org/krita/sketch/panels/ColorPanel.qml
> -lib/calligra/imports/org/krita/sketch/panels/EditLayerPage.qml
> -lib/calligra/imports/org/krita/sketch/panels/EditPresetPage.qml
> -lib/calligra/imports/org/krita/sketch/panels/FilterPanel.qml
> -lib/calligra/imports/org/krita/sketch/panels/LayersPanel.qml
> -lib/calligra/imports/org/krita/sketch/panels/MenuPanel.qml
> -lib/calligra/imports/org/krita/sketch/panels/NewImagePanel.qml
> -lib/calligra/imports/org/krita/sketch/panels/OpenImagePanel.qml
> -lib/calligra/imports/org/krita/sketch/panels/Panel.qml
> -lib/calligra/imports/org/krita/sketch/panels/PanelBar.qml
> -lib/calligra/imports/org/krita/sketch/panels/PanelDropArea.qml
> -lib/calligra/imports/org/krita/sketch/panels/PresetsPanel.qml
> -lib/calligra/imports/org/krita/sketch/panels/SelectPanel.qml
> -lib/calligra/imports/org/krita/sketch/panels/ToolOverlayPanel.qml
> -lib/calligra/imports/org/krita/sketch/panels/ToolPanel.qml
> -lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/
> -lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/blur.qml
>
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/brightnesscontrast.qml
> -lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/burn.qml
>
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/colortoalpha.qml
>
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/colortransfer.qml
> -lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/dodge.qml
> -lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/emboss.qml
> -lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/gaussian
blur.qml
>
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/gaussiannoisereducer.qml
>
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/hsvadjustment.qml
> -lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/lens
blur.qml
> -lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/levels.qml
> -lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/motion
blur.qml
> -lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/noise.qml
>
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/nothing-to-configure.qml
>
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/oilpaint.qml
>
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/perchannel.qml
>
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/phongbumpmap.qml
>
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/pixelize.qml
>
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/raindrops.qml
>
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/randompick.qml
>
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/roundcorners.qml
>
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/smalltiles.qml
> -lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/sobel.qml
>
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/unsharp.qml
> -lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/wave.qml
>
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/waveletnoisereducer.qml
> -lib/calligra/imports/org/krita/sketch/panels/toolconfigpages/
> -lib/calligra/imports/org/krita/sketch/panels/toolconfigpages/crop.qml
> -lib/calligra/imports/org/krita/sketch/panels/toolconfigpages/fill.qml
> -lib/calligra/imports/org/krita/sketch/panels/toolconfigpages/gradient.qml
> -lib/calligra/imports/org/krita/sketch/panels/toolconfigpages/move.qml
> -lib/calligra/imports/org/krita/sketch/panels/toolconfigpages/paint.qml
>
-lib/calligra/imports/org/krita/sketch/panels/toolconfigpages/transform.qml

> -lib/calligra/imports/org/krita/sketch/panels/tooloverlays/
> -lib/calligra/imports/org/krita/sketch/panels/tooloverlays/move.qml
> -lib/calligra/imports/org/krita/sketch/panels/tooloverlays/none.qml
> -lib/calligra/imports/org/krita/sketch/panels/tooloverlays/transform.qml
> -lib/calligra/imports/org/krita/sketch/qmldir
>  lib/kde4/authorpart.so
>  lib/kde4/braindump_shape_state.so
>  lib/kde4/braindump_shape_web.so
> @@ -793,9 +561,11 @@ lib/kde4/calligra_filter_kpr2odp.so
>  lib/kde4/calligra_filter_kspread2tex.so
>  lib/kde4/calligra_filter_mpxj2plan.so
>  lib/kde4/calligra_filter_odt2ascii.so
> +lib/kde4/calligra_filter_odt2docx.so
>  lib/kde4/calligra_filter_odt2epub2.so
>  lib/kde4/calligra_filter_odt2html.so
>  lib/kde4/calligra_filter_odt2mobi.so
> +lib/kde4/calligra_filter_odt2wiki.so
>  lib/kde4/calligra_filter_opencalc2sheets.so
>  lib/kde4/calligra_filter_pdf2svg.so
>  lib/kde4/calligra_filter_ppt2odp.so
> @@ -905,6 +675,7 @@ lib/kde4/kritacolorgenerator.so
>  lib/kde4/kritacolorrange.so
>  lib/kde4/kritacolorselectorng.so
>  lib/kde4/kritacolorsfilters.so
> +lib/kde4/kritacolorslider.so
>  lib/kde4/kritacolorsmudgepaintop.so
>  lib/kde4/kritacolorspaceconversion.so
>  lib/kde4/kritacompositiondocker.so
> @@ -916,7 +687,6 @@ lib/kde4/kritadefaulttools.so
>  lib/kde4/kritadeformpaintop.so
>  lib/kde4/kritadigitalmixer.so
>  lib/kde4/kritadodgeburn.so
> -lib/kde4/kritadropshadow.so
>  lib/kde4/kritadynapaintop.so
>  lib/kde4/kritaembossfilter.so
>  lib/kde4/kritaexample.so
> @@ -926,22 +696,25 @@ lib/kde4/kritaexrimport.so
>  lib/kde4/kritaextensioncolorsfilters.so
>  lib/kde4/kritafastcolortransferfilter.so
>  lib/kde4/kritafilterop.so
> -lib/kde4/kritaflipbookimport.so
>  lib/kde4/kritagmic.so
>  lib/kde4/kritagridpaintop.so
>  lib/kde4/kritahairypaintop.so
>  lib/kde4/kritahatchingpaintop.so
> +lib/kde4/kritaheightmapexport.so
> +lib/kde4/kritaheightmapimport.so
>  lib/kde4/kritahistogram.so
>  lib/kde4/kritahistorydocker.so
>  lib/kde4/kritaimagedocker.so
>  lib/kde4/kritaimageenhancement.so
>  lib/kde4/kritaimagesize.so
>  lib/kde4/kritaimagesplit.so
> +lib/kde4/kritaindexcolors.so
>  lib/kde4/kritajp2export.so
>  lib/kde4/kritajp2import.so
>  lib/kde4/kritajpegexport.so
>  lib/kde4/kritajpegimport.so
>  lib/kde4/kritalayergroupswitcher.so
> +lib/kde4/kritalayersplit.so
>  lib/kde4/kritalevelfilter.so
>  lib/kde4/kritalutdocker.so
>  lib/kde4/kritametadataeditor.so
> @@ -954,7 +727,6 @@ lib/kde4/kritaoraexport.so
>  lib/kde4/kritaoraimport.so
>  lib/kde4/kritaoverviewdocker.so
>  lib/kde4/kritapalettedocker.so
> -lib/kde4/kritapart.so
>  lib/kde4/kritaparticlepaintop.so
>  lib/kde4/kritapatterndocker.so
>  lib/kde4/kritapatterngenerator.so
> @@ -963,6 +735,7 @@ lib/kde4/kritaphongbumpmap.so
>  lib/kde4/kritapixelizefilter.so
>  lib/kde4/kritapngexport.so
>  lib/kde4/kritapngimport.so
> +lib/kde4/kritaposterize.so
>  lib/kde4/kritappmexport.so
>  lib/kde4/kritappmimport.so
>  lib/kde4/kritapresetdocker.so
> @@ -971,6 +744,7 @@ lib/kde4/kritapsdimport.so
>  lib/kde4/kritaqmlexport.so
>  lib/kde4/kritaraindropsfilter.so
>  lib/kde4/kritarandompickfilter.so
> +lib/kde4/kritaresourcemanager.so
>  lib/kde4/kritarotateimage.so
>  lib/kde4/kritaroundcornersfilter.so
>  lib/kde4/kritarulerassistanttool.so
> @@ -984,6 +758,9 @@ lib/kde4/kritasobelfilter.so
>  lib/kde4/kritaspecificcolorselector.so
>  lib/kde4/kritaspraypaintop.so
>  lib/kde4/kritatasksetdocker.so
> +lib/kde4/kritatgaexport.so
> +lib/kde4/kritatgaimport.so
> +lib/kde4/kritathumbnail.so
>  lib/kde4/kritatiffexport.so
>  lib/kde4/kritatiffimport.so
>  lib/kde4/kritatoolcrop.so
> @@ -1015,6 +792,7 @@ lib/kde4/kspreadstatisticalmodule.so
>  lib/kde4/kspreadtextmodule.so
>  lib/kde4/kspreadtrigonometrymodule.so
>  lib/kde4/okularGenerator_odp.so
> +lib/kde4/okularGenerator_odt.so
>  lib/kde4/planconvert/
>  lib/kde4/planconvert/PlanConvert.jar
>  lib/kde4/planicalexport.so
> @@ -1022,6 +800,8 @@ lib/kde4/plankplatoimport.so
>  lib/kde4/planpart.so
>  lib/kde4/plantjscheduler.so
>  lib/kde4/planworkpart.so
> +lib/kde4/plugins/imageformats/kimg_kra.so
> +lib/kde4/plugins/imageformats/kimg_ora.so
>  lib/kde4/sheetssolver.so
>  lib/kde4/wordspart.so
>  @lib lib/libRtfReader.so.${LIBRtfReader_VERSION}
> @@ -1045,7 +825,6 @@ lib/libkdeinit4_calligrasheets.so
>  lib/libkdeinit4_calligrastage.so
>  lib/libkdeinit4_calligrawords.so
>  lib/libkdeinit4_karbon.so
> -lib/libkdeinit4_krita.so
>  @lib lib/libkexicore.so.${LIBkexicore_VERSION}
>  @lib lib/libkexidatatable.so.${LIBkexidatatable_VERSION}
>  @lib lib/libkexidataviewcommon.so.${LIBkexidataviewcommon_VERSION}
> @@ -1073,29 +852,42 @@ lib/libkdeinit4_krita.so
>  @lib lib/libkotext.so.${LIBkotext_VERSION}
>  @lib lib/libkotextlayout.so.${LIBkotextlayout_VERSION}
>  @lib lib/libkovectorimage.so.${LIBkovectorimage_VERSION}
> +@lib lib/libkoversion.so.${LIBkoversion_VERSION}
>  @lib lib/libkowidgets.so.${LIBkowidgets_VERSION}
>  @lib lib/libkowidgetutils.so.${LIBkowidgetutils_VERSION}
>  @lib lib/libkowv2.so.${LIBkowv2_VERSION}
>  @lib lib/libkplatokernel.so.${LIBkplatokernel_VERSION}
>  @lib lib/libkplatomodels.so.${LIBkplatomodels_VERSION}
>  @lib lib/libkplatoui.so.${LIBkplatoui_VERSION}
> +@lib lib/libkritacolor.so.${LIBkritacolor_VERSION}
> +lib/libkritacolord.so
>  @lib lib/libkritaimage.so.${LIBkritaimage_VERSION}
>  @lib lib/libkritalibbrush.so.${LIBkritalibbrush_VERSION}
>  @lib lib/libkritalibpaintop.so.${LIBkritalibpaintop_VERSION}
> -lib/libkritasketchlib.so
>  @lib lib/libkritaui.so.${LIBkritaui_VERSION}
>  @lib lib/libkundo2.so.${LIBkundo2_VERSION}
> +@lib lib/liblibglobal.so.${LIBlibglobal_VERSION}
> +@lib lib/liblibkispsd.so.${LIBlibkispsd_VERSION}
>  @lib lib/libpigmentcms.so.${LIBpigmentcms_VERSION}
>  @lib lib/libplanprivate.so.${LIBplanprivate_VERSION}
>  @lib lib/libplanworkapp.so.${LIBplanworkapp_VERSION}
>  @lib lib/libplanworkfactory.so.${LIBplanworkfactory_VERSION}
>  @lib lib/librcps_plan.so.${LIBrcps_plan_VERSION}
>  @lib lib/libwordsprivate.so.${LIBwordsprivate_VERSION}
> +share/appdata/braindump.appdata.xml
> +share/appdata/flow.appdata.xml
> +share/appdata/karbon.appdata.xml
> +share/appdata/kexi.appdata.xml
>  share/appdata/krita.appdata.xml
> -share/applications/calligraactive.desktop
> +share/appdata/plan.appdata.xml
> +share/appdata/sheets.appdata.xml
> +share/appdata/stage.appdata.xml
> +share/appdata/words.appdata.xml
>  share/applications/kde4/author.desktop
>  share/applications/kde4/braindump.desktop
>  share/applications/kde4/calligra.desktop
> +share/applications/kde4/calligraactive.desktop
> +share/applications/kde4/calligragemini.desktop
>  share/applications/kde4/calligrawords_ascii.desktop
>  share/applications/kde4/flow.desktop
>  share/applications/kde4/karbon.desktop
> @@ -1103,7 +895,7 @@ share/applications/kde4/kexi.desktop
>  share/applications/kde4/krita.desktop
>  share/applications/kde4/krita_bmp.desktop
>  share/applications/kde4/krita_exr.desktop
> -share/applications/kde4/krita_flipbook.desktop
> +share/applications/kde4/krita_heightmap.desktop
>  share/applications/kde4/krita_jp2.desktop
>  share/applications/kde4/krita_jpeg.desktop
>  share/applications/kde4/krita_odg.desktop
> @@ -1113,11 +905,13 @@ share/applications/kde4/krita_png.deskto
>  share/applications/kde4/krita_ppm.desktop
>  share/applications/kde4/krita_psd.desktop
>  share/applications/kde4/krita_raw.desktop
> +share/applications/kde4/krita_tga.desktop
>  share/applications/kde4/krita_tiff.desktop
>  share/applications/kde4/krita_xcf.desktop
> -share/applications/kde4/kritagemini.desktop
> -share/applications/kde4/kritasketch.desktop
> +share/applications/kde4/okularApplication_doc_calligra.desktop
> +share/applications/kde4/okularApplication_docx_calligra.desktop
>  share/applications/kde4/okularApplication_odp.desktop
> +share/applications/kde4/okularApplication_odt.desktop
>  share/applications/kde4/plan.desktop
>  share/applications/kde4/planwork.desktop
>  share/applications/kde4/sheets.desktop
> @@ -1151,6 +945,7 @@ share/apps/calligra/icons/hicolor/128x12
>  share/apps/calligra/icons/hicolor/128x128/actions/template_ratio_1610.png
>  share/apps/calligra/icons/hicolor/128x128/actions/template_ratio_2391.png
>  share/apps/calligra/icons/hicolor/128x128/actions/template_ratio_43.png
> +share/apps/calligra/icons/hicolor/128x128/actions/template_web_design.png
>  share/apps/calligra/icons/hicolor/16x16/
>  share/apps/calligra/icons/hicolor/16x16/actions/
>  share/apps/calligra/icons/hicolor/16x16/actions/abs.png
> @@ -1425,18 +1220,322 @@ share/apps/calligra/palettes/swatch-colo
>  share/apps/calligra/palettes/swatch-rgb.gpl
>  share/apps/calligra/palettes/swatche.gpl
>  share/apps/calligra/palettes/web.gpl
> +share/apps/calligra/pics/
> +share/apps/calligra/pics/dark_docker_close.png
> +share/apps/calligra/pics/dark_docker_collapse_a.png
> +share/apps/calligra/pics/dark_docker_collapse_b.png
> +share/apps/calligra/pics/dark_docker_float.png
> +share/apps/calligra/pics/dark_docker_lock_a.png
> +share/apps/calligra/pics/dark_docker_lock_b.png
> +share/apps/calligra/pics/light_docker_close.png
> +share/apps/calligra/pics/light_docker_collapse_a.png
> +share/apps/calligra/pics/light_docker_collapse_b.png
> +share/apps/calligra/pics/light_docker_float.png
> +share/apps/calligra/pics/light_docker_lock_a.png
> +share/apps/calligra/pics/light_docker_lock_b.png
>  share/apps/calligra/styles/
>  share/apps/calligra/styles/markers.xml
>  share/apps/calligra/thesaurus/
>  share/apps/calligra/thesaurus/thesaurus.txt
> +share/apps/calligragemini/
> +share/apps/calligragemini/calligragemini.qml
> +share/apps/calligragemini/qml/
> +share/apps/calligragemini/qml/MainPage.qml
> +share/apps/calligragemini/qml/PresentationDJMode.qml
> +share/apps/calligragemini/qml/StageDocumentPage.qml
> +share/apps/calligragemini/qml/WelcomePage.qml
> +share/apps/calligragemini/qml/WordsDocumentPage.qml
> +share/apps/calligragemini/qml/components/
> +share/apps/calligragemini/qml/components/BusyIndicator.qml
> +share/apps/calligragemini/qml/components/Button.qml
> +share/apps/calligragemini/qml/components/CategorySwitcher.qml
> +share/apps/calligragemini/qml/components/CheckBox.qml
> +share/apps/calligragemini/qml/components/CohereButton.qml
> +share/apps/calligragemini/qml/components/ColorSwatch.qml
> +share/apps/calligragemini/qml/components/Dialog.qml
> +share/apps/calligragemini/qml/components/Divider.qml
> +share/apps/calligragemini/qml/components/DropShadow.qml
> +share/apps/calligragemini/qml/components/ExpandingListView.qml
> +share/apps/calligragemini/qml/components/Header.qml
> +share/apps/calligragemini/qml/components/Label.qml
> +share/apps/calligragemini/qml/components/ListItem.qml
> +share/apps/calligragemini/qml/components/MessageStack.qml
> +share/apps/calligragemini/qml/components/NewImageList.qml
> +share/apps/calligragemini/qml/components/NewsList.qml
> +share/apps/calligragemini/qml/components/Page.qml
> +share/apps/calligragemini/qml/components/PageStack.js
> +share/apps/calligragemini/qml/components/PageStack.qml
> +share/apps/calligragemini/qml/components/PanelTextField.qml
> +share/apps/calligragemini/qml/components/ProgressBar.qml
> +share/apps/calligragemini/qml/components/RangeInput.qml
> +share/apps/calligragemini/qml/components/RecentFilesList.qml
> +share/apps/calligragemini/qml/components/ScrollDecorator.qml
> +share/apps/calligragemini/qml/components/Shadow.qml
> +share/apps/calligragemini/qml/components/Slider.qml
> +share/apps/calligragemini/qml/components/TextField.qml
> +share/apps/calligragemini/qml/components/TextFieldMultiline.qml
> +share/apps/calligragemini/qml/components/Tooltip.qml
> +share/apps/calligragemini/qml/components/VirtualKeyboard.qml
> +share/apps/calligragemini/qml/panels/
> +share/apps/calligragemini/qml/panels/ImageToolsPanel.qml
> +share/apps/calligragemini/qml/panels/NotesPanel.qml
> +share/apps/calligragemini/qml/panels/OptionsPanel.qml
> +share/apps/calligragemini/qml/panels/TextStylePanel.qml
> +share/apps/calligragemini/qml/panels/notespanelpages/
>
+share/apps/calligragemini/qml/panels/notespanelpages/NotesPanelAddCustom.qml
> +share/apps/calligragemini/qml/panels/notespanelpages/NotesPanelMain.qml
>
+share/apps/calligragemini/qml/panels/notespanelpages/NotesPanelSummary.qml

> +share/apps/calligragemini/qml/welcomepages/
> +share/apps/calligragemini/qml/welcomepages/CustomDocWords.qml
> +share/apps/calligragemini/qml/welcomepages/TemplatesWords.qml
> +share/apps/calligragemini/qml/welcomepages/VariantSelector.qml
> +share/apps/calligragemini/qml/welcomepages/WelcomePageCloud.qml
> +share/apps/calligragemini/qml/welcomepages/WelcomePageCustom.qml
> +share/apps/calligragemini/qml/welcomepages/WelcomePageFilebrowser.qml
> +share/apps/calligragemini/qml/welcomepages/WelcomePageRecent.qml
> +share/apps/calligragemini/qml/welcomepages/WelcomePageStage.qml
> +share/apps/calligragemini/qml/welcomepages/WelcomePageWords.qml
> +share/apps/calligragemini/qml/welcomepages/cloud/
> +share/apps/calligragemini/qml/welcomepages/cloud/AddDropbox.qml
> +share/apps/calligragemini/qml/welcomepages/cloud/AddGit.qml
> +share/apps/calligragemini/qml/welcomepages/cloud/AddWebdav.qml
> +share/apps/calligragemini/qml/welcomepages/cloud/CloudAccounts.qml
> +share/apps/calligragemini/qml/welcomepages/cloud/Dropbox.qml
> +share/apps/calligragemini/qml/welcomepages/cloud/EditDetailsBase.qml
> +share/apps/calligragemini/qml/welcomepages/cloud/EditGit.qml
> +share/apps/calligragemini/qml/welcomepages/cloud/Git.qml
> +share/apps/calligragemini/qml/welcomepages/cloud/RemoveAccountDlg.qml
> +share/apps/calligragemini/qml/welcomepages/cloud/Webdav.qml
> +share/apps/calligragemini/qml/welcomepages/cloud/dropbox/
>
+share/apps/calligragemini/qml/welcomepages/cloud/dropbox/DropboxWebView.qml
>
+share/apps/calligragemini/qml/welcomepages/cloud/dropbox/FileNavigator.qml
> +share/apps/calligragemini/qml/welcomepages/cloud/dropbox/InfoBanner.qml
> +share/apps/calligragemini/qml/welcomepages/cloud/dropbox/LoginPage.qml
> +share/apps/calligragemini/qml/welcomepages/cloud/dropbox/SetupPage.qml
> +share/apps/calligragemini/qml/welcomepages/cloud/git/
> +share/apps/calligragemini/qml/welcomepages/cloud/git/CreateCheckout.qml
>
+share/apps/calligragemini/qml/welcomepages/cloud/git/GetUserCredentials.qml
>
+share/apps/calligragemini/qml/welcomepages/cloud/git/RepositoryContent.qml
>
+share/apps/calligragemini/qml/welcomepages/cloud/git/createCheckoutContainer.qml
>
+share/apps/calligragemini/qml/welcomepages/cloud/git/repositoryContentContainer.qml
>
+share/apps/calligragemini/qml/welcomepages/cloud/git/userCredentialsContainer.qml

> +share/apps/calligragemini/themes/
> +share/apps/calligragemini/themes/default/
> +share/apps/calligragemini/themes/default/colors.js
> +share/apps/calligragemini/themes/default/fonts/
> +share/apps/calligragemini/themes/default/fonts.js
> +share/apps/calligragemini/themes/default/fonts/PermanentMarker.ttf
> +share/apps/calligragemini/themes/default/fonts/SourceSansPro-Black.otf
> +share/apps/calligragemini/themes/default/fonts/SourceSansPro-BlackIt.otf
> +share/apps/calligragemini/themes/default/fonts/SourceSansPro-Bold.otf
> +share/apps/calligragemini/themes/default/fonts/SourceSansPro-BoldIt.otf
>
+share/apps/calligragemini/themes/default/fonts/SourceSansPro-ExtraLight.otf
>
+share/apps/calligragemini/themes/default/fonts/SourceSansPro-ExtraLightIt.otf
> +share/apps/calligragemini/themes/default/fonts/SourceSansPro-It.otf
> +share/apps/calligragemini/themes/default/fonts/SourceSansPro-Light.otf
> +share/apps/calligragemini/themes/default/fonts/SourceSansPro-LightIt.otf
> +share/apps/calligragemini/themes/default/fonts/SourceSansPro-Regular.otf
> +share/apps/calligragemini/themes/default/fonts/SourceSansPro-Semibold.otf
>
+share/apps/calligragemini/themes/default/fonts/SourceSansPro-SemiboldIt.otf
> +share/apps/calligragemini/themes/default/icons/
> +share/apps/calligragemini/themes/default/icons/A4landscape-black.svg
> +share/apps/calligragemini/themes/default/icons/A4portrait-black.svg
>
+share/apps/calligragemini/themes/default/icons/Arrow-Back-FileBrowse-1.svg
> +share/apps/calligragemini/themes/default/icons/Arrow-ScrollDown-1.svg
> +share/apps/calligragemini/themes/default/icons/Arrow-ScrollUp-1.svg
> +share/apps/calligragemini/themes/default/icons/Calligra-MockIcon-1.svg
> +share/apps/calligragemini/themes/default/icons/ColorPalettes-1-04.svg
> +share/apps/calligragemini/themes/default/icons/ColorPalettes-Blue-1.svg
>
+share/apps/calligragemini/themes/default/icons/ColorPalettes-Magenta-1.svg
> +share/apps/calligragemini/themes/default/icons/ColorPalettes-Red-1.svg
> +share/apps/calligragemini/themes/default/icons/ColorPalettes-gold-1.svg
> +share/apps/calligragemini/themes/default/icons/Presentaton-Blue.svg
> +share/apps/calligragemini/themes/default/icons/Presentaton-Gold.svg
> +share/apps/calligragemini/themes/default/icons/Presentaton-Magenta.svg
> +share/apps/calligragemini/themes/default/icons/Presentaton-Red.svg
>
+share/apps/calligragemini/themes/default/icons/SVG-AddComment-Inline-1.svg
>
+share/apps/calligragemini/themes/default/icons/SVG-Comment-DragHandle-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Exit-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-FXTransition-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-FillLabel-Green-1.svg
>
+share/apps/calligragemini/themes/default/icons/SVG-FillLabel-Neutral-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-FillLabel-Red-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-FillLabel-Yellow-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Highlighter-1.svg
>
+share/apps/calligragemini/themes/default/icons/SVG-IMGTOOLS-Brightness-1.svg
>
+share/apps/calligragemini/themes/default/icons/SVG-IMGTOOLS-Contrast-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-IMGTOOLS-Crop-1.svg
>
+share/apps/calligragemini/themes/default/icons/SVG-IMGTOOLS-ReplaceImage-1.svg
>
+share/apps/calligragemini/themes/default/icons/SVG-IMGTOOLS-SliderHandle-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-IMGTOOLS-Sliders-1.svg
>
+share/apps/calligragemini/themes/default/icons/SVG-IMGTOOLS-Transparency-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-IMGTOOLS-Wand-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-AddNote-1.svg
>
+share/apps/calligragemini/themes/default/icons/SVG-Icon-AddPhotoComment-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-AddShape-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-AddSlide-1.svg
>
+share/apps/calligragemini/themes/default/icons/SVG-Icon-AddVoiceComment-1.svg

> +share/apps/calligragemini/themes/default/icons/SVG-Icon-Animations-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-Bold-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-BulletList-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-Cloud-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-DesktopMode-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-Fill.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-Find-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-Help-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-Image.svg
>
+share/apps/calligragemini/themes/default/icons/SVG-Icon-ImageAdjustment-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-Italic-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-Lines.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-MenuBack-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-MyDocuments-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-NewDocument-1.svg
>
+share/apps/calligragemini/themes/default/icons/SVG-Icon-NewPresentation-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-NewSketch-1.svg
>
+share/apps/calligragemini/themes/default/icons/SVG-Icon-NewSpreadsheet-1.svg
>
+share/apps/calligragemini/themes/default/icons/SVG-Icon-NotesSummary-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-OK-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-Options-1.svg
>
+share/apps/calligragemini/themes/default/icons/SVG-Icon-OptionsWhite-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-Pen.svg
>
+share/apps/calligragemini/themes/default/icons/SVG-Icon-PlayPresentation-1.svg
>
+share/apps/calligragemini/themes/default/icons/SVG-Icon-RecentDocuments-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-Shadow.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-SmallX.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-SpellCheck-1.svg
>
+share/apps/calligragemini/themes/default/icons/SVG-Icon-TextAlignment-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-TextBox-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-TextStyle-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Icon-Underline-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Label-Green-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Label-Red-1.svg
>
+share/apps/calligragemini/themes/default/icons/SVG-Label-SelectedRing-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Label-Yellow-1.svg
>
+share/apps/calligragemini/themes/default/icons/SVG-LargeSelectedFill-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-NextSlide-1.svg
>
+share/apps/calligragemini/themes/default/icons/SVG-NotesSummary-Counter-1.svg

> +share/apps/calligragemini/themes/default/icons/SVG-Nudge-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-Pointer-1.svg
> +share/apps/calligragemini/themes/default/icons/SVG-PreviousSlide-1.svg
> +share/apps/calligragemini/themes/default/icons/add-black.svg
> +share/apps/calligragemini/themes/default/icons/add.svg
> +share/apps/calligragemini/themes/default/icons/apply-black.svg
> +share/apps/calligragemini/themes/default/icons/apply.svg
> +share/apps/calligragemini/themes/default/icons/back.svg
> +share/apps/calligragemini/themes/default/icons/camera-black.svg
> +share/apps/calligragemini/themes/default/icons/cancel-black.svg
> +share/apps/calligragemini/themes/default/icons/checker-small.svg
> +share/apps/calligragemini/themes/default/icons/close.svg
> +share/apps/calligragemini/themes/default/icons/color_wheel.svg
> +share/apps/calligragemini/themes/default/icons/colorpicker.svg
> +share/apps/calligragemini/themes/default/icons/combo-arrows-white.svg
> +share/apps/calligragemini/themes/default/icons/crop-black.svg
> +share/apps/calligragemini/themes/default/icons/crop.svg
> +share/apps/calligragemini/themes/default/icons/delete-black.svg
> +share/apps/calligragemini/themes/default/icons/delete.svg
> +share/apps/calligragemini/themes/default/icons/down.svg
> +share/apps/calligragemini/themes/default/icons/edit.svg
> +share/apps/calligragemini/themes/default/icons/erase.svg
> +share/apps/calligragemini/themes/default/icons/fileclip-black.svg
> +share/apps/calligragemini/themes/default/icons/fileclip.svg
> +share/apps/calligragemini/themes/default/icons/filenew-black.svg
> +share/apps/calligragemini/themes/default/icons/filenew.svg
> +share/apps/calligragemini/themes/default/icons/fileopen-black.svg
> +share/apps/calligragemini/themes/default/icons/fileopen.svg
> +share/apps/calligragemini/themes/default/icons/filesave.svg
> +share/apps/calligragemini/themes/default/icons/filesaveas.svg
> +share/apps/calligragemini/themes/default/icons/fileshare.svg
> +share/apps/calligragemini/themes/default/icons/fill-black.svg
> +share/apps/calligragemini/themes/default/icons/fill.svg
> +share/apps/calligragemini/themes/default/icons/filter_delete-black.svg
> +share/apps/calligragemini/themes/default/icons/filter_load-black.svg
> +share/apps/calligragemini/themes/default/icons/filter_save-black.svg
> +share/apps/calligragemini/themes/default/icons/forward.svg
> +share/apps/calligragemini/themes/default/icons/gradient-black.svg
> +share/apps/calligragemini/themes/default/icons/gradient.svg
> +share/apps/calligragemini/themes/default/icons/help.svg
>
+share/apps/calligragemini/themes/default/icons/intel-Words-Handle-cursor.svg

> +share/apps/calligragemini/themes/default/icons/krita_sketch.svg
> +share/apps/calligragemini/themes/default/icons/layer_filter-black.svg
> +share/apps/calligragemini/themes/default/icons/layer_group-black.svg
> +share/apps/calligragemini/themes/default/icons/layer_paint-black.svg
> +share/apps/calligragemini/themes/default/icons/locked_off-black.svg
> +share/apps/calligragemini/themes/default/icons/locked_off-small.svg
> +share/apps/calligragemini/themes/default/icons/locked_on-black.svg
> +share/apps/calligragemini/themes/default/icons/locked_on-small.svg
> +share/apps/calligragemini/themes/default/icons/minimize.svg
> +share/apps/calligragemini/themes/default/icons/mirror_c-black.svg
> +share/apps/calligragemini/themes/default/icons/mirror_h-black.svg
> +share/apps/calligragemini/themes/default/icons/mirror_v-black.svg
> +share/apps/calligragemini/themes/default/icons/move-black.svg
> +share/apps/calligragemini/themes/default/icons/move.svg
> +share/apps/calligragemini/themes/default/icons/paint-black.svg
> +share/apps/calligragemini/themes/default/icons/paint.svg
> +share/apps/calligragemini/themes/default/icons/palette-add-black.svg
> +share/apps/calligragemini/themes/default/icons/palette-black.svg
> +share/apps/calligragemini/themes/default/icons/palette-delete-black.svg
> +share/apps/calligragemini/themes/default/icons/palette.svg
> +share/apps/calligragemini/themes/default/icons/redo.svg
> +share/apps/calligragemini/themes/default/icons/select-add.svg
> +share/apps/calligragemini/themes/default/icons/select-apply.svg
> +share/apps/calligragemini/themes/default/icons/select-area.svg
> +share/apps/calligragemini/themes/default/icons/select-color.svg
> +share/apps/calligragemini/themes/default/icons/select-deselect.svg
> +share/apps/calligragemini/themes/default/icons/select-hide.svg
> +share/apps/calligragemini/themes/default/icons/select-intersect.svg
> +share/apps/calligragemini/themes/default/icons/select-polygon.svg
> +share/apps/calligragemini/themes/default/icons/select-rectangle.svg
> +share/apps/calligragemini/themes/default/icons/select-replace.svg
> +share/apps/calligragemini/themes/default/icons/select-reselect.svg
> +share/apps/calligragemini/themes/default/icons/select-show.svg
> +share/apps/calligragemini/themes/default/icons/select-sub.svg
> +share/apps/calligragemini/themes/default/icons/settings.svg
> +share/apps/calligragemini/themes/default/icons/switch.svg
> +share/apps/calligragemini/themes/default/icons/transform-black.svg
> +share/apps/calligragemini/themes/default/icons/transform.svg
> +share/apps/calligragemini/themes/default/icons/undo.svg
> +share/apps/calligragemini/themes/default/icons/up.svg
> +share/apps/calligragemini/themes/default/icons/visible_off-black.svg
> +share/apps/calligragemini/themes/default/icons/visible_off-small.svg
> +share/apps/calligragemini/themes/default/icons/visible_off.svg
> +share/apps/calligragemini/themes/default/icons/visible_on-black.svg
> +share/apps/calligragemini/themes/default/icons/visible_on-small.svg
> +share/apps/calligragemini/themes/default/icons/visible_on.svg
> +share/apps/calligragemini/themes/default/icons/web.svg
> +share/apps/calligragemini/themes/default/images/
> +share/apps/calligragemini/themes/default/images/Sticker-A.svg
> +share/apps/calligragemini/themes/default/images/Sticker-Apple.svg
> +share/apps/calligragemini/themes/default/images/Sticker-ArrowTarget.svg
> +share/apps/calligragemini/themes/default/images/Sticker-B.svg
> +share/apps/calligragemini/themes/default/images/Sticker-C.svg
> +share/apps/calligragemini/themes/default/images/Sticker-D.svg
> +share/apps/calligragemini/themes/default/images/Sticker-F.svg
> +share/apps/calligragemini/themes/default/images/Sticker-Feather.svg
> +share/apps/calligragemini/themes/default/images/Sticker-Lightbulb.svg
> +share/apps/calligragemini/themes/default/images/Sticker-OK.svg
> +share/apps/calligragemini/themes/default/images/Sticker-Ribbon.svg
> +share/apps/calligragemini/themes/default/images/Sticker-ThumbsUp.svg
> +share/apps/calligragemini/themes/default/images/busyindicator.png
> +share/apps/calligragemini/themes/default/images/divider.png
> +share/apps/calligragemini/themes/default/images/drop-corners.png
> +share/apps/calligragemini/themes/default/images/drop-shadows.png
> +share/apps/calligragemini/themes/default/images/header_krita_sketch.png
>
+share/apps/calligragemini/themes/default/images/header_krita_sketch_light.png
>
+share/apps/calligragemini/themes/default/images/intel-Stage-Slide-PieChart-Default.svg
>
+share/apps/calligragemini/themes/default/images/intel-Stage-Slide-PieChart-PieceTappedOn.svg
>
+share/apps/calligragemini/themes/default/images/intel-Words-Note-Circle-Green.svg
>
+share/apps/calligragemini/themes/default/images/intel-Words-Note-Circle-Red.svg
>
+share/apps/calligragemini/themes/default/images/intel-Words-Note-Circle-Yellow.svg

> +share/apps/calligragemini/themes/default/images/kritasketch.png
> +share/apps/calligragemini/themes/default/images/shadow.png
> +share/apps/calligragemini/themes/default/sizes.js
> +share/apps/calligragemini/themes/default/theme.qml
>  share/apps/cmake/modules/FindCalligraLibs.cmake
>  share/apps/color-schemes/
> -share/apps/color-schemes/Krita50.colors
>  share/apps/color-schemes/KritaBlender.colors
>  share/apps/color-schemes/KritaBright.colors
> -share/apps/color-schemes/KritaBrighter.colors
>  share/apps/color-schemes/KritaDark.colors
> -share/apps/color-schemes/KritaDarker.colors
> +share/apps/color-schemes/KritaNeutral.colors
>  share/apps/flow/
>  share/apps/flow/flow.rc
>  share/apps/flow/icons/
> @@ -5409,8 +5508,8 @@ share/apps/kexi/icons/hicolor/16x16/acti
>  share/apps/kexi/icons/hicolor/16x16/actions/clear_table_contents.png
>  share/apps/kexi/icons/hicolor/16x16/actions/close.png
>  share/apps/kexi/icons/hicolor/16x16/actions/combo.png
> +share/apps/kexi/icons/hicolor/16x16/actions/database-import.png
>  share/apps/kexi/icons/hicolor/16x16/actions/delete_table_row.png
> -share/apps/kexi/icons/hicolor/16x16/actions/document_import_database.png
>  share/apps/kexi/icons/hicolor/16x16/actions/form.png
>  share/apps/kexi/icons/hicolor/16x16/actions/form_action.png
>  share/apps/kexi/icons/hicolor/16x16/actions/form_newobj.png
> @@ -5438,12 +5537,9 @@ share/apps/kexi/icons/hicolor/16x16/acti
>  share/apps/kexi/icons/hicolor/16x16/actions/report_newobj.png
>  share/apps/kexi/icons/hicolor/16x16/actions/script.png
>  share/apps/kexi/icons/hicolor/16x16/actions/script_newobj.png
> -share/apps/kexi/icons/hicolor/16x16/actions/spring.png
> -share/apps/kexi/icons/hicolor/16x16/actions/spring_vertical.png
>  share/apps/kexi/icons/hicolor/16x16/actions/state_data.png
>  share/apps/kexi/icons/hicolor/16x16/actions/state_edit.png
>  share/apps/kexi/icons/hicolor/16x16/actions/state_sql.png
> -share/apps/kexi/icons/hicolor/16x16/actions/state_text.png
>  share/apps/kexi/icons/hicolor/16x16/actions/subform.png
>  share/apps/kexi/icons/hicolor/16x16/actions/table.png
>  share/apps/kexi/icons/hicolor/16x16/actions/table_newobj.png
> @@ -5475,10 +5571,10 @@ share/apps/kexi/icons/hicolor/22x22/acti
>  share/apps/kexi/icons/hicolor/22x22/actions/clear_table_contents.png
>  share/apps/kexi/icons/hicolor/22x22/actions/close.png
>  share/apps/kexi/icons/hicolor/22x22/actions/combo.png
> +share/apps/kexi/icons/hicolor/22x22/actions/database-import.png
>  share/apps/kexi/icons/hicolor/22x22/actions/dateedit.png
>  share/apps/kexi/icons/hicolor/22x22/actions/datetimeedit.png
>  share/apps/kexi/icons/hicolor/22x22/actions/delete_table_row.png
> -share/apps/kexi/icons/hicolor/22x22/actions/document_import_database.png
>  share/apps/kexi/icons/hicolor/22x22/actions/form.png
>  share/apps/kexi/icons/hicolor/22x22/actions/form_action.png
>  share/apps/kexi/icons/hicolor/22x22/actions/form_edit.png
> @@ -5514,12 +5610,9 @@ share/apps/kexi/icons/hicolor/22x22/acti
>  share/apps/kexi/icons/hicolor/22x22/actions/signalslot.png
>  share/apps/kexi/icons/hicolor/22x22/actions/slider.png
>  share/apps/kexi/icons/hicolor/22x22/actions/spin.png
> -share/apps/kexi/icons/hicolor/22x22/actions/spring.png
> -share/apps/kexi/icons/hicolor/22x22/actions/spring_vertical.png
>  share/apps/kexi/icons/hicolor/22x22/actions/state_data.png
>  share/apps/kexi/icons/hicolor/22x22/actions/state_edit.png
>  share/apps/kexi/icons/hicolor/22x22/actions/state_sql.png
> -share/apps/kexi/icons/hicolor/22x22/actions/state_text.png
>  share/apps/kexi/icons/hicolor/22x22/actions/subform.png
>  share/apps/kexi/icons/hicolor/22x22/actions/table.png
>  share/apps/kexi/icons/hicolor/22x22/actions/table_newobj.png
> @@ -5538,8 +5631,8 @@ share/apps/kexi/icons/hicolor/32x32/acti
>  share/apps/kexi/icons/hicolor/32x32/actions/business_user.png
>  share/apps/kexi/icons/hicolor/32x32/actions/clear_table_contents.png
>  share/apps/kexi/icons/hicolor/32x32/actions/close.png
> +share/apps/kexi/icons/hicolor/32x32/actions/database-import.png
>  share/apps/kexi/icons/hicolor/32x32/actions/delete_table_row.png
> -share/apps/kexi/icons/hicolor/32x32/actions/document_import_database.png
>  share/apps/kexi/icons/hicolor/32x32/actions/form.png
>  share/apps/kexi/icons/hicolor/32x32/actions/form_action.png
>  share/apps/kexi/icons/hicolor/32x32/actions/form_newobj.png
> @@ -5554,15 +5647,13 @@ share/apps/kexi/icons/hicolor/32x32/acti
>  share/apps/kexi/icons/hicolor/32x32/actions/query_newobj.png
>  share/apps/kexi/icons/hicolor/32x32/actions/report.png
>  share/apps/kexi/icons/hicolor/32x32/actions/report_newobj.png
> -share/apps/kexi/icons/hicolor/32x32/actions/spring.png
>  share/apps/kexi/icons/hicolor/32x32/actions/state_data.png
>  share/apps/kexi/icons/hicolor/32x32/actions/state_sql.png
> -share/apps/kexi/icons/hicolor/32x32/actions/state_text.png
>  share/apps/kexi/icons/hicolor/32x32/actions/table.png
>  share/apps/kexi/icons/hicolor/32x32/actions/table_newobj.png
>  share/apps/kexi/icons/hicolor/48x48/
>  share/apps/kexi/icons/hicolor/48x48/actions/
> -share/apps/kexi/icons/hicolor/48x48/actions/document_import_database.png
> +share/apps/kexi/icons/hicolor/48x48/actions/database-import.png
>  share/apps/kexi/icons/hicolor/48x48/actions/form_action.png
>  share/apps/kexi/icons/hicolor/48x48/actions/key.png
>  share/apps/kexi/icons/hicolor/64x64/
> @@ -5591,8 +5682,13 @@ share/apps/kexi/icons/oxygen/16x16/mimet
>
share/apps/kexi/icons/oxygen/16x16/mimetypes/application-x-kexiproject-sqlite3.png
>  share/apps/kexi/icons/oxygen/16x16/mimetypes/application-x-sqlite2.png
>  share/apps/kexi/icons/oxygen/16x16/mimetypes/application-x-sqlite3.png
> +share/apps/kexi/icons/oxygen/16x16/places/
> +share/apps/kexi/icons/oxygen/16x16/places/breeze-kexi-file-database.svgz
>
+share/apps/kexi/icons/oxygen/16x16/places/breeze-network-server-database.svgz
>  share/apps/kexi/icons/oxygen/22x22/
>  share/apps/kexi/icons/oxygen/22x22/actions/
> +share/apps/kexi/icons/oxygen/22x22/actions/breeze-database-import.svgz
>
+share/apps/kexi/icons/oxygen/22x22/actions/breeze-kexi-document-empty.svgz
>  share/apps/kexi/icons/oxygen/22x22/actions/data-source-tag.png
>  share/apps/kexi/icons/oxygen/22x22/actions/table.png
>  share/apps/kexi/icons/oxygen/22x22/mimetypes/
> @@ -5603,8 +5699,14 @@ share/apps/kexi/icons/oxygen/22x22/mimet
>
share/apps/kexi/icons/oxygen/22x22/mimetypes/application-x-kexiproject-sqlite3.png
>  share/apps/kexi/icons/oxygen/22x22/mimetypes/application-x-sqlite2.png
>  share/apps/kexi/icons/oxygen/22x22/mimetypes/application-x-sqlite3.png
> +share/apps/kexi/icons/oxygen/22x22/places/
> +share/apps/kexi/icons/oxygen/22x22/places/breeze-kexi-file-database.svgz
>
+share/apps/kexi/icons/oxygen/22x22/places/breeze-network-server-database.svgz
>  share/apps/kexi/icons/oxygen/32x32/
>  share/apps/kexi/icons/oxygen/32x32/actions/
>
+share/apps/kexi/icons/oxygen/32x32/actions/breeze-kexi-document-empty.svgz
> +share/apps/kexi/icons/oxygen/32x32/actions/kexi-document-empty.png
> +share/apps/kexi/icons/oxygen/32x32/actions/kexi-document-empty.svgz
>  share/apps/kexi/icons/oxygen/32x32/actions/table.png
>  share/apps/kexi/icons/oxygen/32x32/mimetypes/
>
share/apps/kexi/icons/oxygen/32x32/mimetypes/application-x-kexi-connectiondata.png
> @@ -5614,7 +5716,12 @@ share/apps/kexi/icons/oxygen/32x32/mimet
>
share/apps/kexi/icons/oxygen/32x32/mimetypes/application-x-kexiproject-sqlite3.png
>  share/apps/kexi/icons/oxygen/32x32/mimetypes/application-x-sqlite2.png
>  share/apps/kexi/icons/oxygen/32x32/mimetypes/application-x-sqlite3.png
> +share/apps/kexi/icons/oxygen/32x32/places/
> +share/apps/kexi/icons/oxygen/32x32/places/breeze-kexi-file-database.svgz
>
+share/apps/kexi/icons/oxygen/32x32/places/breeze-network-server-database.svgz
>  share/apps/kexi/icons/oxygen/48x48/
> +share/apps/kexi/icons/oxygen/48x48/actions/
> +share/apps/kexi/icons/oxygen/48x48/actions/kexi-document-empty.png
>  share/apps/kexi/icons/oxygen/48x48/mimetypes/
>
share/apps/kexi/icons/oxygen/48x48/mimetypes/application-x-kexi-connectiondata.png
>
share/apps/kexi/icons/oxygen/48x48/mimetypes/application-x-kexiproject-shortcut.png
> @@ -5624,6 +5731,8 @@ share/apps/kexi/icons/oxygen/48x48/mimet
>  share/apps/kexi/icons/oxygen/48x48/mimetypes/application-x-sqlite2.png
>  share/apps/kexi/icons/oxygen/48x48/mimetypes/application-x-sqlite3.png
>  share/apps/kexi/icons/oxygen/64x64/
> +share/apps/kexi/icons/oxygen/64x64/actions/
> +share/apps/kexi/icons/oxygen/64x64/actions/kexi-document-empty.svgz
>  share/apps/kexi/icons/oxygen/64x64/mimetypes/
>
share/apps/kexi/icons/oxygen/64x64/mimetypes/application-x-kexi-connectiondata.png
>
share/apps/kexi/icons/oxygen/64x64/mimetypes/application-x-kexiproject-shortcut.png

> @@ -5677,15 +5786,13 @@ share/apps/kexi/pics/
>  share/apps/kexi/pics/calligra-logo-black-glow.png
>  share/apps/kexi/pics/calligra-logo-white-glow.png
>  share/apps/kexi/pics/external-link.png
> -share/apps/kexi/pics/kexi-logo-white.png
> -share/apps/kexi/pics/kexi-logo.png
>  share/apps/kexi/status/
> -share/apps/kexi/status/2.8.6/
> -share/apps/kexi/status/2.8.6/contribution_details.ui
> -share/apps/kexi/status/2.8.6/contribution_help.ui
> -share/apps/kexi/status/2.8.6/status.rcc
> -share/apps/kexi/status/2.8.6/status.ui
> -share/apps/kexi/status/2.8.6/status_strings.ui
> +share/apps/kexi/status/2.9.0/
> +share/apps/kexi/status/2.9.0/contribution_details.ui
> +share/apps/kexi/status/2.9.0/contribution_help.ui
> +share/apps/kexi/status/2.9.0/status.rcc
> +share/apps/kexi/status/2.9.0/status.ui
> +share/apps/kexi/status/2.9.0/status_strings.ui
>  share/apps/koproperty/
>  share/apps/koproperty/icons/
>  share/apps/koproperty/icons/hicolor/
> @@ -5693,6 +5800,28 @@ share/apps/koproperty/icons/hicolor/16x1
>  share/apps/koproperty/icons/hicolor/16x16/actions/
>  share/apps/koproperty/icons/hicolor/16x16/actions/button_no.png
>  share/apps/krita/
> +share/apps/krita/actions/
> +share/apps/krita/actions/ArtisticTextToolFactoryID.action
> +share/apps/krita/actions/InteractionTool.action
> +share/apps/krita/actions/KisRulerAssistantTool.action
> +share/apps/krita/actions/KisToolCrop.action
> +share/apps/krita/actions/KisToolGrid.action
> +share/apps/krita/actions/KisToolPath.action
> +share/apps/krita/actions/KisToolPencil.action
> +share/apps/krita/actions/KisToolPerspectiveGrid.action
> +share/apps/krita/actions/KisToolPolygon.action
> +share/apps/krita/actions/KisToolPolyline.action
> +share/apps/krita/actions/KisToolSelectContiguous.action
> +share/apps/krita/actions/KisToolSelectElliptical.action
> +share/apps/krita/actions/KisToolSelectOutline.action
> +share/apps/krita/actions/KisToolSelectPath.action
> +share/apps/krita/actions/KisToolSelectPolygonal.action
> +share/apps/krita/actions/KisToolSelectRectangular.action
> +share/apps/krita/actions/KisToolSelectSimilar.action
> +share/apps/krita/actions/KisToolTransform.action
> +share/apps/krita/actions/PathToolFactoryId.action
> +share/apps/krita/actions/TextToolFactory_ID.action
> +share/apps/krita/actions/krita.action
>  share/apps/krita/brushes/
>  share/apps/krita/brushes/3_brush.png
>  share/apps/krita/brushes/3_dotted-flat.png
> @@ -5857,6 +5986,8 @@ share/apps/krita/brushes/z_study_pencil_
>  share/apps/krita/brushes/z_study_pencil_2Hb.gih
>  share/apps/krita/brushes/z_study_pencil_H.gih
>  share/apps/krita/brushes/z_study_pencil_H_h.gih
> +share/apps/krita/bundles/
> +share/apps/krita/bundles/README
>  share/apps/krita/defaultpresets/
>  share/apps/krita/defaultpresets/chalkbrush.kpp
>  share/apps/krita/defaultpresets/colorsmudge.kpp
> @@ -5905,7 +6036,6 @@ share/apps/krita/icons/hicolor/128x128/
>  share/apps/krita/icons/hicolor/128x128/actions/
>  share/apps/krita/icons/hicolor/128x128/actions/template_comics_empty.png
>  share/apps/krita/icons/hicolor/128x128/actions/template_dslr.png
> -share/apps/krita/icons/hicolor/128x128/actions/template_film.png
>  share/apps/krita/icons/hicolor/128x128/actions/template_texture.png
>  share/apps/krita/images/
>  share/apps/krita/images/krita-chalk.png
> @@ -5943,17 +6073,28 @@ share/apps/krita/paintoppresets/Airbrush
>  share/apps/krita/paintoppresets/Airbrush_linear_noisy.kpp
>  share/apps/krita/paintoppresets/Airbrush_pressure.kpp
>  share/apps/krita/paintoppresets/Basic_circle.kpp
> -share/apps/krita/paintoppresets/Basic_circle_wet.kpp
> +share/apps/krita/paintoppresets/Basic_mix.kpp
> +share/apps/krita/paintoppresets/Basic_mix_soft.kpp
>  share/apps/krita/paintoppresets/Basic_tip_default.kpp
>  share/apps/krita/paintoppresets/Basic_tip_gaussian.kpp
>  share/apps/krita/paintoppresets/Basic_tip_soft.kpp
> +share/apps/krita/paintoppresets/Basic_wet.kpp
> +share/apps/krita/paintoppresets/Basic_wet_soft.kpp
>  share/apps/krita/paintoppresets/Block_basic.kpp
>  share/apps/krita/paintoppresets/Block_bristles.kpp
>  share/apps/krita/paintoppresets/Block_fuzzy.kpp
>  share/apps/krita/paintoppresets/Block_mix_tilt.kpp
>  share/apps/krita/paintoppresets/Block_tilt.kpp
> +share/apps/krita/paintoppresets/Block_wet_tilt.kpp
> +share/apps/krita/paintoppresets/Bristle_Details.kpp
> +share/apps/krita/paintoppresets/Bristle_Large.kpp
> +share/apps/krita/paintoppresets/Bristle_Special_Blender.kpp
> +share/apps/krita/paintoppresets/Bristle_Squared.kpp
> +share/apps/krita/paintoppresets/Bristle_Tapered.kpp
> +share/apps/krita/paintoppresets/Bristle_Texture.kpp
>  share/apps/krita/paintoppresets/Bristle_frottis.kpp
>  share/apps/krita/paintoppresets/Bristles_hairy.kpp
> +share/apps/krita/paintoppresets/Bristles_mix.kpp
>  share/apps/krita/paintoppresets/Bristles_textured.kpp
>  share/apps/krita/paintoppresets/Bristles_wet.kpp
>  share/apps/krita/paintoppresets/Chalk_brush.kpp
> @@ -5974,12 +6115,6 @@ share/apps/krita/paintoppresets/FX_splat
>  share/apps/krita/paintoppresets/Fill_block.kpp
>  share/apps/krita/paintoppresets/Fill_circle.kpp
>  share/apps/krita/paintoppresets/Grid_square_25.kpp
> -share/apps/krita/paintoppresets/Hairy_Details.kpp
> -share/apps/krita/paintoppresets/Hairy_Large.kpp
> -share/apps/krita/paintoppresets/Hairy_Special_Blender.kpp
> -share/apps/krita/paintoppresets/Hairy_Squared.kpp
> -share/apps/krita/paintoppresets/Hairy_Tapered.kpp
> -share/apps/krita/paintoppresets/Hairy_Texture.kpp
>  share/apps/krita/paintoppresets/Hatch_crispy.kpp
>  share/apps/krita/paintoppresets/Hatch_cross_regular.kpp
>  share/apps/krita/paintoppresets/Hatch_cross_small.kpp
> @@ -5999,14 +6134,6 @@ share/apps/krita/paintoppresets/Layout_b
>  share/apps/krita/paintoppresets/Layout_circle_soft.kpp
>  share/apps/krita/paintoppresets/Layout_oval.kpp
>  share/apps/krita/paintoppresets/Layout_pen.kpp
> -share/apps/krita/paintoppresets/Mix_dull.kpp
> -share/apps/krita/paintoppresets/Mix_smear.kpp
> -share/apps/krita/paintoppresets/Mix_smear_soft.kpp
> -share/apps/krita/paintoppresets/Mixover_dull.kpp
> -share/apps/krita/paintoppresets/Mixover_dull_bristle_soft.kpp
> -share/apps/krita/paintoppresets/Mixover_dull_bristles.kpp
> -share/apps/krita/paintoppresets/Mixover_oil.kpp
> -share/apps/krita/paintoppresets/Mixover_smear.kpp
>  share/apps/krita/paintoppresets/Move_tool.kpp
>  share/apps/krita/paintoppresets/Pastel_texture_large.kpp
>  share/apps/krita/paintoppresets/Pastel_texture_thin.kpp
> @@ -6036,12 +6163,15 @@ share/apps/krita/paintoppresets/Smudge_r
>  share/apps/krita/paintoppresets/Smudge_rake_2.kpp
>  share/apps/krita/paintoppresets/Smudge_soft.kpp
>  share/apps/krita/paintoppresets/Smudge_textured.kpp
> +share/apps/krita/paintoppresets/Sparkle_wet.kpp
> +share/apps/krita/paintoppresets/Sparkle_wet_soft.kpp
>  share/apps/krita/paintoppresets/Special_FuzzyColor.kpp
>  share/apps/krita/paintoppresets/Special_dyna_dots.kpp
>  share/apps/krita/paintoppresets/Special_particles_crazy.kpp
>  share/apps/krita/paintoppresets/Splat_mix_cells.kpp
>  share/apps/krita/paintoppresets/Splat_texture.kpp
>  share/apps/krita/paintoppresets/Splat_texture_2.kpp
> +share/apps/krita/paintoppresets/Splat_wet_cells.kpp
>  share/apps/krita/paintoppresets/Splatter_thin.kpp
>  share/apps/krita/paintoppresets/Sponge_texture.kpp
>  share/apps/krita/paintoppresets/Spray_splat.kpp
> @@ -6135,6 +6265,8 @@ share/apps/krita/pics/
>  share/apps/krita/pics/AboutKrita.png
>  share/apps/krita/pics/addlayer.png
>  share/apps/krita/pics/addtofolder.png
> +share/apps/krita/pics/arrow-down.png
> +share/apps/krita/pics/arrow-right.png
>  share/apps/krita/pics/arrow_east.png
>  share/apps/krita/pics/arrow_north.png
>  share/apps/krita/pics/arrow_north_east.png
> @@ -6154,12 +6286,72 @@ share/apps/krita/pics/cursor-cross.xpm
>  share/apps/krita/pics/cursor-round.xpm
>  share/apps/krita/pics/cursor-triangle_lefthanded.xpm
>  share/apps/krita/pics/cursor-triangle_righthanded.xpm
> +share/apps/krita/pics/dark_addlayer.png
> +share/apps/krita/pics/dark_addtofolder.png
> +share/apps/krita/pics/dark_arrowdown.png
> +share/apps/krita/pics/dark_arrowupblr.png
> +share/apps/krita/pics/dark_calligraphy.png
> +share/apps/krita/pics/dark_deletelayer.png
> +share/apps/krita/pics/dark_draw-text.png
> +share/apps/krita/pics/dark_duplicatelayer.png
> +share/apps/krita/pics/dark_format-fill-color.png
> +share/apps/krita/pics/dark_krita_draw_path.png
> +share/apps/krita/pics/dark_krita_tool_color_fill.png
> +share/apps/krita/pics/dark_krita_tool_color_picker.png
> +share/apps/krita/pics/dark_krita_tool_dyna.png
> +share/apps/krita/pics/dark_krita_tool_editpath.png
> +share/apps/krita/pics/dark_krita_tool_ellipse.png
> +share/apps/krita/pics/dark_krita_tool_freehand.png
> +share/apps/krita/pics/dark_krita_tool_freehandvector.png
> +share/apps/krita/pics/dark_krita_tool_gradient.png
> +share/apps/krita/pics/dark_krita_tool_grid.png
> +share/apps/krita/pics/dark_krita_tool_line.png
> +share/apps/krita/pics/dark_krita_tool_measure.png
> +share/apps/krita/pics/dark_krita_tool_move.png
> +share/apps/krita/pics/dark_krita_tool_multihand.png
> +share/apps/krita/pics/dark_krita_tool_rectangle.png
> +share/apps/krita/pics/dark_krita_tool_ruler_assistant.png
> +share/apps/krita/pics/dark_krita_tool_transform.png
> +share/apps/krita/pics/dark_pattern.png
> +share/apps/krita/pics/dark_polyline.png
> +share/apps/krita/pics/dark_properties.png
> +share/apps/krita/pics/dark_removefromfolder.png
> +share/apps/krita/pics/dark_select.png
> +share/apps/krita/pics/dark_selection-mode_ants.png
> +share/apps/krita/pics/dark_selection-mode_invisible.png
> +share/apps/krita/pics/dark_selection-mode_mask.png
> +share/apps/krita/pics/dark_symmetry-horizontal.png
> +share/apps/krita/pics/dark_symmetry-vertical.png
> +share/apps/krita/pics/dark_tool_contiguous_selection.png
> +share/apps/krita/pics/dark_tool_crop.png
> +share/apps/krita/pics/dark_tool_elliptical_selection.png
> +share/apps/krita/pics/dark_tool_outline_selection.png
> +share/apps/krita/pics/dark_tool_path_selection.png
> +share/apps/krita/pics/dark_tool_perspectivegrid.png
> +share/apps/krita/pics/dark_tool_polygon.png
> +share/apps/krita/pics/dark_tool_polygonal_selection.png
> +share/apps/krita/pics/dark_tool_rect_selection.png
> +share/apps/krita/pics/dark_tool_similar_selection.png
> +share/apps/krita/pics/dark_transform_icons_cage.png
> +share/apps/krita/pics/dark_transform_icons_liquify_erase.png
> +share/apps/krita/pics/dark_transform_icons_liquify_main.png
> +share/apps/krita/pics/dark_transform_icons_liquify_move.png
> +share/apps/krita/pics/dark_transform_icons_liquify_offset.png
> +share/apps/krita/pics/dark_transform_icons_liquify_resize.png
> +share/apps/krita/pics/dark_transform_icons_liquify_rotate.png
> +share/apps/krita/pics/dark_transform_icons_liquify_rotateCCW.png
> +share/apps/krita/pics/dark_transform_icons_main.png
> +share/apps/krita/pics/dark_transform_icons_penPressure.png
> +share/apps/krita/pics/dark_transform_icons_perspective.png
> +share/apps/krita/pics/dark_transform_icons_warp.png
>  share/apps/krita/pics/delete.png
>  share/apps/krita/pics/deletelayer.png
>  share/apps/krita/pics/duplicatelayer.png
>  share/apps/krita/pics/eraser-toggle.png
> +share/apps/krita/pics/exposure-cursor-gesture.xpm
>  share/apps/krita/pics/extended_color_selector.png
>  share/apps/krita/pics/folder.png
> +share/apps/krita/pics/gamma-cursor-gesture.xpm
>  share/apps/krita/pics/height.png
>  share/apps/krita/pics/height_icon.png
>  share/apps/krita/pics/hi16-add_dialog.png
> @@ -6173,7 +6365,6 @@ share/apps/krita/pics/krita_tool_color_f
>  share/apps/krita/pics/krita_tool_color_picker.png
>  share/apps/krita/pics/krita_tool_dyna.png
>  share/apps/krita/pics/krita_tool_ellipse.png
> -share/apps/krita/pics/krita_tool_freehand.png
>  share/apps/krita/pics/krita_tool_freehandvector.png
>  share/apps/krita/pics/krita_tool_gradient.png
>  share/apps/krita/pics/krita_tool_grid.png
> @@ -6186,14 +6377,77 @@ share/apps/krita/pics/krita_tool_ruler_a
>  share/apps/krita/pics/krita_tool_transform.png
>  share/apps/krita/pics/krita_tool_transform_recursive.png
>  share/apps/krita/pics/landscape.png
> +share/apps/krita/pics/light_addlayer.png
> +share/apps/krita/pics/light_addtofolder.png
> +share/apps/krita/pics/light_arrowdown.png
> +share/apps/krita/pics/light_arrowupblr.png
> +share/apps/krita/pics/light_calligraphy.png
> +share/apps/krita/pics/light_deletelayer.png
> +share/apps/krita/pics/light_draw-text.png
> +share/apps/krita/pics/light_duplicatelayer.png
> +share/apps/krita/pics/light_format-fill-color.png
> +share/apps/krita/pics/light_krita_draw_path.png
> +share/apps/krita/pics/light_krita_tool_color_fill.png
> +share/apps/krita/pics/light_krita_tool_color_picker.png
> +share/apps/krita/pics/light_krita_tool_dyna.png
> +share/apps/krita/pics/light_krita_tool_editpath.png
> +share/apps/krita/pics/light_krita_tool_ellipse.png
> +share/apps/krita/pics/light_krita_tool_freehand.png
> +share/apps/krita/pics/light_krita_tool_freehandvector.png
> +share/apps/krita/pics/light_krita_tool_gradient.png
> +share/apps/krita/pics/light_krita_tool_grid.png
> +share/apps/krita/pics/light_krita_tool_line.png
> +share/apps/krita/pics/light_krita_tool_measure.png
> +share/apps/krita/pics/light_krita_tool_move.png
> +share/apps/krita/pics/light_krita_tool_multihand.png
> +share/apps/krita/pics/light_krita_tool_rectangle.png
> +share/apps/krita/pics/light_krita_tool_ruler_assistant.png
> +share/apps/krita/pics/light_krita_tool_transform.png
> +share/apps/krita/pics/light_pattern.png
> +share/apps/krita/pics/light_polyline.png
> +share/apps/krita/pics/light_properties.png
> +share/apps/krita/pics/light_removefromfolder.png
> +share/apps/krita/pics/light_select.png
> +share/apps/krita/pics/light_selection-mode_ants.png
> +share/apps/krita/pics/light_selection-mode_invisible.png
> +share/apps/krita/pics/light_selection-mode_mask.png
> +share/apps/krita/pics/light_symmetry-horizontal.png
> +share/apps/krita/pics/light_symmetry-vertical.png
> +share/apps/krita/pics/light_tool_contiguous_selection.png
> +share/apps/krita/pics/light_tool_crop.png
> +share/apps/krita/pics/light_tool_elliptical_selection.png
> +share/apps/krita/pics/light_tool_outline_selection.png
> +share/apps/krita/pics/light_tool_path_selection.png
> +share/apps/krita/pics/light_tool_perspectivegrid.png
> +share/apps/krita/pics/light_tool_polygon.png
> +share/apps/krita/pics/light_tool_polygonal_selection.png
> +share/apps/krita/pics/light_tool_rect_selection.png
> +share/apps/krita/pics/light_tool_similar_selection.png
> +share/apps/krita/pics/light_transform_icons_cage.png
> +share/apps/krita/pics/light_transform_icons_liquify_erase.png
> +share/apps/krita/pics/light_transform_icons_liquify_main.png
> +share/apps/krita/pics/light_transform_icons_liquify_move.png
> +share/apps/krita/pics/light_transform_icons_liquify_offset.png
> +share/apps/krita/pics/light_transform_icons_liquify_resize.png
> +share/apps/krita/pics/light_transform_icons_liquify_rotate.png
> +share/apps/krita/pics/light_transform_icons_liquify_rotateCCW.png
> +share/apps/krita/pics/light_transform_icons_main.png
> +share/apps/krita/pics/light_transform_icons_penPressure.png
> +share/apps/krita/pics/light_transform_icons_perspective.png
> +share/apps/krita/pics/light_transform_icons_warp.png
>  share/apps/krita/pics/linked.png
> +share/apps/krita/pics/linked2.png
>  share/apps/krita/pics/local_selection_active.png
>  share/apps/krita/pics/local_selection_inactive.png
>  share/apps/krita/pics/locked.png
> +share/apps/krita/pics/mirrorAxis-HorizontalMove.png
> +share/apps/krita/pics/mirrorAxis-Verti...
Reply | Threaded
Open this post in threaded view
|

Re: Update editors/calligra 2.9.4

Rafael Sadowski
In reply to this post by Rafael Sadowski
On Thu May 07, 2015 at 08:56:00PM +0200, Rafael Sadowski wrote:

> Hi ports@
>
> blow is an maintainer update to Calligra 2.9.4. Tested @amd64
>
> Infos: https://www.calligra.org/news/calligra-2-9-4-released/
>
> Cheers,
>
> Rafael
>

Simple update from 2.9.4 -> 2.9.5


Index: Makefile
===================================================================
RCS file: /cvs/ports/editors/calligra/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- Makefile 27 Mar 2015 08:11:26 -0000 1.7
+++ Makefile 17 Jun 2015 05:25:16 -0000
@@ -1,10 +1,9 @@
 # $OpenBSD: Makefile,v 1.7 2015/03/27 08:11:26 ajacoutot Exp $
 
 COMMENT = K Desktop Environment, office suite
-HOMEPAGE = http://www.calligra-suite.org/
-DISTNAME = calligra-2.8.7
+HOMEPAGE = https://www.calligra-suite.org/
+DISTNAME = calligra-2.9.5
 CATEGORIES = editors
-REVISION = 0
 
 DIST_SUBDIR = kde
 MASTER_SITES = ${MASTER_SITE_KDE:=stable/${DISTNAME}/}
@@ -71,13 +70,17 @@ SHARED_LIBS +=  planprivate            
 SHARED_LIBS +=  planworkapp               50.0 # 0.0
 SHARED_LIBS +=  planworkfactory           50.0 # 0.0
 SHARED_LIBS +=  rcps_plan                 50.0 # 0.0
-SHARED_LIBS +=  wordsprivate              50.0 # 0.0
 SHARED_LIBS +=  kformula                  50.0 # 13.0
 SHARED_LIBS +=  komsooxml                 50.0 # 13.0
 SHARED_LIBS +=  koodf2                    50.0 # 13.0
 SHARED_LIBS +=  koodfreader               50.0 # 13.0
 SHARED_LIBS +=  kotextlayout              50.0 # 13.0
 SHARED_LIBS +=  kovectorimage             50.0 # 13.0
+SHARED_LIBS +=  koversion                 0.0 # 14.0
+SHARED_LIBS +=  kritacolor                0.0 # 14.0
+SHARED_LIBS +=  wordsprivate              14.0 # 1.0
+SHARED_LIBS +=  libglobal                 0.0 # 14.0
+SHARED_LIBS +=  libkispsd                 0.0 # 14.0
 
 WANTLIB =  c m pthread z
 WANTLIB += GL GLEW GLU Half ICE Iex IlmImf IlmThread Imath SM X11 Xext Xi
@@ -85,23 +88,25 @@ WANTLIB += fontconfig
 WANTLIB += lib/qt4/QtDeclarative lib/qt4/QtWebKit lib/qt4/QtDBus
 WANTLIB += lib/qt4/QtGui lib/qt4/QtNetwork lib/qt4/QtSvg lib/qt4/QtOpenGL
 WANTLIB += lib/qt4/QtScript lib/qt4/QtXml
-WANTLIB += lib/qt4/Qt3Support lib/qt4/QtSql
+WANTLIB +=  lib/qt4/QtSql
 WANTLIB += ${KDE4LIB}/akonadi-contact ${KDE4LIB}/akonadi-kde
 WANTLIB += ${KDE4LIB}/kabc ${KDE4LIB}/kactivities
 WANTLIB += ${KDE4LIB}/kcalcore ${KDE4LIB}/kcmutils ${KDE4LIB}/kdcraw
-WANTLIB += ${KDE4LIB}/kde3support ${KDE4LIB}/kdeclarative
+WANTLIB += ${KDE4LIB}/kdeclarative
 WANTLIB += ${KDE4LIB}/kdeui ${KDE4LIB}/kfile ${KDE4LIB}/khtml
 WANTLIB += ${KDE4LIB}/kio ${KDE4LIB}/kjs ${KDE4LIB}/kmime
-WANTLIB += ${KDE4LIB}/knewstuff3 ${KDE4LIB}/knotifyconfig
+WANTLIB += ${KDE4LIB}/knotifyconfig
 WANTLIB += ${KDE4LIB}/kparts ${KDE4LIB}/kpimutils ${KDE4LIB}/kresources
 WANTLIB += ${KDE4LIB}/krosscore ${KDE4LIB}/krossui
-WANTLIB += ${KDE4LIB}/ktexteditor ${KDE4LIB}/marblewidget
+WANTLIB += ${KDE4LIB}/marblewidget
 WANTLIB += ${KDE4LIB}/nepomuk ${KDE4LIB}/nepomukutils
 WANTLIB += ${KDE4LIB}/okularcore
 WANTLIB += ${KDE4LIB}/phonon_sexperimental ${KDE4LIB}/threadweaver
 WANTLIB += OpenColorIO exiv2 fftw3 freetype glib-2.0 gsl icui18n icuuc
 WANTLIB += jpeg lcms2 mysqlclient openjpeg png poppler poppler-qt4 pqxx
 WANTLIB += qca2 soprano sqlite3 sybdb tiff
+WANTLIB += boost_system-mt curl ktexteditor gslcblas
+
 
 # kexi needs headers in postgresql,{-main,-server}
 # kexi needs all db drivers to be present while building
@@ -109,7 +114,7 @@ BUILD_DEPENDS = devel/boost \
  databases/mariadb \
  databases/postgresql,-main \
  databases/postgresql,-server \
- math/eigen2 \
+ math/eigen3 \
  productivity/librcps
 
 # kexi needs all db driver installed to run,
@@ -136,6 +141,7 @@ LIB_DEPENDS = databases/freetds \
  graphics/png \
  graphics/tiff \
  math/fftw3,double \
+ net/curl \
  print/poppler,,-qt4 \
  security/qca2 \
  textproc/icu4c \
Index: distinfo
===================================================================
RCS file: /cvs/ports/editors/calligra/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo 23 Dec 2014 13:45:17 -0000 1.3
+++ distinfo 17 Jun 2015 05:25:16 -0000
@@ -1,2 +1,2 @@
-SHA256 (kde/calligra-2.8.7.tar.xz) = r2uLdOoHflu/o5jjrpaGa5o8z7wQIk6fNB5ZZDvoDrU=
-SIZE (kde/calligra-2.8.7.tar.xz) = 138966248
+SHA256 (kde/calligra-2.9.5.tar.xz) = t4e1npeVFLSyAHRqD/5cs0T+3eyTIKkeM+J4DVkPURU=
+SIZE (kde/calligra-2.9.5.tar.xz) = 193832608
Index: patches/patch-cmake_modules_FindPoppler_cmake
===================================================================
RCS file: /cvs/ports/editors/calligra/patches/patch-cmake_modules_FindPoppler_cmake,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-cmake_modules_FindPoppler_cmake
--- patches/patch-cmake_modules_FindPoppler_cmake 12 Jul 2014 10:44:18 -0000 1.1.1.1
+++ patches/patch-cmake_modules_FindPoppler_cmake 17 Jun 2015 05:25:16 -0000
@@ -1,9 +1,9 @@
 $OpenBSD: patch-cmake_modules_FindPoppler_cmake,v 1.1.1.1 2014/07/12 10:44:18 zhuk Exp $
---- cmake/modules/FindPoppler.cmake.orig Sat Oct 12 10:17:41 2013
-+++ cmake/modules/FindPoppler.cmake Sun Oct 20 15:12:39 2013
-@@ -60,6 +60,10 @@ endif(POPPLER_FOUND)
+--- cmake/modules/FindPoppler.cmake.orig Wed Apr  1 15:27:00 2015
++++ cmake/modules/FindPoppler.cmake Mon Apr 27 00:31:55 2015
+@@ -60,6 +60,10 @@ endif()
  if (POPPLER_FOUND)
-   INCLUDE(CheckCXXSourceCompiles)
+   include(CheckCXXSourceCompiles)
 
 +  # Unbreak Qt4 linking after QT_USE_IMPORTED_TARGETS set in KDE config
 +  set(QT_USE_IMPORTED_TARGETS FALSE)
Index: patches/patch-kexi_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/editors/calligra/patches/patch-kexi_CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-kexi_CMakeLists_txt
--- patches/patch-kexi_CMakeLists_txt 12 Jul 2014 10:44:18 -0000 1.1.1.1
+++ patches/patch-kexi_CMakeLists_txt 17 Jun 2015 05:25:16 -0000
@@ -1,13 +1,13 @@
 $OpenBSD: patch-kexi_CMakeLists_txt,v 1.1.1.1 2014/07/12 10:44:18 zhuk Exp $
 Upstream bug?
---- kexi/CMakeLists.txt.orig Mon Mar 24 15:38:42 2014
-+++ kexi/CMakeLists.txt Sun May  4 13:19:27 2014
-@@ -88,7 +88,7 @@ set (PQXX_MAX_VERSION "5.0.0")
- macro_optional_find_package(PostgreSQL)
+--- kexi/CMakeLists.txt.orig Wed Apr  1 15:27:01 2015
++++ kexi/CMakeLists.txt Mon Apr 27 00:31:55 2015
+@@ -49,7 +49,7 @@ set (PQXX_MAX_VERSION "5.0.0")
+ macro_optional_find_package(CalligraPostgreSQL)
  macro_log_feature(POSTGRESQL_FOUND "libpq" "C application programmer's interface to PostgreSQL" "http://www.postgresql.org" FALSE "" "Required by Kexi PostgreSQL driver")
 
 -pkg_check_modules (PQXX libpqxx)
 +macro_optional_find_package (Pqxx)
 
- IF (POSTGRESQL_FOUND AND PQXX_FOUND)
-    IF (PQXX_VERSION VERSION_GREATER PQXX_MIN_VERSION AND PQXX_VERSION VERSION_LESS PQXX_MAX_VERSION)
+ if (POSTGRESQL_FOUND AND PQXX_FOUND)
+    if (PQXX_VERSION VERSION_GREATER PQXX_MIN_VERSION AND PQXX_VERSION VERSION_LESS PQXX_MAX_VERSION)
Index: patches/patch-kexi_widget_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/editors/calligra/patches/patch-kexi_widget_CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-kexi_widget_CMakeLists_txt
--- patches/patch-kexi_widget_CMakeLists_txt 12 Jul 2014 10:44:18 -0000 1.1.1.1
+++ patches/patch-kexi_widget_CMakeLists_txt 17 Jun 2015 05:25:16 -0000
@@ -1,8 +1,8 @@
 $OpenBSD: patch-kexi_widget_CMakeLists_txt,v 1.1.1.1 2014/07/12 10:44:18 zhuk Exp $
 Unbreak build.
---- kexi/widget/CMakeLists.txt.orig Sun Oct 20 21:40:21 2013
-+++ kexi/widget/CMakeLists.txt Sun Oct 20 21:54:12 2013
-@@ -10,7 +10,7 @@ ENDIF(KEXI_MOBILE)
+--- kexi/widget/CMakeLists.txt.orig Wed Apr  1 15:27:01 2015
++++ kexi/widget/CMakeLists.txt Mon Apr 27 00:31:55 2015
+@@ -10,7 +10,7 @@ endif()
 
  add_definitions(-DKDE_DEFAULT_DEBUG_AREA=44023)
 
Index: patches/patch-krita_image_kis_painter_cc
===================================================================
RCS file: patches/patch-krita_image_kis_painter_cc
diff -N patches/patch-krita_image_kis_painter_cc
--- patches/patch-krita_image_kis_painter_cc 12 Jul 2014 13:06:22 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-$OpenBSD: patch-krita_image_kis_painter_cc,v 1.2 2014/07/12 13:06:22 zhuk Exp $
-REVIEW: https://git.reviewboard.kde.org/r/119244/
---- krita/image/kis_painter.cc.orig Sun Mar  2 15:46:08 2014
-+++ krita/image/kis_painter.cc Wed Mar  5 21:20:39 2014
-@@ -1393,7 +1393,7 @@ void KisPainter::drawLine(const QPointF& start, const
-     int dstX = x2-x1;
-     int dstY = y2-y1;
-
--    qreal _C = dstX*y1 - dstY*x1;
-+    qreal uniC = dstX*y1 - dstY*x1;
-     qreal projectionDenominator = 1.0 / (pow((double)dstX, 2) + pow((double)dstY, 2));
-
-     qreal subPixel;
-@@ -1439,7 +1439,7 @@ void KisPainter::drawLine(const QPointF& start, const
-                 AA_ = qMin( sqrt( pow((double)x - X1_, 2) + pow((double)y - Y1_, 2) ),
-                             sqrt( pow((double)x - X2_, 2) + pow((double)y - Y2_, 2) ));
-             }else{
--                AA_ = qAbs(dstY*x - dstX*y + _C) * denominator;
-+                AA_ = qAbs(dstY*x - dstX*y + uniC) * denominator;
-             }
-
-             if (AA_>halfWidth) {
Index: patches/patch-krita_plugins_extensions_gmic_3rdparty_gmic_CImg_h
===================================================================
RCS file: patches/patch-krita_plugins_extensions_gmic_3rdparty_gmic_CImg_h
diff -N patches/patch-krita_plugins_extensions_gmic_3rdparty_gmic_CImg_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-krita_plugins_extensions_gmic_3rdparty_gmic_CImg_h 17 Jun 2015 05:25:16 -0000
@@ -0,0 +1,61 @@
+$OpenBSD$
+
+Variables starting by underscore ("_") sign are reserved and should not be used
+in applications.
+
+--- krita/plugins/extensions/gmic/3rdparty/gmic/CImg.h.orig Mon May  4 21:17:23 2015
++++ krita/plugins/extensions/gmic/3rdparty/gmic/CImg.h Mon May  4 21:22:58 2015
+@@ -37389,19 +37389,19 @@ namespace cimg_library_suffixed {
+             else { if (!visible_cursor) { disp.show_mouse(); visible_cursor = true; }}
+             const int d = (depth()>1)?depth():0;
+             int
+-              _X = (int)X, _Y = (int)Y, _Z = (int)Z,
++              uniX = (int)X, uniY = (int)Y, uniZ = (int)Z,
+               w = disp.width(), W = width() + d,
+               h = disp.height(), H = height() + d,
+-              _xp = (int)(_X*(float)w/W), xp = _xp + ((int)(_xp*(float)W/w)!=_X?1:0),
+-              _yp = (int)(_Y*(float)h/H), yp = _yp + ((int)(_yp*(float)H/h)!=_Y?1:0),
+-              _xn = (int)((_X+1.0f)*w/W-1), xn = _xn + ((int)((_xn+1.0f)*W/w)!=_X+1?1:0),
+-              _yn = (int)((_Y+1.0f)*h/H-1), yn = _yn + ((int)((_yn+1.0f)*H/h)!=_Y+1?1:0),
+-              _zxp = (int)((_Z+width())*(float)w/W), zxp = _zxp + ((int)(_zxp*(float)W/w)!=_Z+width()?1:0),
+-              _zyp = (int)((_Z+height())*(float)h/H), zyp = _zyp + ((int)(_zyp*(float)H/h)!=_Z+height()?1:0),
+-              _zxn = (int)((_Z+width()+1.0f)*w/W-1), zxn = _zxn + ((int)((_zxn+1.0f)*W/w)!=_Z+width()+1?1:0),
+-              _zyn = (int)((_Z+height()+1.0f)*h/H-1), zyn = _zyn + ((int)((_zyn+1.0f)*H/h)!=_Z+height()+1?1:0),
+-              _xM = (int)(width()*(float)w/W-1), xM = _xM + ((int)((_xM+1.0f)*W/w)!=width()?1:0),
+-              _yM = (int)(height()*(float)h/H-1), yM = _yM + ((int)((_yM+1.0f)*H/h)!=height()?1:0),
++              unixp = (int)(uniX*(float)w/W), xp = unixp + ((int)(unixp*(float)W/w)!=uniX?1:0),
++              uniyp = (int)(uniY*(float)h/H), yp = uniyp + ((int)(uniyp*(float)H/h)!=uniY?1:0),
++              unixn = (int)((uniX+1.0f)*w/W-1), xn = unixn + ((int)((unixn+1.0f)*W/w)!=uniX+1?1:0),
++              uniyn = (int)((uniY+1.0f)*h/H-1), yn = uniyn + ((int)((uniyn+1.0f)*H/h)!=uniY+1?1:0),
++              unizxp = (int)((uniZ+width())*(float)w/W), zxp = unizxp + ((int)(unizxp*(float)W/w)!=uniZ+width()?1:0),
++              unizyp = (int)((uniZ+height())*(float)h/H), zyp = unizyp + ((int)(unizyp*(float)H/h)!=uniZ+height()?1:0),
++              unizxn = (int)((uniZ+width()+1.0f)*w/W-1), zxn = unizxn + ((int)((unizxn+1.0f)*W/w)!=uniZ+width()+1?1:0),
++              unizyn = (int)((uniZ+height()+1.0f)*h/H-1), zyn = unizyn + ((int)((unizyn+1.0f)*H/h)!=uniZ+height()+1?1:0),
++              unixM = (int)(width()*(float)w/W-1), xM = unixM + ((int)((unixM+1.0f)*W/w)!=width()?1:0),
++              uniyM = (int)(height()*(float)h/H-1), yM = uniyM + ((int)((uniyM+1.0f)*H/h)!=height()?1:0),
+               xc = (xp + xn)/2,
+               yc = (yp + yn)/2,
+               zxc = (zxp + zxn)/2,
+@@ -37439,14 +37439,14 @@ namespace cimg_library_suffixed {
+             // Draw selection.
+             if (phase) {
+               const int
+-                _xp0 = (int)(X0*(float)w/W), xp0 = _xp0 + ((int)(_xp0*(float)W/w)!=X0?1:0),
+-                _yp0 = (int)(Y0*(float)h/H), yp0 = _yp0 + ((int)(_yp0*(float)H/h)!=Y0?1:0),
+-                _xn0 = (int)((X0+1.0f)*w/W-1), xn0 = _xn0 + ((int)((_xn0+1.0f)*W/w)!=X0+1?1:0),
+-                _yn0 = (int)((Y0+1.0f)*h/H-1), yn0 = _yn0 + ((int)((_yn0+1.0f)*H/h)!=Y0+1?1:0),
+-                _zxp0 = (int)((Z0+width())*(float)w/W), zxp0 = _zxp0 + ((int)(_zxp0*(float)W/w)!=Z0+width()?1:0),
+-                _zyp0 = (int)((Z0+height())*(float)h/H), zyp0 = _zyp0 + ((int)(_zyp0*(float)H/h)!=Z0+height()?1:0),
+-                _zxn0 = (int)((Z0+width()+1.0f)*w/W-1), zxn0 = _zxn0 + ((int)((_zxn0+1.0f)*W/w)!=Z0+width()+1?1:0),
+-                _zyn0 = (int)((Z0+height()+1.0f)*h/H-1), zyn0 = _zyn0 + ((int)((_zyn0+1.0f)*H/h)!=Z0+height()+1?1:0),
++                unixp0 = (int)(X0*(float)w/W), xp0 = unixp0 + ((int)(unixp0*(float)W/w)!=X0?1:0),
++                uniyp0 = (int)(Y0*(float)h/H), yp0 = uniyp0 + ((int)(uniyp0*(float)H/h)!=Y0?1:0),
++                unixn0 = (int)((X0+1.0f)*w/W-1), xn0 = unixn0 + ((int)((unixn0+1.0f)*W/w)!=X0+1?1:0),
++                uniyn0 = (int)((Y0+1.0f)*h/H-1), yn0 = uniyn0 + ((int)((uniyn0+1.0f)*H/h)!=Y0+1?1:0),
++                unizxp0 = (int)((Z0+width())*(float)w/W), zxp0 = unizxp0 + ((int)(unizxp0*(float)W/w)!=Z0+width()?1:0),
++                unizyp0 = (int)((Z0+height())*(float)h/H), zyp0 = unizyp0 + ((int)(unizyp0*(float)H/h)!=Z0+height()?1:0),
++                unizxn0 = (int)((Z0+width()+1.0f)*w/W-1), zxn0 = unizxn0 + ((int)((unizxn0+1.0f)*W/w)!=Z0+width()+1?1:0),
++                unizyn0 = (int)((Z0+height()+1.0f)*h/H-1), zyn0 = unizyn0 + ((int)((unizyn0+1.0f)*H/h)!=Z0+height()+1?1:0),
+                 xc0 = (xp0 + xn0)/2,
+                 yc0 = (yp0 + yn0)/2,
+                 zxc0 = (zxp0 + zxn0)/2,
Index: patches/patch-plan_libs_kernel_tests_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/editors/calligra/patches/patch-plan_libs_kernel_tests_CMakeLists_txt,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-plan_libs_kernel_tests_CMakeLists_txt
--- patches/patch-plan_libs_kernel_tests_CMakeLists_txt 15 Jan 2015 18:13:52 -0000 1.1
+++ patches/patch-plan_libs_kernel_tests_CMakeLists_txt 17 Jun 2015 05:25:16 -0000
@@ -3,9 +3,9 @@ $OpenBSD: patch-plan_libs_kernel_tests_C
 Rename some targets to avoid generating multiple ninja rules with
 the same name
 
---- plan/libs/kernel/tests/CMakeLists.txt.orig Sun Nov 30 08:02:20 2014
-+++ plan/libs/kernel/tests/CMakeLists.txt Thu Jan 15 09:35:44 2015
-@@ -73,9 +73,9 @@ target_link_libraries(ScheduleTester  ${KDE4_KDECORE_L
+--- plan/libs/kernel/tests/CMakeLists.txt.orig Wed Apr  1 15:27:05 2015
++++ plan/libs/kernel/tests/CMakeLists.txt Mon Apr 27 00:31:55 2015
+@@ -78,9 +78,9 @@ target_link_libraries(ScheduleTester  ${KDE4_KDECORE_L
  set(ProjectTester_SRCS ProjectTester.cpp )
   
   
Index: patches/patch-plan_plugins_schedulers_tj_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/editors/calligra/patches/patch-plan_plugins_schedulers_tj_CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-plan_plugins_schedulers_tj_CMakeLists_txt
--- patches/patch-plan_plugins_schedulers_tj_CMakeLists_txt 12 Jul 2014 10:44:18 -0000 1.1.1.1
+++ patches/patch-plan_plugins_schedulers_tj_CMakeLists_txt 17 Jun 2015 05:25:16 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-plan_plugins_schedulers_tj_CMakeLists_txt,v 1.1.1.1 2014/07/12 10:44:18 zhuk Exp $
 XXX allow to build
---- plan/plugins/schedulers/tj/CMakeLists.txt.orig Thu Dec 26 13:04:14 2013
-+++ plan/plugins/schedulers/tj/CMakeLists.txt Thu Dec 26 13:04:40 2013
+--- plan/plugins/schedulers/tj/CMakeLists.txt.orig Wed Apr  1 15:27:05 2015
++++ plan/plugins/schedulers/tj/CMakeLists.txt Mon Apr 27 00:31:55 2015
 @@ -3,7 +3,7 @@ set(LIBTJ_INCLUDE_DIR taskjuggler)
  include_directories( ${LIBTJ_INCLUDE_DIR} ${KOODF_INCLUDES} ${CMAKE_SOURCE_DIR}/plan/libs/kernel ${KDE4_INCLUDES} )
 
@@ -9,5 +9,5 @@ XXX allow to build
 -add_subdirectory( tests )
 +#add_subdirectory( tests )
 
- SET ( TJScheduler_SRCS
+ set ( TJScheduler_SRCS
      PlanTJPlugin.cpp
Index: patches/patch-plugins_semanticitems_contact_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/editors/calligra/patches/patch-plugins_semanticitems_contact_CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-plugins_semanticitems_contact_CMakeLists_txt
--- patches/patch-plugins_semanticitems_contact_CMakeLists_txt 12 Jul 2014 10:44:18 -0000 1.1.1.1
+++ patches/patch-plugins_semanticitems_contact_CMakeLists_txt 17 Jun 2015 05:25:16 -0000
@@ -1,12 +1,12 @@
 $OpenBSD: patch-plugins_semanticitems_contact_CMakeLists_txt,v 1.1.1.1 2014/07/12 10:44:18 zhuk Exp $
 Unbreak build.
---- plugins/semanticitems/contact/CMakeLists.txt.orig Fri Jul 11 19:04:57 2014
-+++ plugins/semanticitems/contact/CMakeLists.txt Fri Jul 11 19:05:22 2014
-@@ -25,6 +25,7 @@ endif (KdepimLibs_FOUND)
+--- plugins/semanticitems/contact/CMakeLists.txt.orig Wed Apr  1 15:28:07 2015
++++ plugins/semanticitems/contact/CMakeLists.txt Mon Apr 27 00:31:56 2015
+@@ -25,6 +25,7 @@ endif ()
 
  target_link_libraries(calligra_semanticitem_contact ${KDE4_KDECORE_LIBS}  ${KORDF_LIBS})
 
 +add_definitions(-DBOOST_NO_EXCEPTIONS)
 
  install(TARGETS calligra_semanticitem_contact  DESTINATION ${PLUGIN_INSTALL_DIR})
- install(FILES   calligra_semanticitem_contact.desktop  DESTINATION ${SERVICES_INSTALL_DIR})
+ install(FILES   calligra_semanticitem_contact.desktop  DESTINATION ${SERVICES_INSTALL_DIR}/calligra)
Index: patches/patch-stage_part_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/editors/calligra/patches/patch-stage_part_CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-stage_part_CMakeLists_txt
--- patches/patch-stage_part_CMakeLists_txt 12 Jul 2014 10:44:18 -0000 1.1.1.1
+++ patches/patch-stage_part_CMakeLists_txt 17 Jun 2015 05:25:16 -0000
@@ -1,9 +1,9 @@
 $OpenBSD: patch-stage_part_CMakeLists_txt,v 1.1.1.1 2014/07/12 10:44:18 zhuk Exp $
 Unbreak build.
---- stage/part/CMakeLists.txt.orig Fri Jul 11 18:09:42 2014
-+++ stage/part/CMakeLists.txt Fri Jul 11 18:10:18 2014
+--- stage/part/CMakeLists.txt.orig Wed Apr  1 15:28:07 2015
++++ stage/part/CMakeLists.txt Mon Apr 27 00:31:56 2015
 @@ -12,6 +12,8 @@ if (!WIN32) ## Disable tests in Windows whilst they br
- endif(!WIN32)
+ endif()
  add_subdirectory(tools)
 
 +add_definitions(-DBOOST_NO_EXCEPTIONS)
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/editors/calligra/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST 23 Dec 2014 13:45:17 -0000 1.3
+++ pkg/PLIST 17 Jun 2015 05:25:16 -0000
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2014/12/23 13:45:17 zhuk Exp $
+@comment $OpenBSD$
 @conflict koffice-*
 @bin bin/braindump
 @bin bin/calligra
@@ -6,6 +6,8 @@
 @bin bin/calligraauthor
 @bin bin/calligraconverter
 @bin bin/calligraflow
+@bin bin/calligragemini
+@bin bin/calligrageminithumbnailhelper
 @bin bin/calligraplan
 @bin bin/calligraplanwork
 @bin bin/calligrasheets
@@ -18,18 +20,13 @@
 @bin bin/kexi
 @bin bin/kexi_sqlite3_dump
 @bin bin/krita
-@bin bin/kritagemini
-@bin bin/kritasketch
 @bin bin/visualimagecompare
-include/kde4/KoPABackgroundTool.h
 include/kde4/calligra/
 include/kde4/calligra/DebugPigment.h
 include/kde4/calligra/Ko3dScene.h
 include/kde4/calligra/KoAnchorInlineObject.h
 include/kde4/calligra/KoAnchorTextRange.h
 include/kde4/calligra/KoAnnotationManager.h
-include/kde4/calligra/KoApplication.h
-include/kde4/calligra/KoApplicationAdaptor.h
 include/kde4/calligra/KoBasicHistogramProducers.h
 include/kde4/calligra/KoBookmark.h
 include/kde4/calligra/KoBookmarkManager.h
@@ -83,14 +80,11 @@ include/kde4/calligra/KoDockFactoryBase.
 include/kde4/calligra/KoDockRegistry.h
 include/kde4/calligra/KoDockWidgetTitleBar.h
 include/kde4/calligra/KoDockWidgetTitleBarButton.h
-include/kde4/calligra/KoDocument.h
-include/kde4/calligra/KoDocumentEntry.h
-include/kde4/calligra/KoDocumentInfo.h
+include/kde4/calligra/KoDocumentBase.h
 include/kde4/calligra/KoDocumentRdf.h
 include/kde4/calligra/KoDocumentRdfBase.h
 include/kde4/calligra/KoDocumentRdfEditWidget.h
 include/kde4/calligra/KoDocumentResourceManager.h
-include/kde4/calligra/KoDocumentSectionModel.h
 include/kde4/calligra/KoDom.h
 include/kde4/calligra/KoDpi.h
 include/kde4/calligra/KoDrag.h
@@ -104,9 +98,6 @@ include/kde4/calligra/KoEventActionRemov
 include/kde4/calligra/KoFallBackColorTransformation.h
 include/kde4/calligra/KoFileDialog.h
 include/kde4/calligra/KoFillConfigWidget.h
-include/kde4/calligra/KoFilter.h
-include/kde4/calligra/KoFilterChain.h
-include/kde4/calligra/KoFilterChainLinkList.h
 include/kde4/calligra/KoFilterEffect.h
 include/kde4/calligra/KoFilterEffectConfigWidgetBase.h
 include/kde4/calligra/KoFilterEffectFactoryBase.h
@@ -114,16 +105,6 @@ include/kde4/calligra/KoFilterEffectLoad
 include/kde4/calligra/KoFilterEffectRegistry.h
 include/kde4/calligra/KoFilterEffectRenderContext.h
 include/kde4/calligra/KoFilterEffectStack.h
-include/kde4/calligra/KoFilterEntry.h
-include/kde4/calligra/KoFilterGraph.h
-include/kde4/calligra/KoFilterManager.h
-include/kde4/calligra/KoFilterVertex.h
-include/kde4/calligra/KoFindBase.h
-include/kde4/calligra/KoFindMatch.h
-include/kde4/calligra/KoFindOption.h
-include/kde4/calligra/KoFindOptionSet.h
-include/kde4/calligra/KoFindText.h
-include/kde4/calligra/KoFindToolbar.h
 include/kde4/calligra/KoFlake.h
 include/kde4/calligra/KoFontFace.h
 include/kde4/calligra/KoFrameShape.h
@@ -155,32 +136,31 @@ include/kde4/calligra/KoLabDarkenColorTr
 include/kde4/calligra/KoLineStyleSelector.h
 include/kde4/calligra/KoList.h
 include/kde4/calligra/KoLoadingShapeUpdater.h
-include/kde4/calligra/KoMainWindow.h
 include/kde4/calligra/KoMixColorsOp.h
 include/kde4/calligra/KoMixColorsOpImpl.h
-include/kde4/calligra/KoModeBoxFactory.h
 include/kde4/calligra/KoOasisSettings.h
 include/kde4/calligra/KoOdf.h
 include/kde4/calligra/KoOdfBibliographyConfiguration.h
-include/kde4/calligra/KoOdfDocument.h
 include/kde4/calligra/KoOdfGraphicProperties.h
 include/kde4/calligra/KoOdfGraphicStyles.h
+include/kde4/calligra/KoOdfHeaderFooterProperties.h
 include/kde4/calligra/KoOdfLineNumberingConfiguration.h
 include/kde4/calligra/KoOdfLoadingContext.h
 include/kde4/calligra/KoOdfManifestEntry.h
 include/kde4/calligra/KoOdfNotesConfiguration.h
 include/kde4/calligra/KoOdfNumberDefinition.h
 include/kde4/calligra/KoOdfNumberStyles.h
+include/kde4/calligra/KoOdfPageLayoutProperties.h
 include/kde4/calligra/KoOdfParagraphProperties.h
 include/kde4/calligra/KoOdfPaste.h
 include/kde4/calligra/KoOdfReadStore.h
 include/kde4/calligra/KoOdfStyle.h
+include/kde4/calligra/KoOdfStyleBase.h
 include/kde4/calligra/KoOdfStyleManager.h
 include/kde4/calligra/KoOdfStyleProperties.h
 include/kde4/calligra/KoOdfStylesReader.h
 include/kde4/calligra/KoOdfTextProperties.h
 include/kde4/calligra/KoOdfWriteStore.h
-include/kde4/calligra/KoOpacityConfigWidget.h
 include/kde4/calligra/KoPABackgroundTool.h
 include/kde4/calligra/KoPACanvas.h
 include/kde4/calligra/KoPACanvasBase.h
@@ -203,10 +183,8 @@ include/kde4/calligra/KoPageLayout.h
 include/kde4/calligra/KoPageLayoutDialog.h
 include/kde4/calligra/KoPageLayoutWidget.h
 include/kde4/calligra/KoPagePreviewWidget.h
-include/kde4/calligra/KoPageWidgetItem.h
 include/kde4/calligra/KoPanTool.h
 include/kde4/calligra/KoParameterToPathCommand.h
-include/kde4/calligra/KoPart.h
 include/kde4/calligra/KoPathCombineCommand.h
 include/kde4/calligra/KoPathControlPointMoveCommand.h
 include/kde4/calligra/KoPathFillRuleCommand.h
@@ -223,7 +201,6 @@ include/kde4/calligra/KoPencilTool.h
 include/kde4/calligra/KoPointedAt.h
 include/kde4/calligra/KoPointerEvent.h
 include/kde4/calligra/KoPositionSelector.h
-include/kde4/calligra/KoPrintJob.h
 include/kde4/calligra/KoProgressBar.h
 include/kde4/calligra/KoProgressProxy.h
 include/kde4/calligra/KoProgressUpdater.h
@@ -239,17 +216,20 @@ include/kde4/calligra/KoRdfSemanticTree.
 include/kde4/calligra/KoRdfSemanticTreeWidgetItem.h
 include/kde4/calligra/KoResourceItemChooser.h
 include/kde4/calligra/KoResourceItemChooserContextMenu.h
+include/kde4/calligra/KoResourceModelBase.h
 include/kde4/calligra/KoResourceSelector.h
 include/kde4/calligra/KoResourceServer.h
 include/kde4/calligra/KoResourceServerAdapter.h
 include/kde4/calligra/KoResourceServerObserver.h
 include/kde4/calligra/KoResourceServerProvider.h
 include/kde4/calligra/KoResourceTagStore.h
-include/kde4/calligra/KoResourceTaggingManager.h
 include/kde4/calligra/KoRgbColorSpaceTraits.h
 include/kde4/calligra/KoRow.h
 include/kde4/calligra/KoRowStyle.h
 include/kde4/calligra/KoSection.h
+include/kde4/calligra/KoSectionEnd.h
+include/kde4/calligra/KoSectionManager.h
+include/kde4/calligra/KoSectionUtils.h
 include/kde4/calligra/KoSelection.h
 include/kde4/calligra/KoSemanticStylesheet.h
 include/kde4/calligra/KoSemanticStylesheetsEditor.h
@@ -293,7 +273,6 @@ include/kde4/calligra/KoShapeUngroupComm
 include/kde4/calligra/KoShapeUserData.h
 include/kde4/calligra/KoSharedSavingData.h
 include/kde4/calligra/KoSizeGroup.h
-include/kde4/calligra/KoStandardAction.h
 include/kde4/calligra/KoStore.h
 include/kde4/calligra/KoStoreDevice.h
 include/kde4/calligra/KoStrokeConfigWidget.h
@@ -335,17 +314,11 @@ include/kde4/calligra/KoToolProxy.h
 include/kde4/calligra/KoToolRegistry.h
 include/kde4/calligra/KoToolSelection.h
 include/kde4/calligra/KoTriangleColorSelector.h
-include/kde4/calligra/KoUniColorChooser.h
-include/kde4/calligra/KoUniColorDialog.h
 include/kde4/calligra/KoUnit.h
 include/kde4/calligra/KoUpdater.h
 include/kde4/calligra/KoVariable.h
 include/kde4/calligra/KoVariableManager.h
-include/kde4/calligra/KoVersionDialog.h
-include/kde4/calligra/KoView.h
-include/kde4/calligra/KoViewAdaptor.h
 include/kde4/calligra/KoViewConverter.h
-include/kde4/calligra/KoXYColorSelector.h
 include/kde4/calligra/KoXmlNS.h
 include/kde4/calligra/KoXmlReader.h
 include/kde4/calligra/KoXmlReaderForward.h
@@ -357,7 +330,6 @@ include/kde4/calligra/KoZoomController.h
 include/kde4/calligra/KoZoomHandler.h
 include/kde4/calligra/KoZoomInput.h
 include/kde4/calligra/KoZoomMode.h
-include/kde4/calligra/MacSupport.h
 include/kde4/calligra/RdfForward.h
 include/kde4/calligra/RdfSemanticTreeWidgetAction.h
 include/kde4/calligra/RdfSemanticTreeWidgetSelectAction.h
@@ -372,18 +344,19 @@ include/kde4/calligra/changetracker/KoDe
 include/kde4/calligra/changetracker/KoDeletedRowColumnDataStore.h
 include/kde4/calligra/changetracker/KoDeletedRowData.cpp
 include/kde4/calligra/flake_export.h
-include/kde4/calligra/komain_export.h
 include/kde4/calligra/koodf2_export.h
 include/kde4/calligra/koodf_export.h
 include/kde4/calligra/kopageapp_export.h
 include/kde4/calligra/kordf_export.h
 include/kde4/calligra/kotext_export.h
 include/kde4/calligra/kotextlayout_export.h
+include/kde4/calligra/koversion_export.h
 include/kde4/calligra/kowidgets_export.h
 include/kde4/calligra/kowidgetutils_export.h
 include/kde4/calligra/kundo2_export.h
 include/kde4/calligra/kundo2command.h
 include/kde4/calligra/kundo2group.h
+include/kde4/calligra/kundo2magicstring.h
 include/kde4/calligra/kundo2model.h
 include/kde4/calligra/kundo2qstack.h
 include/kde4/calligra/kundo2stack.h
@@ -400,17 +373,8 @@ include/kde4/calligra/styles/KoTableCell
 include/kde4/calligra/styles/KoTableColumnStyle.h
 include/kde4/calligra/styles/KoTableRowStyle.h
 include/kde4/calligra/styles/KoTableStyle.h
-include/kde4/kexi/
-include/kde4/kexi/forms/
-include/kde4/kexi/forms/FormWidget.h
-include/kde4/kexi/forms/FormWidgetInterface.h
-include/kde4/kexi/forms/WidgetInfo.h
-include/kde4/kexi/forms/WidgetTreeWidget.h
-include/kde4/kexi/forms/objecttree.h
-include/kde4/kexi/forms/widgetfactory.h
-include/kde4/kexi/forms/widgetlibrary.h
-include/kde4/kexi/forms/widgetwithsubpropertiesinterface.h
 include/kde4/krita/
+include/kde4/krita/KisViewManager.h
 include/kde4/krita/fill_processing_visitor.h
 include/kde4/krita/kis_base_node.h
 include/kde4/krita/kis_base_processor.h
@@ -435,6 +399,9 @@ include/kde4/krita/kis_generator.h
 include/kde4/krita/kis_generator_registry.h
 include/kde4/krita/kis_global.h
 include/kde4/krita/kis_image.h
+include/kde4/krita/kis_locked_properties.h
+include/kde4/krita/kis_locked_properties_proxy.h
+include/kde4/krita/kis_locked_properties_server.h
 include/kde4/krita/kis_mask.h
 include/kde4/krita/kis_multi_bool_filter_widget.h
 include/kde4/krita/kis_multi_double_filter_widget.h
@@ -446,7 +413,7 @@ include/kde4/krita/kis_paint_device.h
 include/kde4/krita/kis_painter.h
 include/kde4/krita/kis_paintop_option.h
 include/kde4/krita/kis_paintop_options_model.h
-include/kde4/krita/kis_paintop_options_widget.h
+include/kde4/krita/kis_paintop_settings_widget.h
 include/kde4/krita/kis_perspectivetransform_worker.h
 include/kde4/krita/kis_processing_information.h
 include/kde4/krita/kis_properties_configuration.h
@@ -454,14 +421,12 @@ include/kde4/krita/kis_selection.h
 include/kde4/krita/kis_serializable_configuration.h
 include/kde4/krita/kis_shared.h
 include/kde4/krita/kis_shared_ptr.h
-include/kde4/krita/kis_shared_ptr_vector.h
 include/kde4/krita/kis_tiled_data_manager.h
 include/kde4/krita/kis_tool.h
 include/kde4/krita/kis_transaction.h
 include/kde4/krita/kis_transform_worker.h
 include/kde4/krita/kis_types.h
 include/kde4/krita/kis_ui_types.h
-include/kde4/krita/kis_view2.h
 include/kde4/krita/kis_warptransform_worker.h
 include/kde4/krita/krita_export.h
 include/kde4/sheets/
@@ -495,6 +460,10 @@ include/kde4/sheets/commands/
 include/kde4/sheets/commands/AbstractRegionCommand.h
 include/kde4/sheets/commands/DataManipulators.h
 include/kde4/sheets/commands/SortManipulator.h
+include/kde4/sheets/commands/pivot.h
+include/kde4/sheets/commands/pivotfilters.h
+include/kde4/sheets/commands/pivotmain.h
+include/kde4/sheets/commands/pivotoptions.h
 include/kde4/sheets/database/
 include/kde4/sheets/database/Database.h
 include/kde4/sheets/database/Filter.h
@@ -556,222 +525,20 @@ include/kde4/words/part/frames/KWTextFra
 include/kde4/words/part/words_export.h
 lib/calligra/
 lib/calligra/imports/
+lib/calligra/imports/Calligra/
+lib/calligra/imports/Calligra/Gemini/
+lib/calligra/imports/Calligra/Gemini/Dropbox/
+lib/calligra/imports/Calligra/Gemini/Dropbox/libcalligrageminidropboxplugin.so
+lib/calligra/imports/Calligra/Gemini/Dropbox/qmldir
 lib/calligra/imports/org/
+lib/calligra/imports/org/calligra/
+lib/calligra/imports/org/calligra/CalligraComponents/
+lib/calligra/imports/org/calligra/CalligraComponents/libcalligraqtquickcomponentsplugin.so
+lib/calligra/imports/org/calligra/CalligraComponents/qmldir
 lib/calligra/imports/org/krita/
 lib/calligra/imports/org/krita/draganddrop/
 lib/calligra/imports/org/krita/draganddrop/libdraganddropplugin.so
 lib/calligra/imports/org/krita/draganddrop/qmldir
-lib/calligra/imports/org/krita/sketch/
-lib/calligra/imports/org/krita/sketch/HelpPage.qml
-lib/calligra/imports/org/krita/sketch/KritaSketchBase.qml
-lib/calligra/imports/org/krita/sketch/MainPage.qml
-lib/calligra/imports/org/krita/sketch/OpenImagePage.qml
-lib/calligra/imports/org/krita/sketch/SaveImagePage.qml
-lib/calligra/imports/org/krita/sketch/SettingsPage.qml
-lib/calligra/imports/org/krita/sketch/WelcomePage.qml
-lib/calligra/imports/org/krita/sketch/components/
-lib/calligra/imports/org/krita/sketch/components/BusyIndicator.qml
-lib/calligra/imports/org/krita/sketch/components/Button.qml
-lib/calligra/imports/org/krita/sketch/components/CategorySwitcher.qml
-lib/calligra/imports/org/krita/sketch/components/CheckBox.qml
-lib/calligra/imports/org/krita/sketch/components/ColorSwatch.qml
-lib/calligra/imports/org/krita/sketch/components/Dialog.qml
-lib/calligra/imports/org/krita/sketch/components/Divider.qml
-lib/calligra/imports/org/krita/sketch/components/DropShadow.qml
-lib/calligra/imports/org/krita/sketch/components/ExpandingListView.qml
-lib/calligra/imports/org/krita/sketch/components/Header.qml
-lib/calligra/imports/org/krita/sketch/components/Label.qml
-lib/calligra/imports/org/krita/sketch/components/ListItem.qml
-lib/calligra/imports/org/krita/sketch/components/MessageStack.qml
-lib/calligra/imports/org/krita/sketch/components/NewImageList.qml
-lib/calligra/imports/org/krita/sketch/components/NewsList.qml
-lib/calligra/imports/org/krita/sketch/components/Page.qml
-lib/calligra/imports/org/krita/sketch/components/PageStack.js
-lib/calligra/imports/org/krita/sketch/components/PageStack.qml
-lib/calligra/imports/org/krita/sketch/components/PanelTextField.qml
-lib/calligra/imports/org/krita/sketch/components/RangeInput.qml
-lib/calligra/imports/org/krita/sketch/components/RecentFilesList.qml
-lib/calligra/imports/org/krita/sketch/components/ScrollDecorator.qml
-lib/calligra/imports/org/krita/sketch/components/Slider.qml
-lib/calligra/imports/org/krita/sketch/components/TextField.qml
-lib/calligra/imports/org/krita/sketch/components/TextFieldMultiline.qml
-lib/calligra/imports/org/krita/sketch/components/VirtualKeyboard.qml
-lib/calligra/imports/org/krita/sketch/images/
-lib/calligra/imports/org/krita/sketch/images/blue.png
-lib/calligra/imports/org/krita/sketch/images/busyindicator.png
-lib/calligra/imports/org/krita/sketch/images/camera-web.png
-lib/calligra/imports/org/krita/sketch/images/configure.png
-lib/calligra/imports/org/krita/sketch/images/divider.png
-lib/calligra/imports/org/krita/sketch/images/divider2.png
-lib/calligra/imports/org/krita/sketch/images/document-new.png
-lib/calligra/imports/org/krita/sketch/images/document-open.png
-lib/calligra/imports/org/krita/sketch/images/document-save-as.png
-lib/calligra/imports/org/krita/sketch/images/document-save.png
-lib/calligra/imports/org/krita/sketch/images/document-share.png
-lib/calligra/imports/org/krita/sketch/images/edit-copy.png
-lib/calligra/imports/org/krita/sketch/images/edit-cut.png
-lib/calligra/imports/org/krita/sketch/images/edit-paste.png
-lib/calligra/imports/org/krita/sketch/images/edit-redo.png
-lib/calligra/imports/org/krita/sketch/images/edit-select.png
-lib/calligra/imports/org/krita/sketch/images/edit-undo.png
-lib/calligra/imports/org/krita/sketch/images/green.png
-lib/calligra/imports/org/krita/sketch/images/handle-menu.png
-lib/calligra/imports/org/krita/sketch/images/header_krita_sketch.png
-lib/calligra/imports/org/krita/sketch/images/header_krita_sketch_light.png
-lib/calligra/imports/org/krita/sketch/images/header_red.png
-lib/calligra/imports/org/krita/sketch/images/help-about.png
-lib/calligra/imports/org/krita/sketch/images/image-x-generic.png
-lib/calligra/imports/org/krita/sketch/images/krita.png
-lib/calligra/imports/org/krita/sketch/images/kritasketch.png
-lib/calligra/imports/org/krita/sketch/images/red.png
-lib/calligra/imports/org/krita/sketch/images/shadow-bc.png
-lib/calligra/imports/org/krita/sketch/images/shadow-bl.png
-lib/calligra/imports/org/krita/sketch/images/shadow-br.png
-lib/calligra/imports/org/krita/sketch/images/shadow-lc.png
-lib/calligra/imports/org/krita/sketch/images/shadow-rc.png
-lib/calligra/imports/org/krita/sketch/images/shadow-smooth.png
-lib/calligra/imports/org/krita/sketch/images/shadow-tc.png
-lib/calligra/imports/org/krita/sketch/images/shadow-tl.png
-lib/calligra/imports/org/krita/sketch/images/shadow-tr.png
-lib/calligra/imports/org/krita/sketch/images/svg/
-lib/calligra/imports/org/krita/sketch/images/svg/checker-small.svg
-lib/calligra/imports/org/krita/sketch/images/svg/combo-arrows-white.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-A4landscape-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-A4portrait-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-add-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-add.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-apply-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-apply.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-back.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-camera-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-cancel-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-close.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-color_wheel.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-colorpicker.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-crop-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-crop.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-delete-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-delete.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-down.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-edit.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-erase.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-fileclip-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-filenew-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-filenew.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-fileopen-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-fileopen.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-filesave.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-filesaveas.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-fileshare.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-fill-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-fill.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-filter_delete-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-filter_load-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-filter_save-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-forward.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-gradient-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-gradient.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-help.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-krita_sketch.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-layer_filter-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-layer_group-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-layer_paint-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-locked_off-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-locked_on-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-minimize.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-mirror_c-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-mirror_h-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-mirror_v-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-move-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-move.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-paint-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-paint.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-palette-add-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-palette-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-palette-delete-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-palette.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-redo.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-select-add.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-select-apply.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-select-area.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-select-color.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-select-deselect.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-select-hide.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-select-intersect.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-select-polygon.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-select-rectangle.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-select-replace.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-select-reselect.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-select-show.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-select-sub.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-settings.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-switch.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-transform-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-transform.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-undo.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-up.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-visible_off-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-visible_off.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-visible_on-black.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-visible_on.svg
-lib/calligra/imports/org/krita/sketch/images/svg/icon-web.svg
-lib/calligra/imports/org/krita/sketch/libkritasketchplugin.so
-lib/calligra/imports/org/krita/sketch/panels/
-lib/calligra/imports/org/krita/sketch/panels/ColorPanel.qml
-lib/calligra/imports/org/krita/sketch/panels/EditLayerPage.qml
-lib/calligra/imports/org/krita/sketch/panels/EditPresetPage.qml
-lib/calligra/imports/org/krita/sketch/panels/FilterPanel.qml
-lib/calligra/imports/org/krita/sketch/panels/LayersPanel.qml
-lib/calligra/imports/org/krita/sketch/panels/MenuPanel.qml
-lib/calligra/imports/org/krita/sketch/panels/NewImagePanel.qml
-lib/calligra/imports/org/krita/sketch/panels/OpenImagePanel.qml
-lib/calligra/imports/org/krita/sketch/panels/Panel.qml
-lib/calligra/imports/org/krita/sketch/panels/PanelBar.qml
-lib/calligra/imports/org/krita/sketch/panels/PanelDropArea.qml
-lib/calligra/imports/org/krita/sketch/panels/PresetsPanel.qml
-lib/calligra/imports/org/krita/sketch/panels/SelectPanel.qml
-lib/calligra/imports/org/krita/sketch/panels/ToolOverlayPanel.qml
-lib/calligra/imports/org/krita/sketch/panels/ToolPanel.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/blur.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/brightnesscontrast.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/burn.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/colortoalpha.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/colortransfer.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/dodge.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/emboss.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/gaussian blur.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/gaussiannoisereducer.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/hsvadjustment.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/lens blur.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/levels.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/motion blur.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/noise.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/nothing-to-configure.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/oilpaint.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/perchannel.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/phongbumpmap.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/pixelize.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/raindrops.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/randompick.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/roundcorners.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/smalltiles.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/sobel.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/unsharp.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/wave.qml
-lib/calligra/imports/org/krita/sketch/panels/filterconfigpages/waveletnoisereducer.qml
-lib/calligra/imports/org/krita/sketch/panels/toolconfigpages/
-lib/calligra/imports/org/krita/sketch/panels/toolconfigpages/crop.qml
-lib/calligra/imports/org/krita/sketch/panels/toolconfigpages/fill.qml
-lib/calligra/imports/org/krita/sketch/panels/toolconfigpages/gradient.qml
-lib/calligra/imports/org/krita/sketch/panels/toolconfigpages/move.qml
-lib/calligra/imports/org/krita/sketch/panels/toolconfigpages/paint.qml
-lib/calligra/imports/org/krita/sketch/panels/toolconfigpages/transform.qml
-lib/calligra/imports/org/krita/sketch/panels/tooloverlays/
-lib/calligra/imports/org/krita/sketch/panels/tooloverlays/move.qml
-lib/calligra/imports/org/krita/sketch/panels/tooloverlays/none.qml
-lib/calligra/imports/org/krita/sketch/panels/tooloverlays/transform.qml
-lib/calligra/imports/org/krita/sketch/qmldir
 lib/kde4/authorpart.so
 lib/kde4/braindump_shape_state.so
 lib/kde4/braindump_shape_web.so
@@ -793,9 +560,11 @@ lib/kde4/calligra_filter_kpr2odp.so
 lib/kde4/calligra_filter_kspread2tex.so
 lib/kde4/calligra_filter_mpxj2plan.so
 lib/kde4/calligra_filter_odt2ascii.so
+lib/kde4/calligra_filter_odt2docx.so
 lib/kde4/calligra_filter_odt2epub2.so
 lib/kde4/calligra_filter_odt2html.so
 lib/kde4/calligra_filter_odt2mobi.so
+lib/kde4/calligra_filter_odt2wiki.so
 lib/kde4/calligra_filter_opencalc2sheets.so
 lib/kde4/calligra_filter_pdf2svg.so
 lib/kde4/calligra_filter_ppt2odp.so
@@ -905,6 +674,7 @@ lib/kde4/kritacolorgenerator.so
 lib/kde4/kritacolorrange.so
 lib/kde4/kritacolorselectorng.so
 lib/kde4/kritacolorsfilters.so
+lib/kde4/kritacolorslider.so
 lib/kde4/kritacolorsmudgepaintop.so
 lib/kde4/kritacolorspaceconversion.so
 lib/kde4/kritacompositiondocker.so
@@ -916,7 +686,6 @@ lib/kde4/kritadefaulttools.so
 lib/kde4/kritadeformpaintop.so
 lib/kde4/kritadigitalmixer.so
 lib/kde4/kritadodgeburn.so
-lib/kde4/kritadropshadow.so
 lib/kde4/kritadynapaintop.so
 lib/kde4/kritaembossfilter.so
 lib/kde4/kritaexample.so
@@ -926,22 +695,25 @@ lib/kde4/kritaexrimport.so
 lib/kde4/kritaextensioncolorsfilters.so
 lib/kde4/kritafastcolortransferfilter.so
 lib/kde4/kritafilterop.so
-lib/kde4/kritaflipbookimport.so
 lib/kde4/kritagmic.so
 lib/kde4/kritagridpaintop.so
 lib/kde4/kritahairypaintop.so
 lib/kde4/kritahatchingpaintop.so
+lib/kde4/kritaheightmapexport.so
+lib/kde4/kritaheightmapimport.so
 lib/kde4/kritahistogram.so
 lib/kde4/kritahistorydocker.so
 lib/kde4/kritaimagedocker.so
 lib/kde4/kritaimageenhancement.so
 lib/kde4/kritaimagesize.so
 lib/kde4/kritaimagesplit.so
+lib/kde4/kritaindexcolors.so
 lib/kde4/kritajp2export.so
 lib/kde4/kritajp2import.so
 lib/kde4/kritajpegexport.so
 lib/kde4/kritajpegimport.so
 lib/kde4/kritalayergroupswitcher.so
+lib/kde4/kritalayersplit.so
 lib/kde4/kritalevelfilter.so
 lib/kde4/kritalutdocker.so
 lib/kde4/kritametadataeditor.so
@@ -954,7 +726,6 @@ lib/kde4/kritaoraexport.so
 lib/kde4/kritaoraimport.so
 lib/kde4/kritaoverviewdocker.so
 lib/kde4/kritapalettedocker.so
-lib/kde4/kritapart.so
 lib/kde4/kritaparticlepaintop.so
 lib/kde4/kritapatterndocker.so
 lib/kde4/kritapatterngenerator.so
@@ -963,14 +734,17 @@ lib/kde4/kritaphongbumpmap.so
 lib/kde4/kritapixelizefilter.so
 lib/kde4/kritapngexport.so
 lib/kde4/kritapngimport.so
+lib/kde4/kritaposterize.so
 lib/kde4/kritappmexport.so
 lib/kde4/kritappmimport.so
 lib/kde4/kritapresetdocker.so
+lib/kde4/kritapresethistory.so
 lib/kde4/kritapsdexport.so
 lib/kde4/kritapsdimport.so
 lib/kde4/kritaqmlexport.so
 lib/kde4/kritaraindropsfilter.so
 lib/kde4/kritarandompickfilter.so
+lib/kde4/kritaresourcemanager.so
 lib/kde4/kritarotateimage.so
 lib/kde4/kritaroundcornersfilter.so
 lib/kde4/kritarulerassistanttool.so
@@ -984,6 +758,9 @@ lib/kde4/kritasobelfilter.so
 lib/kde4/kritaspecificcolorselector.so
 lib/kde4/kritaspraypaintop.so
 lib/kde4/kritatasksetdocker.so
+lib/kde4/kritatgaexport.so
+lib/kde4/kritatgaimport.so
+lib/kde4/kritathumbnail.so
 lib/kde4/kritatiffexport.so
 lib/kde4/kritatiffimport.so
 lib/kde4/kritatoolcrop.so
@@ -1015,6 +792,7 @@ lib/kde4/kspreadstatisticalmodule.so
 lib/kde4/kspreadtextmodule.so
 lib/kde4/kspreadtrigonometrymodule.so
 lib/kde4/okularGenerator_odp.so
+lib/kde4/okularGenerator_odt.so
 lib/kde4/planconvert/
 lib/kde4/planconvert/PlanConvert.jar
 lib/kde4/planicalexport.so
@@ -1022,6 +800,8 @@ lib/kde4/plankplatoimport.so
 lib/kde4/planpart.so
 lib/kde4/plantjscheduler.so
 lib/kde4/planworkpart.so
+lib/kde4/plugins/imageformats/kimg_kra.so
+lib/kde4/plugins/imageformats/kimg_ora.so
 lib/kde4/sheetssolver.so
 lib/kde4/wordspart.so
 @lib lib/libRtfReader.so.${LIBRtfReader_VERSION}
@@ -1045,7 +825,6 @@ lib/libkdeinit4_calligrasheets.so
 lib/libkdeinit4_calligrastage.so
 lib/libkdeinit4_calligrawords.so
 lib/libkdeinit4_karbon.so
-lib/libkdeinit4_krita.so
 @lib lib/libkexicore.so.${LIBkexicore_VERSION}
 @lib lib/libkexidatatable.so.${LIBkexidatatable_VERSION}
 @lib lib/libkexidataviewcommon.so.${LIBkexidataviewcommon_VERSION}
@@ -1073,29 +852,42 @@ lib/libkdeinit4_krita.so
 @lib lib/libkotext.so.${LIBkotext_VERSION}
 @lib lib/libkotextlayout.so.${LIBkotextlayout_VERSION}
 @lib lib/libkovectorimage.so.${LIBkovectorimage_VERSION}
+@lib lib/libkoversion.so.${LIBkoversion_VERSION}
 @lib lib/libkowidgets.so.${LIBkowidgets_VERSION}
 @lib lib/libkowidgetutils.so.${LIBkowidgetutils_VERSION}
 @lib lib/libkowv2.so.${LIBkowv2_VERSION}
 @lib lib/libkplatokernel.so.${LIBkplatokernel_VERSION}
 @lib lib/libkplatomodels.so.${LIBkplatomodels_VERSION}
 @lib lib/libkplatoui.so.${LIBkplatoui_VERSION}
+@lib lib/libkritacolor.so.${LIBkritacolor_VERSION}
+lib/libkritacolord.so
 @lib lib/libkritaimage.so.${LIBkritaimage_VERSION}
 @lib lib/libkritalibbrush.so.${LIBkritalibbrush_VERSION}
 @lib lib/libkritalibpaintop.so.${LIBkritalibpaintop_VERSION}
-lib/libkritasketchlib.so
 @lib lib/libkritaui.so.${LIBkritaui_VERSION}
 @lib lib/libkundo2.so.${LIBkundo2_VERSION}
+@lib lib/liblibglobal.so.${LIBlibglobal_VERSION}
+@lib lib/liblibkispsd.so.${LIBlibkispsd_VERSION}
 @lib lib/libpigmentcms.so.${LIBpigmentcms_VERSION}
 @lib lib/libplanprivate.so.${LIBplanprivate_VERSION}
 @lib lib/libplanworkapp.so.${LIBplanworkapp_VERSION}
 @lib lib/libplanworkfactory.so.${LIBplanworkfactory_VERSION}
 @lib lib/librcps_plan.so.${LIBrcps_plan_VERSION}
 @lib lib/libwordsprivate.so.${LIBwordsprivate_VERSION}
+share/appdata/braindump.appdata.xml
+share/appdata/flow.appdata.xml
+share/appdata/karbon.appdata.xml
+share/appdata/kexi.appdata.xml
 share/appdata/krita.appdata.xml
-share/applications/calligraactive.desktop
+share/appdata/plan.appdata.xml
+share/appdata/sheets.appdata.xml
+share/appdata/stage.appdata.xml
+share/appdata/words.appdata.xml
 share/applications/kde4/author.desktop
 share/applications/kde4/braindump.desktop
 share/applications/kde4/calligra.desktop
+share/applications/kde4/calligraactive.desktop
+share/applications/kde4/calligragemini.desktop
 share/applications/kde4/calligrawords_ascii.desktop
 share/applications/kde4/flow.desktop
 share/applications/kde4/karbon.desktop
@@ -1103,7 +895,7 @@ share/applications/kde4/kexi.desktop
 share/applications/kde4/krita.desktop
 share/applications/kde4/krita_bmp.desktop
 share/applications/kde4/krita_exr.desktop
-share/applications/kde4/krita_flipbook.desktop
+share/applications/kde4/krita_heightmap.desktop
 share/applications/kde4/krita_jp2.desktop
 share/applications/kde4/krita_jpeg.desktop
 share/applications/kde4/krita_odg.desktop
@@ -1113,11 +905,13 @@ share/applications/kde4/krita_png.deskto
 share/applications/kde4/krita_ppm.desktop
 share/applications/kde4/krita_psd.desktop
 share/applications/kde4/krita_raw.desktop
+share/applications/kde4/krita_tga.desktop
 share/applications/kde4/krita_tiff.desktop
 share/applications/kde4/krita_xcf.desktop
-share/applications/kde4/kritagemini.desktop
-share/applications/kde4/kritasketch.desktop
+share/applications/kde4/okularApplication_doc_calligra.desktop
+share/applications/kde4/okularApplication_docx_calligra.desktop
 share/applications/kde4/okularApplication_odp.desktop
+share/applications/kde4/okularApplication_odt.desktop
 share/applications/kde4/plan.desktop
 share/applications/kde4/planwork.desktop
 share/applications/kde4/sheets.desktop
@@ -1151,6 +945,7 @@ share/apps/calligra/icons/hicolor/128x12
 share/apps/calligra/icons/hicolor/128x128/actions/template_ratio_1610.png
 share/apps/calligra/icons/hicolor/128x128/actions/template_ratio_2391.png
 share/apps/calligra/icons/hicolor/128x128/actions/template_ratio_43.png
+share/apps/calligra/icons/hicolor/128x128/actions/template_web_design.png
 share/apps/calligra/icons/hicolor/16x16/
 share/apps/calligra/icons/hicolor/16x16/actions/
 share/apps/calligra/icons/hicolor/16x16/actions/abs.png
@@ -1425,18 +1220,322 @@ share/apps/calligra/palettes/swatch-colo
 share/apps/calligra/palettes/swatch-rgb.gpl
 share/apps/calligra/palettes/swatche.gpl
 share/apps/calligra/palettes/web.gpl
+share/apps/calligra/pics/
+share/apps/calligra/pics/dark_docker_close.png
+share/apps/calligra/pics/dark_docker_collapse_a.png
+share/apps/calligra/pics/dark_docker_collapse_b.png
+share/apps/calligra/pics/dark_docker_float.png
+share/apps/calligra/pics/dark_docker_lock_a.png
+share/apps/calligra/pics/dark_docker_lock_b.png
+share/apps/calligra/pics/light_docker_close.png
+share/apps/calligra/pics/light_docker_collapse_a.png
+share/apps/calligra/pics/light_docker_collapse_b.png
+share/apps/calligra/pics/light_docker_float.png
+share/apps/calligra/pics/light_docker_lock_a.png
+share/apps/calligra/pics/light_docker_lock_b.png
 share/apps/calligra/styles/
 share/apps/calligra/styles/markers.xml
 share/apps/calligra/thesaurus/
 share/apps/calligra/thesaurus/thesaurus.txt
+share/apps/calligragemini/
+share/apps/calligragemini/calligragemini.qml
+share/apps/calligragemini/qml/
+share/apps/calligragemini/qml/MainPage.qml
+share/apps/calligragemini/qml/PresentationDJMode.qml
+share/apps/calligragemini/qml/StageDocumentPage.qml
+share/apps/calligragemini/qml/WelcomePage.qml
+share/apps/calligragemini/qml/WordsDocumentPage.qml
+share/apps/calligragemini/qml/components/
+share/apps/calligragemini/qml/components/BusyIndicator.qml
+share/apps/calligragemini/qml/components/Button.qml
+share/apps/calligragemini/qml/components/CategorySwitcher.qml
+share/apps/calligragemini/qml/components/CheckBox.qml
+share/apps/calligragemini/qml/components/CohereButton.qml
+share/apps/calligragemini/qml/components/ColorSwatch.qml
+share/apps/calligragemini/qml/components/Dialog.qml
+share/apps/calligragemini/qml/components/Divider.qml
+share/apps/calligragemini/qml/components/DropShadow.qml
+share/apps/calligragemini/qml/components/ExpandingListView.qml
+share/apps/calligragemini/qml/components/Header.qml
+share/apps/calligragemini/qml/components/Label.qml
+share/apps/calligragemini/qml/components/ListItem.qml
+share/apps/calligragemini/qml/components/MessageStack.qml
+share/apps/calligragemini/qml/components/NewImageList.qml
+share/apps/calligragemini/qml/components/NewsList.qml
+share/apps/calligragemini/qml/components/Page.qml
+share/apps/calligragemini/qml/components/PageStack.js
+share/apps/calligragemini/qml/components/PageStack.qml
+share/apps/calligragemini/qml/components/PanelTextField.qml
+share/apps/calligragemini/qml/components/ProgressBar.qml
+share/apps/calligragemini/qml/components/RangeInput.qml
+share/apps/calligragemini/qml/components/RecentFilesList.qml
+share/apps/calligragemini/qml/components/ScrollDecorator.qml
+share/apps/calligragemini/qml/components/Shadow.qml
+share/apps/calligragemini/qml/components/Slider.qml
+share/apps/calligragemini/qml/components/TextField.qml
+share/apps/calligragemini/qml/components/TextFieldMultiline.qml
+share/apps/calligragemini/qml/components/Tooltip.qml
+share/apps/calligragemini/qml/components/VirtualKeyboard.qml
+share/apps/calligragemini/qml/panels/
+share/apps/calligragemini/qml/panels/ImageToolsPanel.qml
+share/apps/calligragemini/qml/panels/NotesPanel.qml
+share/apps/calligragemini/qml/panels/OptionsPanel.qml
+share/apps/calligragemini/qml/panels/TextStylePanel.qml
+share/apps/calligragemini/qml/panels/notespanelpages/
+share/apps/calligragemini/qml/panels/notespanelpages/NotesPanelAddCustom.qml
+share/apps/calligragemini/qml/panels/notespanelpages/NotesPanelMain.qml
+share/apps/calligragemini/qml/panels/notespanelpages/NotesPanelSummary.qml
+share/apps/calligragemini/qml/welcomepages/
+share/apps/calligragemini/qml/welcomepages/CustomDocWords.qml
+share/apps/calligragemini/qml/welcomepages/TemplatesWords.qml
+share/apps/calligragemini/qml/welcomepages/VariantSelector.qml
+share/apps/calligragemini/qml/welcomepages/WelcomePageCloud.qml
+share/apps/calligragemini/qml/welcomepages/WelcomePageCustom.qml
+share/apps/calligragemini/qml/welcomepages/WelcomePageFilebrowser.qml
+share/apps/calligragemini/qml/welcomepages/WelcomePageRecent.qml
+share/apps/calligragemini/qml/welcomepages/WelcomePageStage.qml
+share/apps/calligragemini/qml/welcomepages/WelcomePageWords.qml
+share/apps/calligragemini/qml/welcomepages/cloud/
+share/apps/calligragemini/qml/welcomepages/cloud/AddDropbox.qml
+share/apps/calligragemini/qml/welcomepages/cloud/AddGit.qml
+share/apps/calligragemini/qml/welcomepages/cloud/AddWebdav.qml
+share/apps/calligragemini/qml/welcomepages/cloud/CloudAccounts.qml
+share/apps/calligragemini/qml/welcomepages/cloud/Dropbox.qml
+share/apps/calligragemini/qml/welcomepages/cloud/EditDetailsBase.qml
+share/apps/calligragemini/qml/welcomepages/cloud/EditGit.qml
+share/apps/calligragemini/qml/welcomepages/cloud/Git.qml
+share/apps/calligragemini/qml/welcomepages/cloud/RemoveAccountDlg.qml
+share/apps/calligragemini/qml/welcomepages/cloud/Webdav.qml
+share/apps/calligragemini/qml/welcomepages/cloud/dropbox/
+share/apps/calligragemini/qml/welcomepages/cloud/dropbox/DropboxWebView.qml
+share/apps/calligragemini/qml/welcomepages/cloud/dropbox/FileNavigator.qml
+share/apps/calligragemini/qml/welcomepages/cloud/dropbox/InfoBanner.qml
+share/apps/calligragemini/qml/welcomepages/cloud/dropbox/LoginPage.qml
+share/apps/calligragemini/qml/welcomepages/cloud/dropbox/SetupPage.qml
+share/apps/calligragemini/qml/welcomepages/cloud/git/
+share/apps/calligragemini/qml/welcomepages/cloud/git/CreateCheckout.qml
+share/apps/calligragemini/qml/welcomepages/cloud/git/GetUserCredentials.qml
+share/apps/calligragemini/qml/welcomepages/cloud/git/RepositoryContent.qml
+share/apps/calligragemini/qml/welcomepages/cloud/git/createCheckoutContainer.qml
+share/apps/calligragemini/qml/welcomepages/cloud/git/repositoryContentContainer.qml
+share/apps/calligragemini/qml/welcomepages/cloud/git/userCredentialsContainer.qml
+share/apps/calligragemini/themes/
+share/apps/calligragemini/themes/default/
+share/apps/calligragemini/themes/default/colors.js
+share/apps/calligragemini/themes/default/fonts/
+share/apps/calligragemini/themes/default/fonts.js
+share/apps/calligragemini/themes/default/fonts/PermanentMarker.ttf
+share/apps/calligragemini/themes/default/fonts/SourceSansPro-Black.otf
+share/apps/calligragemini/themes/default/fonts/SourceSansPro-BlackIt.otf
+share/apps/calligragemini/themes/default/fonts/SourceSansPro-Bold.otf
+share/apps/calligragemini/themes/default/fonts/SourceSansPro-BoldIt.otf
+share/apps/calligragemini/themes/default/fonts/SourceSansPro-ExtraLight.otf
+share/apps/calligragemini/themes/default/fonts/SourceSansPro-ExtraLightIt.otf
+share/apps/calligragemini/themes/default/fonts/SourceSansPro-It.otf
+share/apps/calligragemini/themes/default/fonts/SourceSansPro-Light.otf
+share/apps/calligragemini/themes/default/fonts/SourceSansPro-LightIt.otf
+share/apps/calligragemini/themes/default/fonts/SourceSansPro-Regular.otf
+share/apps/calligragemini/themes/default/fonts/SourceSansPro-Semibold.otf
+share/apps/calligragemini/themes/default/fonts/SourceSansPro-SemiboldIt.otf
+share/apps/calligragemini/themes/default/icons/
+share/apps/calligragemini/themes/default/icons/A4landscape-black.svg
+share/apps/calligragemini/themes/default/icons/A4portrait-black.svg
+share/apps/calligragemini/themes/default/icons/Arrow-Back-FileBrowse-1.svg
+share/apps/calligragemini/themes/default/icons/Arrow-ScrollDown-1.svg
+share/apps/calligragemini/themes/default/icons/Arrow-ScrollUp-1.svg
+share/apps/calligragemini/themes/default/icons/Calligra-MockIcon-1.svg
+share/apps/calligragemini/themes/default/icons/ColorPalettes-1-04.svg
+share/apps/calligragemini/themes/default/icons/ColorPalettes-Blue-1.svg
+share/apps/calligragemini/themes/default/icons/ColorPalettes-Magenta-1.svg
+share/apps/calligragemini/themes/default/icons/ColorPalettes-Red-1.svg
+share/apps/calligragemini/themes/default/icons/ColorPalettes-gold-1.svg
+share/apps/calligragemini/themes/default/icons/Presentaton-Blue.svg
+share/apps/calligragemini/themes/default/icons/Presentaton-Gold.svg
+share/apps/calligragemini/themes/default/icons/Presentaton-Magenta.svg
+share/apps/calligragemini/themes/default/icons/Presentaton-Red.svg
+share/apps/calligragemini/themes/default/icons/SVG-AddComment-Inline-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Comment-DragHandle-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Exit-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-FXTransition-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-FillLabel-Green-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-FillLabel-Neutral-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-FillLabel-Red-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-FillLabel-Yellow-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Highlighter-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-IMGTOOLS-Brightness-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-IMGTOOLS-Contrast-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-IMGTOOLS-Crop-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-IMGTOOLS-ReplaceImage-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-IMGTOOLS-SliderHandle-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-IMGTOOLS-Sliders-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-IMGTOOLS-Transparency-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-IMGTOOLS-Wand-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-AddNote-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-AddPhotoComment-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-AddShape-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-AddSlide-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-AddVoiceComment-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-Animations-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-Bold-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-BulletList-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-Cloud-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-DesktopMode-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-Fill.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-Find-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-Help-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-Image.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-ImageAdjustment-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-Italic-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-Lines.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-MenuBack-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-MyDocuments-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-NewDocument-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-NewPresentation-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-NewSketch-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-NewSpreadsheet-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-NotesSummary-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-OK-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-Options-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-OptionsWhite-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-Pen.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-PlayPresentation-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-RecentDocuments-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-Shadow.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-SmallX.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-SpellCheck-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-TextAlignment-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-TextBox-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-TextStyle-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Icon-Underline-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Label-Green-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Label-Red-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Label-SelectedRing-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Label-Yellow-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-LargeSelectedFill-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-NextSlide-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-NotesSummary-Counter-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Nudge-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-Pointer-1.svg
+share/apps/calligragemini/themes/default/icons/SVG-PreviousSlide-1.svg
+share/apps/calligragemini/themes/default/icons/add-black.svg
+share/apps/calligragemini/themes/default/icons/add.svg
+share/apps/calligragemini/themes/default/icons/apply-black.svg
+share/apps/calligragemini/themes/default/icons/apply.svg
+share/apps/calligragemini/themes/default/icons/back.svg
+share/apps/calligragemini/themes/default/icons/camera-black.svg
+share/apps/calligragemini/themes/default/icons/cancel-black.svg
+share/apps/calligragemini/themes/default/icons/checker-small.svg
+share/apps/calligragemini/themes/default/icons/close.svg
+share/apps/calligragemini/themes/default/icons/color_wheel.svg
+share/apps/calligragemini/themes/default/icons/colorpicker.svg
+share/apps/calligragemini/themes/default/icons/combo-arrows-white.svg
+share/apps/calligragemini/themes/default/icons/crop-black.svg
+share/apps/calligragemini/themes/default/icons/crop.svg
+share/apps/calligragemini/themes/default/icons/delete-black.svg
+share/apps/calligragemini/themes/default/icons/delete.svg
+share/apps/calligragemini/themes/default/icons/down.svg
+share/apps/calligragemini/themes/default/icons/edit.svg
+share/apps/calligragemini/themes/default/icons/erase.svg
+share/apps/calligragemini/themes/default/icons/fileclip-black.svg
+share/apps/calligragemini/themes/default/icons/fileclip.svg
+share/apps/calligragemini/themes/default/icons/filenew-black.svg
+share/apps/calligragemini/themes/default/icons/filenew.svg
+share/apps/calligragemini/themes/default/icons/fileopen-black.svg
+share/apps/calligragemini/themes/default/icons/fileopen.svg
+share/apps/calligragemini/themes/default/icons/filesave.svg
+share/apps/calligragemini/themes/default/icons/filesaveas.svg
+share/apps/calligragemini/themes/default/icons/fileshare.svg
+share/apps/calligragemini/themes/default/icons/fill-black.svg
+share/apps/calligragemini/themes/default/icons/fill.svg
+share/apps/calligragemini/themes/default/icons/filter_delete-black.svg
+share/apps/calligragemini/themes/default/icons/filter_load-black.svg
+share/apps/calligragemini/themes/default/icons/filter_save-black.svg
+share/apps/calligragemini/themes/default/icons/forward.svg
+share/apps/calligragemini/themes/default/icons/gradient-black.svg
+share/apps/calligragemini/themes/default/icons/gradient.svg
+share/apps/calligragemini/themes/default/icons/help.svg
+share/apps/calligragemini/themes/default/icons/intel-Words-Handle-cursor.svg
+share/apps/calligragemini/themes/default/icons/krita_sketch.svg
+share/apps/calligragemini/themes/default/icons/layer_filter-black.svg
+share/apps/calligragemini/themes/default/icons/layer_group-black.svg
+share/apps/calligragemini/themes/default/icons/layer_paint-black.svg
+share/apps/calligragemini/themes/default/icons/locked_off-black.svg
+share/apps/calligragemini/themes/default/icons/locked_off-small.svg
+share/apps/calligragemini/themes/default/icons/locked_on-black.svg
+share/apps/calligragemini/themes/default/icons/locked_on-small.svg
+share/apps/calligragemini/themes/default/icons/minimize.svg
+share/apps/calligragemini/themes/default/icons/mirror_c-black.svg
+share/apps/calligragemini/themes/default/icons/mirror_h-black.svg
+share/apps/calligragemini/themes/default/icons/mirror_v-black.svg
+share/apps/calligragemini/themes/default/icons/move-black.svg
+share/apps/calligragemini/themes/default/icons/move.svg
+share/apps/calligragemini/themes/default/icons/paint-black.svg
+share/apps/calligragemini/themes/default/icons/paint.svg
+share/apps/calligragemini/themes/default/icons/palette-add-black.svg
+share/apps/calligragemini/themes/default/icons/palette-black.svg
+share/apps/calligragemini/themes/default/icons/palette-delete-black.svg
+share/apps/calligragemini/themes/default/icons/palette.svg
+share/apps/calligragemini/themes/default/icons/redo.svg
+share/apps/calligragemini/themes/default/icons/select-add.svg
+share/apps/calligragemini/themes/default/icons/select-apply.svg
+share/apps/calligragemini/themes/default/icons/select-area.svg
+share/apps/calligragemini/themes/default/icons/select-color.svg
+share/apps/calligragemini/themes/default/icons/select-deselect.svg
+share/apps/calligragemini/themes/default/icons/select-hide.svg
+share/apps/calligragemini/themes/default/icons/select-intersect.svg
+share/apps/calligragemini/themes/default/icons/select-polygon.svg
+share/apps/calligragemini/themes/default/icons/select-rectangle.svg
+share/apps/calligragemini/themes/default/icons/select-replace.svg
+share/apps/calligragemini/themes/default/icons/select-reselect.svg
+share/apps/calligragemini/themes/default/icons/select-show.svg
+share/apps/calligragemini/themes/default/icons/select-sub.svg
+share/apps/calligragemini/themes/default/icons/settings.svg
+share/apps/calligragemini/themes/default/icons/switch.svg
+share/apps/calligragemini/themes/default/icons/transform-black.svg
+share/apps/calligragemini/themes/default/icons/transform.svg
+share/apps/calligragemini/themes/default/icons/undo.svg
+share/apps/calligragemini/themes/default/icons/up.svg
+share/apps/calligragemini/themes/default/icons/visible_off-black.svg
+share/apps/calligragemini/themes/default/icons/visible_off-small.svg
+share/apps/calligragemini/themes/default/icons/visible_off.svg
+share/apps/calligragemini/themes/default/icons/visible_on-black.svg
+share/apps/calligragemini/themes/default/icons/visible_on-small.svg
+share/apps/calligragemini/themes/default/icons/visible_on.svg
+share/apps/calligragemini/themes/default/icons/web.svg
+share/apps/calligragemini/themes/default/images/
+share/apps/calligragemini/themes/default/images/Sticker-A.svg
+share/apps/calligragemini/themes/default/images/Sticker-Apple.svg
+share/apps/calligragemini/themes/default/images/Sticker-ArrowTarget.svg
+share/apps/calligragemini/themes/default/images/Sticker-B.svg
+share/apps/calligragemini/themes/default/images/Sticker-C.svg
+share/apps/calligragemini/themes/default/images/Sticker-D.svg
+share/apps/calligragemini/themes/default/images/Sticker-F.svg
+share/apps/calligragemini/themes/default/images/Sticker-Feather.svg
+share/apps/calligragemini/themes/default/images/Sticker-Lightbulb.svg
+share/apps/calligragemini/themes/default/images/Sticker-OK.svg
+share/apps/calligragemini/themes/default/images/Sticker-Ribbon.svg
+share/apps/calligragemini/themes/default/images/Sticker-ThumbsUp.svg
+share/apps/calligragemini/themes/default/images/busyindicator.png
+share/apps/calligragemini/themes/default/images/divider.png
+share/apps/calligragemini/themes/default/images/drop-corners.png
+share/apps/calligragemini/themes/default/images/drop-shadows.png
+share/apps/calligragemini/themes/default/images/header_krita_sketch.png
+share/apps/calligragemini/themes/default/images/header_krita_sketch_light.png
+share/apps/calligragemini/themes/default/images/intel-Stage-Slide-PieChart-Default.svg
+share/apps/calligragemini/themes/default/images/intel-Stage-Slide-PieChart-PieceTappedOn.svg
+share/apps/calligragemini/themes/default/images/intel-Words-Note-Circle-Green.svg
+share/apps/calligragemini/themes/default/images/intel-Words-Note-Circle-Red.svg
+share/apps/calligragemini/themes/default/images/intel-Words-Note-Circle-Yellow.svg
+share/apps/calligragemini/themes/default/images/kritasketch.png
+share/apps/calligragemini/themes/default/images/shadow.png
+share/apps/calligragemini/themes/default/sizes.js
+share/apps/calligragemini/themes/default/theme.qml
 share/apps/cmake/modules/FindCalligraLibs.cmake
 share/apps/color-schemes/
-share/apps/color-schemes/Krita50.colors
 share/apps/color-schemes/KritaBlender.colors
 share/apps/color-schemes/KritaBright.colors
-share/apps/color-schemes/KritaBrighter.colors
 share/apps/color-schemes/KritaDark.colors
-share/apps/color-schemes/KritaDarker.colors
+share/apps/color-schemes/KritaNeutral.colors
 share/apps/flow/
 share/apps/flow/flow.rc
 share/apps/flow/icons/
@@ -5409,8 +5508,8 @@ share/apps/kexi/icons/hicolor/16x16/acti
 share/apps/kexi/icons/hicolor/16x16/actions/clear_table_contents.png
 share/apps/kexi/icons/hicolor/16x16/actions/close.png
 share/apps/kexi/icons/hicolor/16x16/actions/combo.png
+share/apps/kexi/icons/hicolor/16x16/actions/database-import.png
 share/apps/kexi/icons/hicolor/16x16/actions/delete_table_row.png
-share/apps/kexi/icons/hicolor/16x16/actions/document_import_database.png
 share/apps/kexi/icons/hicolor/16x16/actions/form.png
 share/apps/kexi/icons/hicolor/16x16/actions/form_action.png
 share/apps/kexi/icons/hicolor/16x16/actions/form_newobj.png
@@ -5438,12 +5537,9 @@ share/apps/kexi/icons/hicolor/16x16/acti
 share/apps/kexi/icons/hicolor/16x16/actions/report_newobj.png
 share/apps/kexi/icons/hicolor/16x16/actions/script.png
 share/apps/kexi/icons/hicolor/16x16/actions/script_newobj.png
-share/apps/kexi/icons/hicolor/16x16/actions/spring.png
-share/apps/kexi/icons/hicolor/16x16/actions/spring_vertical.png
 share/apps/kexi/icons/hicolor/16x16/actions/state_data.png
 share/apps/kexi/icons/hicolor/16x16/actions/state_edit.png
 share/apps/kexi/icons/hicolor/16x16/actions/state_sql.png
-share/apps/kexi/icons/hicolor/16x16/actions/state_text.png
 share/apps/kexi/icons/hicolor/16x16/actions/subform.png
 share/apps/kexi/icons/hicolor/16x16/actions/table.png
 share/apps/kexi/icons/hicolor/16x16/actions/table_newobj.png
@@ -5475,10 +5571,10 @@ share/apps/kexi/icons/hicolor/22x22/acti
 share/apps/kexi/icons/hicolor/22x22/actions/clear_table_contents.png
 share/apps/kexi/icons/hicolor/22x22/actions/close.png
 share/apps/kexi/icons/hicolor/22x22/actions/combo.png
+share/apps/kexi/icons/hicolor/22x22/actions/database-import.png
 share/apps/kexi/icons/hicolor/22x22/actions/dateedit.png
 share/apps/kexi/icons/hicolor/22x22/actions/datetimeedit.png
 share/apps/kexi/icons/hicolor/22x22/actions/delete_table_row.png
-share/apps/kexi/icons/hicolor/22x22/actions/document_import_database.png
 share/apps/kexi/icons/hicolor/22x22/actions/form.png
 share/apps/kexi/icons/hicolor/22x22/actions/form_action.png
 share/apps/kexi/icons/hicolor/22x22/actions/form_edit.png
@@ -5514,12 +5610,9 @@ share/apps/kexi/icons/hicolor/22x22/acti
 share/apps/kexi/icons/hicolor/22x22/actions/signalslot.png
 share/apps/kexi/icons/hicolor/22x22/actions/slider.png
 share/apps/kexi/icons/hicolor/22x22/actions/spin.png
-share/apps/kexi/icons/hicolor/22x22/actions/spring.png
-share/apps/kexi/icons/hicolor/22x22/actions/spring_vertical.png
 share/apps/kexi/icons/hicolor/22x22/actions/state_data.png
 share/apps/kexi/icons/hicolor/22x22/actions/state_edit.png
 share/apps/kexi/icons/hicolor/22x22/actions/state_sql.png
-share/apps/kexi/icons/hicolor/22x22/actions/state_text.png
 share/apps/kexi/icons/hicolor/22x22/actions/subform.png
 share/apps/kexi/icons/hicolor/22x22/actions/table.png
 share/apps/kexi/icons/hicolor/22x22/actions/table_newobj.png
@@ -5538,8 +5631,8 @@ share/apps/kexi/icons/hicolor/32x32/acti
 share/apps/kexi/icons/hicolor/32x32/actions/business_user.png
 share/apps/kexi/icons/hicolor/32x32/actions/clear_table_contents.png
 share/apps/kexi/icons/hicolor/32x32/actions/close.png
+share/apps/kexi/icons/hicolor/32x32/actions/database-import.png
 share/apps/kexi/icons/hicolor/32x32/actions/delete_table_row.png
-share/apps/kexi/icons/hicolor/32x32/actions/document_import_database.png
 share/apps/kexi/icons/hicolor/32x32/actions/form.png
 share/apps/kexi/icons/hicolor/32x32/actions/form_action.png
 share/apps/kexi/icons/hicolor/32x32/actions/form_newobj.png
@@ -5554,15 +5647,13 @@ share/apps/kexi/icons/hicolor/32x32/acti
 share/apps/kexi/icons/hicolor/32x32/actions/query_newobj.png
 share/apps/kexi/icons/hicolor/32x32/actions/report.png
 share/apps/kexi/icons/hicolor/32x32/actions/report_newobj.png
-share/apps/kexi/icons/hicolor/32x32/actions/spring.png
 share/apps/kexi/icons/hicolor/32x32/actions/state_data.png
 share/apps/kexi/icons/hicolor/32x32/actions/state_sql.png
-share/apps/kexi/icons/hicolor/32x32/actions/state_text.png
 share/apps/kexi/icons/hicolor/32x32/actions/table.png
 share/apps/kexi/icons/hicolor/32x32/actions/table_newobj.png
 share/apps/kexi/icons/hicolor/48x48/
 share/apps/kexi/icons/hicolor/48x48/actions/
-share/apps/kexi/icons/hicolor/48x48/actions/document_import_database.png
+share/apps/kexi/icons/hicolor/48x48/actions/database-import.png
 share/apps/kexi/icons/hicolor/48x48/actions/form_action.png
 share/apps/kexi/icons/hicolor/48x48/actions/key.png
 share/apps/kexi/icons/hicolor/64x64/
@@ -5591,8 +5682,13 @@ share/apps/kexi/icons/oxygen/16x16/mimet
 share/apps/kexi/icons/oxygen/16x16/mimetypes/application-x-kexiproject-sqlite3.png
 share/apps/kexi/icons/oxygen/16x16/mimetypes/application-x-sqlite2.png
 share/apps/kexi/icons/oxygen/16x16/mimetypes/application-x-sqlite3.png
+share/apps/kexi/icons/oxygen/16x16/places/
+share/apps/kexi/icons/oxygen/16x16/places/breeze-kexi-file-database.svgz
+share/apps/kexi/icons/oxygen/16x16/places/breeze-network-server-database.svgz
 share/apps/kexi/icons/oxygen/22x22/
 share/apps/kexi/icons/oxygen/22x22/actions/
+share/apps/kexi/icons/oxygen/22x22/actions/breeze-database-import.svgz
+share/apps/kexi/icons/oxygen/22x22/actions/breeze-kexi-document-empty.svgz
 share/apps/kexi/icons/oxygen/22x22/actions/data-source-tag.png
 share/apps/kexi/icons/oxygen/22x22/actions/table.png
 share/apps/kexi/icons/oxygen/22x22/mimetypes/
@@ -5603,8 +5699,14 @@ share/apps/kexi/icons/oxygen/22x22/mimet
 share/apps/kexi/icons/oxygen/22x22/mimetypes/application-x-kexiproject-sqlite3.png
 share/apps/kexi/icons/oxygen/22x22/mimetypes/application-x-sqlite2.png
 share/apps/kexi/icons/oxygen/22x22/mimetypes/application-x-sqlite3.png
+share/apps/kexi/icons/oxygen/22x22/places/
+share/apps/kexi/icons/oxygen/22x22/places/breeze-kexi-file-database.svgz
+share/apps/kexi/icons/oxygen/22x22/places/breeze-network-server-database.svgz
 share/apps/kexi/icons/oxygen/32x32/
 share/apps/kexi/icons/oxygen/32x32/actions/
+share/apps/kexi/icons/oxygen/32x32/actions/breeze-kexi-document-empty.svgz
+share/apps/kexi/icons/oxygen/32x32/actions/kexi-document-empty.png
+share/apps/kexi/icons/oxygen/32x32/actions/kexi-document-empty.svgz
 share/apps/kexi/icons/oxygen/32x32/actions/table.png
 share/apps/kexi/icons/oxygen/32x32/mimetypes/
 share/apps/kexi/icons/oxygen/32x32/mimetypes/application-x-kexi-connectiondata.png
@@ -5614,7 +5716,12 @@ share/apps/kexi/icons/oxygen/32x32/mimet
 share/apps/kexi/icons/oxygen/32x32/mimetypes/application-x-kexiproject-sqlite3.png
 share/apps/kexi/icons/oxygen/32x32/mimetypes/application-x-sqlite2.png
 share/apps/kexi/icons/oxygen/32x32/mimetypes/application-x-sqlite3.png
+share/apps/kexi/icons/oxygen/32x32/places/
+share/apps/kexi/icons/oxygen/32x32/places/breeze-kexi-file-database.svgz
+share/apps/kexi/icons/oxygen/32x32/places/breeze-network-server-database.svgz
 share/apps/kexi/icons/oxygen/48x48/
+share/apps/kexi/icons/oxygen/48x48/actions/
+share/apps/kexi/icons/oxygen/48x48/actions/kexi-document-empty.png
 share/apps/kexi/icons/oxygen/48x48/mimetypes/
 share/apps/kexi/icons/oxygen/48x48/mimetypes/application-x-kexi-connectiondata.png
 share/apps/kexi/icons/oxygen/48x48/mimetypes/application-x-kexiproject-shortcut.png
@@ -5624,6 +5731,8 @@ share/apps/kexi/icons/oxygen/48x48/mimet
 share/apps/kexi/icons/oxygen/48x48/mimetypes/application-x-sqlite2.png
 share/apps/kexi/icons/oxygen/48x48/mimetypes/application-x-sqlite3.png
 share/apps/kexi/icons/oxygen/64x64/
+share/apps/kexi/icons/oxygen/64x64/actions/
+share/apps/kexi/icons/oxygen/64x64/actions/kexi-document-empty.svgz
 share/apps/kexi/icons/oxygen/64x64/mimetypes/
 share/apps/kexi/icons/oxygen/64x64/mimetypes/application-x-kexi-connectiondata.png
 share/apps/kexi/icons/oxygen/64x64/mimetypes/application-x-kexiproject-shortcut.png
@@ -5677,15 +5786,13 @@ share/apps/kexi/pics/
 share/apps/kexi/pics/calligra-logo-black-glow.png
 share/apps/kexi/pics/calligra-logo-white-glow.png
 share/apps/kexi/pics/external-link.png
-share/apps/kexi/pics/kexi-logo-white.png
-share/apps/kexi/pics/kexi-logo.png
 share/apps/kexi/status/
-share/apps/kexi/status/2.8.6/
-share/apps/kexi/status/2.8.6/contribution_details.ui
-share/apps/kexi/status/2.8.6/contribution_help.ui
-share/apps/kexi/status/2.8.6/status.rcc
-share/apps/kexi/status/2.8.6/status.ui
-share/apps/kexi/status/2.8.6/status_strings.ui
+share/apps/kexi/status/2.9.0/
+share/apps/kexi/status/2.9.0/contribution_details.ui
+share/apps/kexi/status/2.9.0/contribution_help.ui
+share/apps/kexi/status/2.9.0/status.rcc
+share/apps/kexi/status/2.9.0/status.ui
+share/apps/kexi/status/2.9.0/status_strings.ui
 share/apps/koproperty/
 share/apps/koproperty/icons/
 share/apps/koproperty/icons/hicolor/
@@ -5693,6 +5800,28 @@ share/apps/koproperty/icons/hicolor/16x1
 share/apps/koproperty/icons/hicolor/16x16/actions/
 share/apps/koproperty/icons/hicolor/16x16/actions/button_no.png
 share/apps/krita/
+share/apps/krita/actions/
+share/apps/krita/actions/ArtisticTextToolFactoryID.action
+share/apps/krita/actions/InteractionTool.action
+share/apps/krita/actions/KisRulerAssistantTool.action
+share/apps/krita/actions/KisToolCrop.action
+share/apps/krita/actions/KisToolGrid.action
+share/apps/krita/actions/KisToolPath.action
+share/apps/krita/actions/KisToolPencil.action
+share/apps/krita/actions/KisToolPerspectiveGrid.action
+share/apps/krita/actions/KisToolPolygon.action
+share/apps/krita/actions/KisToolPolyline.action
+share/apps/krita/actions/KisToolSelectContiguous.action
+share/apps/krita/actions/KisToolSelectElliptical.action
+share/apps/krita/actions/KisToolSelectOutline.action
+share/apps/krita/actions/KisToolSelectPath.action
+share/apps/krita/actions/KisToolSelectPolygonal.action
+share/apps/krita/actions/KisToolSelectRectangular.action
+share/apps/krita/actions/KisToolSelectSimilar.action
+share/apps/krita/actions/KisToolTransform.action
+share/apps/krita/actions/PathToolFactoryId.action
+share/apps/krita/actions/TextToolFactory_ID.action
+share/apps/krita/actions/krita.action
 share/apps/krita/brushes/
 share/apps/krita/brushes/3_brush.png
 share/apps/krita/brushes/3_dotted-flat.png
@@ -5857,6 +5986,8 @@ share/apps/krita/brushes/z_study_pencil_
 share/apps/krita/brushes/z_study_pencil_2Hb.gih
 share/apps/krita/brushes/z_study_pencil_H.gih
 share/apps/krita/brushes/z_study_pencil_H_h.gih
+share/apps/krita/bundles/
+share/apps/krita/bundles/README
 share/apps/krita/defaultpresets/
 share/apps/krita/defaultpresets/chalkbrush.kpp
 share/apps/krita/defaultpresets/colorsmudge.kpp
@@ -5905,7 +6036,6 @@ share/apps/krita/icons/hicolor/128x128/
 share/apps/krita/icons/hicolor/128x128/actions/
 share/apps/krita/icons/hicolor/128x128/actions/template_comics_empty.png
 share/apps/krita/icons/hicolor/128x128/actions/template_dslr.png
-share/apps/krita/icons/hicolor/128x128/actions/template_film.png
 share/apps/krita/icons/hicolor/128x128/actions/template_texture.png
 share/apps/krita/images/
 share/apps/krita/images/krita-chalk.png
@@ -5943,17 +6073,28 @@ share/apps/krita/paintoppresets/Airbrush
 share/apps/krita/paintoppresets/Airbrush_linear_noisy.kpp
 share/apps/krita/paintoppresets/Airbrush_pressure.kpp
 share/apps/krita/paintoppresets/Basic_circle.kpp
-share/apps/krita/paintoppresets/Basic_circle_wet.kpp
+share/apps/krita/paintoppresets/Basic_mix.kpp
+share/apps/krita/paintoppresets/Basic_mix_soft.kpp
 share/apps/krita/paintoppresets/Basic_tip_default.kpp
 share/apps/krita/paintoppresets/Basic_tip_gaussian.kpp
 share/apps/krita/paintoppresets/Basic_tip_soft.kpp
+share/apps/krita/paintoppresets/Basic_wet.kpp
+share/apps/krita/paintoppresets/Basic_wet_soft.kpp
 share/apps/krita/paintoppresets/Block_basic.kpp
 share/apps/krita/paintoppresets/Block_bristles.kpp
 share/apps/krita/paintoppresets/Block_fuzzy.kpp
 share/apps/krita/paintoppresets/Block_mix_tilt.kpp
 share/apps/krita/paintoppresets/Block_tilt.kpp
+share/apps/krita/paintoppresets/Block_wet_tilt.kpp
+share/apps/krita/paintoppresets/Bristle_Details.kpp
+share/apps/krita/paintoppresets/Bristle_Large.kpp
+share/apps/krita/paintoppresets/Bristle_Special_Blender.kpp
+share/apps/krita/paintoppresets/Bristle_Squared.kpp
+share/apps/krita/paintoppresets/Bristle_Tapered.kpp
+share/apps/krita/paintoppresets/Bristle_Texture.kpp
 share/apps/krita/paintoppresets/Bristle_frottis.kpp
 share/apps/krita/paintoppresets/Bristles_hairy.kpp
+share/apps/krita/paintoppresets/Bristles_mix.kpp
 share/apps/krita/paintoppresets/Bristles_textured.kpp
 share/apps/krita/paintoppresets/Bristles_wet.kpp
 share/apps/krita/paintoppresets/Chalk_brush.kpp
@@ -5974,12 +6115,6 @@ share/apps/krita/paintoppresets/FX_splat
 share/apps/krita/paintoppresets/Fill_block.kpp
 share/apps/krita/paintoppresets/Fill_circle.kpp
 share/apps/krita/paintoppresets/Grid_square_25.kpp
-share/apps/krita/paintoppresets/Hairy_Details.kpp
-share/apps/krita/paintoppresets/Hairy_Large.kpp
-share/apps/krita/paintoppresets/Hairy_Special_Blender.kpp
-share/apps/krita/paintoppresets/Hairy_Squared.kpp
-share/apps/krita/paintoppresets/Hairy_Tapered.kpp
-share/apps/krita/paintoppresets/Hairy_Texture.kpp
 share/apps/krita/paintoppresets/Hatch_crispy.kpp
 share/apps/krita/paintoppresets/Hatch_cross_regular.kpp
 share/apps/krita/paintoppresets/Hatch_cross_small.kpp
@@ -5999,14 +6134,6 @@ share/apps/krita/paintoppresets/Layout_b
 share/apps/krita/paintoppresets/Layout_circle_soft.kpp
 share/apps/krita/paintoppresets/Layout_oval.kpp
 share/apps/krita/paintoppresets/Layout_pen.kpp
-share/apps/krita/paintoppresets/Mix_dull.kpp
-share/apps/krita/paintoppresets/Mix_smear.kpp
-share/apps/krita/paintoppresets/Mix_smear_soft.kpp
-share/apps/krita/paintoppresets/Mixover_dull.kpp
-share/apps/krita/paintoppresets/Mixover_dull_bristle_soft.kpp
-share/apps/krita/paintoppresets/Mixover_dull_bristles.kpp
-share/apps/krita/paintoppresets/Mixover_oil.kpp
-share/apps/krita/paintoppresets/Mixover_smear.kpp
 share/apps/krita/paintoppresets/Move_tool.kpp
 share/apps/krita/paintoppresets/Pastel_texture_large.kpp
 share/apps/krita/paintoppresets/Pastel_texture_thin.kpp
@@ -6036,12 +6163,15 @@ share/apps/krita/paintoppresets/Smudge_r
 share/apps/krita/paintoppresets/Smudge_rake_2.kpp
 share/apps/krita/paintoppresets/Smudge_soft.kpp
 share/apps/krita/paintoppresets/Smudge_textured.kpp
+share/apps/krita/paintoppresets/Sparkle_wet.kpp
+share/apps/krita/paintoppresets/Sparkle_wet_soft.kpp
 share/apps/krita/paintoppresets/Special_FuzzyColor.kpp
 share/apps/krita/paintoppresets/Special_dyna_dots.kpp
 share/apps/krita/paintoppresets/Special_particles_crazy.kpp
 share/apps/krita/paintoppresets/Splat_mix_cells.kpp
 share/apps/krita/paintoppresets/Splat_texture.kpp
 share/apps/krita/paintoppresets/Splat_texture_2.kpp
+share/apps/krita/paintoppresets/Splat_wet_cells.kpp
 share/apps/krita/paintoppresets/Splatter_thin.kpp
 share/apps/krita/paintoppresets/Sponge_texture.kpp
 share/apps/krita/paintoppresets/Spray_splat.kpp
@@ -6135,6 +6265,8 @@ share/apps/krita/pics/
 share/apps/krita/pics/AboutKrita.png
 share/apps/krita/pics/addlayer.png
 share/apps/krita/pics/addtofolder.png
+share/apps/krita/pics/arrow-down.png
+share/apps/krita/pics/arrow-right.png
 share/apps/krita/pics/arrow_east.png
 share/apps/krita/pics/arrow_north.png
 share/apps/krita/pics/arrow_north_east.png
@@ -6154,12 +6286,72 @@ share/apps/krita/pics/cursor-cross.xpm
 share/apps/krita/pics/cursor-round.xpm
 share/apps/krita/pics/cursor-triangle_lefthanded.xpm
 share/apps/krita/pics/cursor-triangle_righthanded.xpm
+share/apps/krita/pics/dark_addlayer.png
+share/apps/krita/pics/dark_addtofolder.png
+share/apps/krita/pics/dark_arrowdown.png
+share/apps/krita/pics/dark_arrowupblr.png
+share/apps/krita/pics/dark_calligraphy.png
+share/apps/krita/pics/dark_deletelayer.png
+share/apps/krita/pics/dark_draw-text.png
+share/apps/krita/pics/dark_duplicatelayer.png
+share/apps/krita/pics/dark_format-fill-color.png
+share/apps/krita/pics/dark_krita_draw_path.png
+share/apps/krita/pics/dark_krita_tool_color_fill.png
+share/apps/krita/pics/dark_krita_tool_color_picker.png
+share/apps/krita/pics/dark_krita_tool_dyna.png
+share/apps/krita/pics/dark_krita_tool_editpath.png
+share/apps/krita/pics/dark_krita_tool_ellipse.png
+share/apps/krita/pics/dark_krita_tool_freehand.png
+share/apps/krita/pics/dark_krita_tool_freehandvector.png
+share/apps/krita/pics/dark_krita_tool_gradient.png
+share/apps/krita/pics/dark_krita_tool_grid.png
+share/apps/krita/pics/dark_krita_tool_line.png
+share/apps/krita/pics/dark_krita_tool_measure.png
+share/apps/krita/pics/dark_krita_tool_move.png
+share/apps/krita/pics/dark_krita_tool_multihand.png
+share/apps/krita/pics/dark_krita_tool_rectangle.png
+share/apps/krita/pics/dark_krita_tool_ruler_assistant.png
+share/apps/krita/pics/dark_krita_tool_transform.png
+share/apps/krita/pics/dark_pattern.png
+share/apps/krita/pics/dark_polyline.png
+share/apps/krita/pics/dark_properties.png
+share/apps/krita/pics/dark_removefromfolder.png
+share/apps/krita/pics/dark_select.png
+share/apps/krita/pics/dark_selection-mode_ants.png
+share/apps/krita/pics/dark_selection-mode_invisible.png
+share/apps/krita/pics/dark_selection-mode_mask.png
+share/apps/krita/pics/dark_symmetry-horizontal.png
+share/apps/krita/pics/dark_symmetry-vertical.png
+share/apps/krita/pics/dark_tool_contiguous_selection.png
+share/apps/krita/pics/dark_tool_crop.png
+share/apps/krita/pics/dark_tool_elliptical_selection.png
+share/apps/krita/pics/dark_tool_outline_selection.png
+share/apps/krita/pics/dark_tool_path_selection.png
+share/apps/krita/pics/dark_tool_perspectivegrid.png
+share/apps/krita/pics/dark_tool_polygon.png
+share/apps/krita/pics/dark_tool_polygonal_selection.png
+share/apps/krita/pics/dark_tool_rect_selection.png
+share/apps/krita/pics/dark_tool_similar_selection.png
+share/apps/krita/pics/dark_transform_icons_cage.png
+share/apps/krita/pics/dark_transform_icons_liquify_erase.png
+share/apps/krita/pics/dark_transform_icons_liquify_main.png
+share/apps/krita/pics/dark_transform_icons_liquify_move.png
+share/apps/krita/pics/dark_transform_icons_liquify_offset.png
+share/apps/krita/pics/dark_transform_icons_liquify_resize.png
+share/apps/krita/pics/dark_transform_icons_liquify_rotate.png
+share/apps/krita/pics/dark_transform_icons_liquify_rotateCCW.png
+share/apps/krita/pics/dark_transform_icons_main.png
+share/apps/krita/pics/dark_transform_icons_penPressure.png
+share/apps/krita/pics/dark_transform_icons_perspective.png
+share/apps/krita/pics/dark_transform_icons_warp.png
 share/apps/krita/pics/delete.png
 share/apps/krita/pics/deletelayer.png
 share/apps/krita/pics/duplicatelayer.png
 share/apps/krita/pics/eraser-toggle.png
+share/apps/krita/pics/exposure-cursor-gesture.xpm
 share/apps/krita/pics/extended_color_selector.png
 share/apps/krita/pics/folder.png
+share/apps/krita/pics/gamma-cursor-gesture.xpm
 share/apps/krita/pics/height.png
 share/apps/krita/pics/height_icon.png
 share/apps/krita/pics/hi16-add_dialog.png
@@ -6173,7 +6365,6 @@ share/apps/krita/pics/krita_tool_color_f
 share/apps/krita/pics/krita_tool_color_picker.png
 share/apps/krita/pics/krita_tool_dyna.png
 share/apps/krita/pics/krita_tool_ellipse.png
-share/apps/krita/pics/krita_tool_freehand.png
 share/apps/krita/pics/krita_tool_freehandvector.png
 share/apps/krita/pics/krita_tool_gradient.png
 share/apps/krita/pics/krita_tool_grid.png
@@ -6186,30 +6377,96 @@ share/apps/krita/pics/krita_tool_ruler_a
 share/apps/krita/pics/krita_tool_transform.png
 share/apps/krita/pics/krita_tool_transform_recursive.png
 share/apps/krita/pics/landscape.png
+share/apps/krita/pics/layer-style-disabled.png
+share/apps/krita/pics/layer-style-enabled.png
+share/apps/krita/pics/light_addlayer.png
+share/apps/krita/pics/light_addtofolder.png
+share/apps/krita/pics/light_arrowdown.png
+share/apps/krita/pics/light_arrowupblr.png
+share/apps/krita/pics/light_calligraphy.png
+share/apps/krita/pics/light_deletelayer.png
+share/apps/krita/pics/light_draw-text.png
+share/apps/krita/pics/light_duplicatelayer.png
+share/apps/krita/pics/light_format-fill-color.png
+share/apps/krita/pics/light_krita_draw_path.png
+share/apps/krita/pics/light_krita_tool_color_fill.png
+share/apps/krita/pics/light_krita_tool_color_picker.png
+share/apps/krita/pics/light_krita_tool_dyna.png
+share/apps/krita/pics/light_krita_tool_editpath.png
+share/apps/krita/pics/light_krita_tool_ellipse.png
+share/apps/krita/pics/light_krita_tool_freehand.png
+share/apps/krita/pics/light_krita_tool_freehandvector.png
+share/apps/krita/pics/light_krita_tool_gradient.png
+share/apps/krita/pics/light_krita_tool_grid.png
+share/apps/krita/pics/light_krita_tool_line.png
+share/apps/krita/pics/light_krita_tool_measure.png
+share/apps/krita/pics/light_krita_tool_move.png
+share/apps/krita/pics/light_krita_tool_multihand.png
+share/apps/krita/pics/light_krita_tool_rectangle.png
+share/apps/krita/pics/light_krita_tool_ruler_assistant.png
+share/apps/krita/pics/light_krita_tool_transform.png
+share/apps/krita/pics/light_pattern.png
+share/apps/krita/pics/light_polyline.png
+share/apps/krita/pics/light_properties.png
+share/apps/krita/pics/light_removefromfolder.png
+share/apps/krita/pics/light_select.png
+share/apps/krita/pics/light_selection-mode_ants.png
+share/apps/krita/pics/light_selection-mode_invisible.png
+share/apps/krita/pics/light_selection-mode_mask.png
+share/apps/krita/pics/light_symmetry-horizontal.png
+share/apps/krita/pics/light_symmetry-vertical.png
+share/apps/krita/pics/light_tool_contiguous_selection.png
+share/apps/krita/pics/light_tool_crop.png
+share/apps/krita/pics/light_tool_elliptical_selection.png
+share/apps/krita/pics/light_tool_outline_selection.png
+share/apps/krita/pics/light_tool_path_selection.png
+share/apps/krita/pics/light_tool_perspectivegrid.png
+share/apps/krita/pics/light_tool_polygon.png
+share/apps/krita/pics/light_tool_polygonal_selection.png
+share/apps/krita/pics/light_tool_rect_selection.png
+share/apps/krita/pics/light_tool_similar_selection.png
+share/apps/krita/pics/light_transform_icons_cage.png
+share/apps/krita/pics/light_transform_icons_liquify_erase.png
+share/apps/krita/pics/light_transform_icons_liquify_main.png
+share/apps/krita/pics/light_transform_icons_liquify_move.png
+share/apps/krita/pics/light_transform_icons_liquify_offset.png
+share/apps/krita/pics/light_transform_icons_liquify_resize.png
+share/apps/krita/pics/light_transform_icons_liquify_rotate.png
+share/apps/krita/pics/light_transform_icons_liquify_rotateCCW.png
+share/apps/krita/pics/light_transform_icons_main.png
+share/apps/krita/pics/light_transform_icons_penPressure.png
+share/apps/krita/pics/light_transform_icons_perspective.png
+share/apps/krita/pics/light_transform_icons_warp.png
 share/apps/krita/pics/linked.png
+share/apps/krita/pics/linked2.png
 share/apps/krita/pics/local_selection_active.png
 share/apps/krita/pics/local_selection_inactive.png
 share/apps/krita/pics/locked.png
+share/apps/krita/pics/mirrorAxis-HorizontalMove.png
+share/apps/krita/pics/mirrorAxis-VerticalMove.png
 share/apps/krita/pics/newlayer.png
 share/apps/krita/pics/novisible.png
 share/apps/krita/pics/offset_horizontal.png
 share/apps/krita/pics/offset_vertical.png
+share/apps/krita/pics/onionA.png
+share/apps/krita/pics/onionB.png
 share/apps/krita/pics/paintop_presets_disabled.png
 share/apps/krita/pics/paintop_settings_01.png
 share/apps/krita/pics/paintop_settings_02.png
 share/apps/krita/pics/paintop_settings_disabled.png
+share/apps/krita/pics/passthrough-disabled.png
+share/apps/krita/pics/passthrough-enabled.png
 share/apps/krita/pics/polyline.png
 share/apps/krita/pics/portrait.png
 share/apps/krita/pics/precise-pick-layer-icon.xpm
-share/apps/krita/pics/properties.png
 share/apps/krita/pics/ratio_icon.png
+share/apps/krita/pics/reload_preset.png
 share/apps/krita/pics/removefromfolder.png
 share/apps/krita/pics/rotate_cursor.xpm
 share/apps/krita/pics/rotate_discrete.xpm
 share/apps/krita/pics/rotate_smooth.xpm
 share/apps/krita/pics/select_pixel.png
 share/apps/krita/pics/select_shape.png
-share/apps/krita/pics/selection-info.png
 share/apps/krita/pics/selection_add.png
 share/apps/krita/pics/selection_exclude.png
 share/apps/krita/pics/selection_intersect.png
@@ -6218,11 +6475,8 @@ share/apps/krita/pics/selection_subtract
 share/apps/krita/pics/shade.png
 share/apps/krita/pics/shear_horizontal.png
 share/apps/krita/pics/shear_vertical.png
-share/apps/krita/pics/symmetry-horyzontal.png
-share/apps/krita/pics/symmetry-vertical.png
+share/apps/krita/pics/sidebaricon.png
 share/apps/krita/pics/tablet.png
-share/apps/krita/pics/tool_brush_selection.png
-share/apps/krita/pics/tool_brush_selection_cursor.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
@@ -6236,8 +6490,6 @@ share/apps/krita/pics/tool_fill_cursor.p
 share/apps/krita/pics/tool_freehand_cursor.png
 share/apps/krita/pics/tool_gradient_cursor.png
 share/apps/krita/pics/tool_line_cursor.png
-share/apps/krita/pics/tool_magneticoutline_selection.png
-share/apps/krita/pics/tool_magneticoutline_selection_cursor.png
 share/apps/krita/pics/tool_outline_selection.png
 share/apps/krita/pics/tool_outline_selection_cursor.png
 share/apps/krita/pics/tool_path_selection.png
@@ -6282,20 +6534,38 @@ share/apps/krita/predefined_image_sizes/
 share/apps/krita/predefined_image_sizes/A5__600_ppi_.predefinedimage
 share/apps/krita/predefined_image_sizes/A6__300_ppi_.predefinedimage
 share/apps/krita/predefined_image_sizes/A6__600_ppi_.predefinedimage
+share/apps/krita/predefined_image_sizes/Texture_1024x1024.predefinedimage
+share/apps/krita/predefined_image_sizes/Texture_2048x2048.predefinedimage
+share/apps/krita/predefined_image_sizes/Texture_256x256.predefinedimage
+share/apps/krita/predefined_image_sizes/Texture_4096x4096.predefinedimage
+share/apps/krita/predefined_image_sizes/Texture_512x512.predefinedimage
+share/apps/krita/predefined_image_sizes/US_Legal__300_ppi_.predefinedimage
+share/apps/krita/predefined_image_sizes/US_Letter__300_ppi_.predefinedimage
+share/apps/krita/predefined_image_sizes/US_Tabloid__300_ppi_.predefinedimage
 share/apps/krita/shaders/
 share/apps/krita/shaders/bilinear_gradient.frag
 share/apps/krita/shaders/conical_gradient.frag
 share/apps/krita/shaders/conical_symetric_gradient.frag
 share/apps/krita/shaders/cursor.frag
 share/apps/krita/shaders/cursor.vert
-share/apps/krita/shaders/highq_downscale.frag
+share/apps/krita/shaders/highq_downscale_main.frag.inc
+share/apps/krita/shaders/highq_downscale_main_ocio.frag.inc
+share/apps/krita/shaders/highq_downscale_preface.frag.inc
 share/apps/krita/shaders/linear_gradient.frag
 share/apps/krita/shaders/matrix_transform.vert
 share/apps/krita/shaders/matrix_transform_legacy.vert
 share/apps/krita/shaders/radial_gradient.frag
 share/apps/krita/shaders/simple_texture.frag
 share/apps/krita/shaders/simple_texture_legacy.frag
+share/apps/krita/shaders/simple_texture_legacy_main.frag.inc
+share/apps/krita/shaders/simple_texture_legacy_main_ocio.frag.inc
+share/apps/krita/shaders/simple_texture_legacy_preface.frag.inc
+share/apps/krita/shaders/simple_texture_main.frag.inc
+share/apps/krita/shaders/simple_texture_main_ocio.frag.inc
+share/apps/krita/shaders/simple_texture_preface.frag.inc
 share/apps/krita/shaders/square_gradient.frag
+share/apps/krita/tags/
+share/apps/krita/tags/kis_paintoppresets_tags.xml
 share/apps/krita/templates/
 share/apps/krita/templates/comics/
 share/apps/krita/templates/comics/.directory
@@ -6316,11 +6586,13 @@ share/apps/krita/templates/design/.sourc
 share/apps/krita/templates/design/.source/DesignpresentationA3Landscape_4960x3508_300dpiRGB_8bit_.kra
 share/apps/krita/templates/design/.source/DesignpresentationA4portrait_2480x3508_300dpiRGB_8bit_.kra
 share/apps/krita/templates/design/.source/Designscreen4_3_2250x1680_96dpiRGB_8bit_.kra
+share/apps/krita/templates/design/.source/web_design.kra
 share/apps/krita/templates/design/Designcinema16_10_2484x1200_96dpiRGB_8bit_.desktop
 share/apps/krita/templates/design/Designcinema2.39_1_2484x1040_96dpiRGB_8bit_.desktop
 share/apps/krita/templates/design/DesignpresentationA3Landscape_4960x3508_300dpiRGB_8bit_.desktop
 share/apps/krita/templates/design/DesignpresentationA4portrait_2480x3508_300dpiRGB_8bit_.desktop
 share/apps/krita/templates/design/Designscreen4_3_2250x1680_96dpiRGB_8bit_.desktop
+share/apps/krita/templates/design/web_design.desktop
 share/apps/krita/templates/dslr/
 share/apps/krita/templates/dslr/.directory
 share/apps/krita/templates/dslr/.source/
@@ -6334,102 +6606,71 @@ share/apps/krita/templates/dslr/Canon_5D
 share/apps/krita/templates/dslr/Nikon_D3000_3872x2592.desktop
 share/apps/krita/templates/dslr/Nikon_D5000_4288x2848.desktop
 share/apps/krita/templates/dslr/Nikon_D7000_4928x3264.desktop
-share/apps/krita/templates/film/
-share/apps/krita/templates/film/.directory
-share/apps/krita/templates/film/.source/
-share/apps/krita/templates/film/.source/1K_super35_fullAp_1024x778.kra
-share/apps/krita/templates/film/.source/2K_super35_fullAp_2048x1556.kra
-share/apps/krita/templates/film/.source/4K_super35_fullAp_4096x3112.kra
-share/apps/krita/templates/film/.source/HD_720p_1280x720.kra
-share/apps/krita/templates/film/.source/HD_full_1920x1080.kra
-share/apps/krita/templates/film/.source/HD_half_960x540.kra
-share/apps/krita/templates/film/1K_super35_fullAp_1024x778.desktop
-share/apps/krita/templates/film/2K_super35_fullAp_2048x1556.desktop
-share/apps/krita/templates/film/4K_super35_fullAp_4096x3112.desktop
-share/apps/krita/templates/film/HD_720p_1280x720.desktop
-share/apps/krita/templates/film/HD_full_1920x1080.desktop
-share/apps/krita/templates/film/HD_half_960x540.desktop
 share/apps/krita/templates/texture/
 share/apps/krita/templates/texture/.directory
 share/apps/krita/templates/texture/.source/
-share/apps/krita/templates/texture/.source/Texture1k16bitfloatrgb.kra
-share/apps/krita/templates/texture/.source/Texture1k16bitscalar.kra
+share/apps/krita/templates/texture/.source/Texture1024x10248bitsrgb.kra
 share/apps/krita/templates/texture/.source/Texture1k32bitscalar.kra
 share/apps/krita/templates/texture/.source/Texture1k8bitsrgb.kra
-share/apps/krita/templates/texture/.source/Texture2k16bitfloatrgb.kra
-share/apps/krita/templates/texture/.source/Texture2k16bitscalar.kra
+share/apps/krita/templates/texture/.source/Texture2048x20488bitsrgb.kra
+share/apps/krita/templates/texture/.source/Texture256x2568bitsrgb.kra
 share/apps/krita/templates/texture/.source/Texture2k32bitscalar.kra
 share/apps/krita/templates/texture/.source/Texture2k8bitsrgb.kra
-share/apps/krita/templates/texture/.source/Texture4k16bitfloatrgb.kra
-share/apps/krita/templates/texture/.source/Texture4k16bitscalar.kra
+share/apps/krita/templates/texture/.source/Texture4096x40968bitsrgb.kra
 share/apps/krita/templates/texture/.source/Texture4k32bitscalar.kra
 share/apps/krita/templates/texture/.source/Texture4k8bitsrgb.kra
+share/apps/krita/templates/texture/.source/Texture512x5128bitsrgb.kra
+share/apps/krita/templates/texture/.source/Texture8k32bitscalar.kra
 share/apps/krita/templates/texture/.source/Texture8k8bitsrgb.kra
-share/apps/krita/templates/texture/Texture1k16bitfloatrgb.desktop
-share/apps/krita/templates/texture/Texture1k16bitscalar.desktop
+share/apps/krita/templates/texture/Texture1024x10248bitsrgb.desktop
 share/apps/krita/templates/texture/Texture1k32bitscalar.desktop
 share/apps/krita/templates/texture/Texture1k8bitsrgb.desktop
-share/apps/krita/templates/texture/Texture2k16bitfloatrgb.desktop
-share/apps/krita/templates/texture/Texture2k16bitscalar.desktop
+share/apps/krita/templates/texture/Texture2048x20488bitsrgb.desktop
+share/apps/krita/templates/texture/Texture256x2568bitsrgb.desktop
 share/apps/krita/templates/texture/Texture2k32bitscalar.desktop
 share/apps/krita/templates/texture/Texture2k8bitsrgb.desktop
-share/apps/krita/templates/texture/Texture4k16bitfloatrgb.desktop
-share/apps/krita/templates/texture/Texture4k16bitscalar.desktop
+share/apps/krita/templates/texture/Texture4096x40968bitsrgb.desktop
 share/apps/krita/templates/texture/Texture4k32bitscalar.desktop
 share/apps/krita/templates/texture/Texture4k8bitsrgb.desktop
-share/apps/krita/templates/texture/Texture8k16bitfloatrgb.desktop
-share/apps/krita/templates/texture/Texture8k16bitscalar.desktop
+share/apps/krita/templates/texture/Texture512x5128bitsrgb.desktop
 share/apps/krita/templates/texture/Texture8k32bitscalar.desktop
 share/apps/krita/templates/texture/Texture8k8bitsrgb.desktop
 share/apps/krita/workspaces/
-share/apps/krita/workspaces/Default.kws
-share/apps/krita/workspaces/PaintingHD.kws
-share/apps/krita/workspaces/PaintingHD_2Panels.kws
-share/apps/krita/workspaces/PaintingSD.kws
-share/apps/krita/workspaces/VectorHD.kws
-share/apps/krita/workspaces/VectorSD.kws
+share/apps/krita/workspaces/Big_Paint.kws
+share/apps/krita/workspaces/Big_Paint_2.kws
+share/apps/krita/workspaces/Big_Vector.kws
+share/apps/krita/workspaces/Small_Paint.kws
+share/apps/krita/workspaces/Small_Vector.kws
+share/apps/krita/workspaces/VFX_Paint.kws
+share/apps/kritaanimation/
+share/apps/kritaanimation/input/
+share/apps/kritaanimation/input/kritadefault.profile
 share/apps/kritagemini/
 share/apps/kritagemini/input/
 share/apps/kritagemini/input/kritadefault.profile
-share/apps/kritagemini/kritagemini.qml
 share/apps/kritaplugins/
 share/apps/kritaplugins/bigbrother.rc
 share/apps/kritaplugins/clonesarray.rc
 share/apps/kritaplugins/colorrange.rc
 share/apps/kritaplugins/colorspaceconversion.rc
-share/apps/kritaplugins/dropshadow.rc
 share/apps/kritaplugins/gmic.rc
 share/apps/kritaplugins/histogram.rc
 share/apps/kritaplugins/imageseparate.rc
 share/apps/kritaplugins/imagesize.rc
 share/apps/kritaplugins/imagesplit.rc
+share/apps/kritaplugins/layersplit.rc
 share/apps/kritaplugins/metadataeditor/
 share/apps/kritaplugins/metadataeditor.rc
 share/apps/kritaplugins/metadataeditor/dublincore.rc
-share/apps/kritaplugins/metadataeditor/dublincore.ui
 share/apps/kritaplugins/metadataeditor/exif.rc
-share/apps/kritaplugins/metadataeditor/exif.ui
 share/apps/kritaplugins/modify_selection.rc
 share/apps/kritaplugins/offsetimage.rc
+share/apps/kritaplugins/resourcemanager.rc
 share/apps/kritaplugins/rotateimage.rc
 share/apps/kritaplugins/shearimage.rc
 share/apps/kritasketch/
-share/apps/kritasketch/fonts/
-share/apps/kritasketch/fonts/SourceSansPro-Black.otf
-share/apps/kritasketch/fonts/SourceSansPro-BlackIt.otf
-share/apps/kritasketch/fonts/SourceSansPro-Bold.otf
-share/apps/kritasketch/fonts/SourceSansPro-BoldIt.otf
-share/apps/kritasketch/fonts/SourceSansPro-ExtraLight.otf
-share/apps/kritasketch/fonts/SourceSansPro-ExtraLightIt.otf
-share/apps/kritasketch/fonts/SourceSansPro-It.otf
-share/apps/kritasketch/fonts/SourceSansPro-Light.otf
-share/apps/kritasketch/fonts/SourceSansPro-LightIt.otf
-share/apps/kritasketch/fonts/SourceSansPro-Regular.otf
-share/apps/kritasketch/fonts/SourceSansPro-Semibold.otf
-share/apps/kritasketch/fonts/SourceSansPro-SemiboldIt.otf
 share/apps/kritasketch/input/
 share/apps/kritasketch/input/kritadefault.profile
-share/apps/kritasketch/kritasketch.qml
 share/apps/musicshape/
 share/apps/musicshape/fonts/
 share/apps/musicshape/fonts/Emmentaler-14.ttf
@@ -6791,6 +7032,10 @@ share/apps/stage/icons/hicolor/64x64/act
 share/apps/stage/icons/hicolor/64x64/actions/zoom_animation.png
 share/apps/stage/icons/hicolor/scalable/
 share/apps/stage/icons/hicolor/scalable/actions/
+share/apps/stage/icons/hicolor/scalable/actions/cohere-blue.svgz
+share/apps/stage/icons/hicolor/scalable/actions/cohere-gold.svgz
+share/apps/stage/icons/hicolor/scalable/actions/cohere-magenta.svgz
+share/apps/stage/icons/hicolor/scalable/actions/cohere-red.svgz
 share/apps/stage/icons/hicolor/scalable/actions/template_emptylandscape.svgz
 share/apps/stage/pics/
 share/apps/stage/pics/layout-elements.svg
@@ -6818,6 +7063,10 @@ share/apps/stage/templates/odf/.source/
 share/apps/stage/templates/odf/.source/blue_orange_vector.otp
 share/apps/stage/templates/odf/.source/burning_desire.otp
 share/apps/stage/templates/odf/.source/business.otp
+share/apps/stage/templates/odf/.source/cohere-blue.otp
+share/apps/stage/templates/odf/.source/cohere-gold.otp
+share/apps/stage/templates/odf/.source/cohere-magenta.otp
+share/apps/stage/templates/odf/.source/cohere-red.otp
 share/apps/stage/templates/odf/.source/curious_penguin.otp
 share/apps/stage/templates/odf/.source/flood_light.otp
 share/apps/stage/templates/odf/.source/kde_events.otp
@@ -6830,9 +7079,33 @@ share/apps/stage/templates/odf/.source/s
 share/apps/stage/templates/odf/.source/skyline_night.otp
 share/apps/stage/templates/odf/.source/skyline_night_wide.otp
 share/apps/stage/templates/odf/.source/strange_far_hills.otp
+share/apps/stage/templates/odf/.thumbnail/
+share/apps/stage/templates/odf/.thumbnail/blue_orange_vector.png
+share/apps/stage/templates/odf/.thumbnail/burning_desire.png
+share/apps/stage/templates/odf/.thumbnail/business.png
+share/apps/stage/templates/odf/.thumbnail/cohere-blue.png
+share/apps/stage/templates/odf/.thumbnail/cohere-gold.png
+share/apps/stage/templates/odf/.thumbnail/cohere-magenta.png
+share/apps/stage/templates/odf/.thumbnail/cohere-red.png
+share/apps/stage/templates/odf/.thumbnail/curious_penguin.png
+share/apps/stage/templates/odf/.thumbnail/flood_light.png
+share/apps/stage/templates/odf/.thumbnail/kde_events.png
+share/apps/stage/templates/odf/.thumbnail/rounded_square.png
+share/apps/stage/templates/odf/.thumbnail/simple_waves.png
+share/apps/stage/templates/odf/.thumbnail/skyline_monotone.png
+share/apps/stage/templates/odf/.thumbnail/skyline_monotone_wide.png
+share/apps/stage/templates/odf/.thumbnail/skyline_morning.png
+share/apps/stage/templates/odf/.thumbnail/skyline_morning_wide.png
+share/apps/stage/templates/odf/.thumbnail/skyline_night.png
+share/apps/stage/templates/odf/.thumbnail/skyline_night_wide.png
+share/apps/stage/templates/odf/.thumbnail/strange_far_hills.png
 share/apps/stage/templates/odf/blue_orange_vector.desktop
 share/apps/stage/templates/odf/burning_desire.desktop
 share/apps/stage/templates/odf/business.desktop
+share/apps/stage/templates/odf/cohere-blue.desktop
+share/apps/stage/templates/odf/cohere-gold.desktop
+share/apps/stage/templates/odf/cohere-magenta.desktop
+share/apps/stage/templates/odf/cohere-red.desktop
 share/apps/stage/templates/odf/curious_penguin.desktop
 share/apps/stage/templates/odf/flood_light.desktop
 share/apps/stage/templates/odf/kde_events.desktop
@@ -6886,6 +7159,11 @@ share/apps/words/templates/Normal/.sourc
 share/apps/words/templates/Normal/.source/FaxLetter.odt
 share/apps/words/templates/Normal/.source/ProfessionalA4.odt
 share/apps/words/templates/Normal/.source/ProfessionalLetter.odt
+share/apps/words/templates/Normal/.thumbnail/
+share/apps/words/templates/Normal/.thumbnail/a4.png
+share/apps/words/templates/Normal/.thumbnail/colorful.png
+share/apps/words/templates/Normal/.thumbnail/fax.png
+share/apps/words/templates/Normal/.thumbnail/professional.png
 share/apps/words/templates/Normal/A4.desktop
 share/apps/words/templates/Normal/ColorfulA4.desktop
 share/apps/words/templates/Normal/ColorfulLetter.desktop
@@ -6912,20 +7190,64 @@ share/calligraactive/qml/RecentFiles.qml
 share/calligraactive/qml/SlideSelector.qml
 share/calligraactive/qml/SpreadsheetLeftToolbar.qml
 share/calligraactive/qml/SpreadsheetRightToolbar.qml
+share/calligraactive/qml/Test.qml
 share/calligraactive/qml/TextDocumentCenterOverlay.qml
 share/calligraactive/qml/TextDocumentEditingToolbar.qml
 share/calligraactive/qml/Toolbars.qml
 share/color/
 share/color/icc/
 share/color/icc/krita/
+share/color/icc/krita/AllColorsRGB-elle-V2-g10.icc
+share/color/icc/krita/AllColorsRGB-elle-V2-srgbtrc.icc
+share/color/icc/krita/AllColorsRGB-elle-V4-g10.icc
+share/color/icc/krita/AllColorsRGB-elle-V4-srgbtrc.icc
+share/color/icc/krita/CIERGB-elle-V2-g10.icc
+share/color/icc/krita/CIERGB-elle-V2-g22.icc
+share/color/icc/krita/CIERGB-elle-V2-srgbtrc.icc
+share/color/icc/krita/CIERGB-elle-V4-g10.icc
+share/color/icc/krita/CIERGB-elle-V4-g22.icc
+share/color/icc/krita/CIERGB-elle-V4-srgbtrc.icc
+share/color/icc/krita/CMakeLists.txt
+share/color/icc/krita/ClayRGB-elle-V2-g10.icc
+share/color/icc/krita/ClayRGB-elle-V2-g22.icc
+share/color/icc/krita/ClayRGB-elle-V2-srgbtrc.icc
+share/color/icc/krita/ClayRGB-elle-V4-g10.icc
+share/color/icc/krita/ClayRGB-elle-V4-g22.icc
+share/color/icc/krita/ClayRGB-elle-V4-srgbtrc.icc
+share/color/icc/krita/Gray-D50-elle-V2-g10.icc
+share/color/icc/krita/Gray-D50-elle-V2-g18.icc
+share/color/icc/krita/Gray-D50-elle-V2-g22.icc
+share/color/icc/krita/Gray-D50-elle-V2-srgbtrc.icc
+share/color/icc/krita/Gray-D50-elle-V4-g10.icc
+share/color/icc/krita/Gray-D50-elle-V4-g18.icc
+share/color/icc/krita/Gray-D50-elle-V4-g22.icc
+share/color/icc/krita/Gray-D50-elle-V4-srgbtrc.icc
+share/color/icc/krita/IdentityRGB-elle-V2-g10.icc
+share/color/icc/krita/IdentityRGB-elle-V2-srgbtrc.icc
+share/color/icc/krita/IdentityRGB-elle-V4-g10.icc
+share/color/icc/krita/IdentityRGB-elle-V4-srgbtrc.icc
+share/color/icc/krita/Lab-D50-Identity-elle-V2.icc
+share/color/icc/krita/Lab-D50-Identity-elle-V4.icc
+share/color/icc/krita/LargeRGB-elle-V2-g10.icc
+share/color/icc/krita/LargeRGB-elle-V2-g18.icc
+share/color/icc/krita/LargeRGB-elle-V2-srgbtrc.icc
+share/color/icc/krita/LargeRGB-elle-V4-g10.icc
+share/color/icc/krita/LargeRGB-elle-V4-g18.icc
+share/color/icc/krita/LargeRGB-elle-V4-srgbtrc.icc
 share/color/icc/krita/README
-share/color/icc/krita/WideGamut.icm
+share/color/icc/krita/WideRGB-elle-V2-g10.icc
+share/color/icc/krita/WideRGB-elle-V2-g22.icc
+share/color/icc/krita/WideRGB-elle-V2-srgbtrc.icc
+share/color/icc/krita/WideRGB-elle-V4-g10.icc
+share/color/icc/krita/WideRGB-elle-V4-g22.icc
+share/color/icc/krita/WideRGB-elle-V4-srgbtrc.icc
+share/color/icc/krita/cmyk.icm
 share/color/icc/krita/krita25_lcms-builtin-sRGB_g100-truegamma.icc
-share/color/icc/krita/sRGB.icm
+share/color/icc/krita/sRGB-elle-V2-g10.icc
+share/color/icc/krita/sRGB-elle-V2-srgbtrc.icc
+share/color/icc/krita/sRGB-elle-V4-g10.icc
+share/color/icc/krita/sRGB-elle-V4-srgbtrc.icc
 share/color/icc/krita/scRGB.icm
-share/color/icc/pigment/
-share/color/icc/pigment/CMY.icm
-share/color/icc/pigment/fogra27l.icm
 share/config.kcfg/plansettings.kcfg
 share/config.kcfg/planworksettings.kcfg
 share/config.kcfg/sheets.kcfg
@@ -6935,15 +7257,11 @@ share/config/flowrc
 share/config/karbonrc
 share/config/kexirc
 share/config/kritabrushes.knsrc
-share/config/kritageminipanelsrc
-share/config/kritageminirc
 share/config/kritagradients.knsrc
 share/config/kritaiccprofiles.knsrc
 share/config/kritapatterns.knsrc
 share/config/kritapresets.knsrc
 share/config/kritarc
-share/config/kritasketchpanelsrc
-share/config/kritasketchrc
 share/config/planrc
 share/config/planworkrc
 share/config/sheetsrc
@@ -7067,6 +7385,7 @@ share/icons/hicolor/1024x1024/apps/
 share/icons/hicolor/1024x1024/apps/braindump.png
 share/icons/hicolor/1024x1024/apps/calligraauthor.png
 share/icons/hicolor/1024x1024/apps/calligraflow.png
+share/icons/hicolor/1024x1024/apps/calligragemini.png
 share/icons/hicolor/1024x1024/apps/calligrakarbon.png
 share/icons/hicolor/1024x1024/apps/calligrakexi.png
 share/icons/hicolor/1024x1024/apps/calligrakrita.png
@@ -7077,6 +7396,7 @@ share/icons/hicolor/1024x1024/apps/calli
 share/icons/hicolor/128x128/apps/braindump.png
 share/icons/hicolor/128x128/apps/calligraauthor.png
 share/icons/hicolor/128x128/apps/calligraflow.png
+share/icons/hicolor/128x128/apps/calligragemini.png
 share/icons/hicolor/128x128/apps/calligrakarbon.png
 share/icons/hicolor/128x128/apps/calligrakexi.png
 share/icons/hicolor/128x128/apps/calligrakrita.png
@@ -7085,6 +7405,8 @@ share/icons/hicolor/128x128/apps/calligr
 share/icons/hicolor/128x128/apps/calligrasheets.png
 share/icons/hicolor/128x128/apps/calligrastage.png
 share/icons/hicolor/128x128/apps/calligrawords.png
+share/icons/hicolor/128x128/apps/kritagemini.png
+share/icons/hicolor/128x128/apps/kritasketch.png
 share/icons/hicolor/128x128/mimetypes/application-x-vnd.kde.kplato.png
 share/icons/hicolor/128x128/mimetypes/application-x-vnd.kde.kplato.work.png
 share/icons/hicolor/128x128/mimetypes/application-x-vnd.kde.plan.png
@@ -7095,6 +7417,7 @@ share/icons/hicolor/16x16/actions/pen.pn
 share/icons/hicolor/16x16/apps/braindump.png
 share/icons/hicolor/16x16/apps/calligraauthor.png
 share/icons/hicolor/16x16/apps/calligraflow.png
+share/icons/hicolor/16x16/apps/calligragemini.png
 share/icons/hicolor/16x16/apps/calligrakarbon.png
 share/icons/hicolor/16x16/apps/calligrakexi.png
 share/icons/hicolor/16x16/apps/calligrakrita.png
@@ -7103,6 +7426,8 @@ share/icons/hicolor/16x16/apps/calligrap
 share/icons/hicolor/16x16/apps/calligrasheets.png
 share/icons/hicolor/16x16/apps/calligrastage.png
 share/icons/hicolor/16x16/apps/calligrawords.png
+share/icons/hicolor/16x16/apps/kritagemini.png
+share/icons/hicolor/16x16/apps/kritasketch.png
 share/icons/hicolor/16x16/mimetypes/application-x-vnd.kde.kplato.work.png
 share/icons/hicolor/16x16/mimetypes/application-x-vnd.kde.plan.work.png
 share/icons/hicolor/22x22/actions/stateshape.png
@@ -7111,6 +7436,7 @@ share/icons/hicolor/22x22/actions/tool_p
 share/icons/hicolor/22x22/apps/braindump.png
 share/icons/hicolor/22x22/apps/calligraauthor.png
 share/icons/hicolor/22x22/apps/calligraflow.png
+share/icons/hicolor/22x22/apps/calligragemini.png
 share/icons/hicolor/22x22/apps/calligrakarbon.png
 share/icons/hicolor/22x22/apps/calligrakexi.png
 share/icons/hicolor/22x22/apps/calligrakrita.png
@@ -7119,11 +7445,14 @@ share/icons/hicolor/22x22/apps/calligrap
 share/icons/hicolor/22x22/apps/calligrasheets.png
 share/icons/hicolor/22x22/apps/calligrastage.png
 share/icons/hicolor/22x22/apps/calligrawords.png
+share/icons/hicolor/22x22/apps/kritagemini.png
+share/icons/hicolor/22x22/apps/kritasketch.png
 share/icons/hicolor/22x22/mimetypes/application-x-vnd.kde.kplato.work.png
 share/icons/hicolor/22x22/mimetypes/application-x-vnd.kde.plan.work.png
 share/icons/hicolor/256x256/apps/braindump.png
 share/icons/hicolor/256x256/apps/calligraauthor.png
 share/icons/hicolor/256x256/apps/calligraflow.png
+share/icons/hicolor/256x256/apps/calligragemini.png
 share/icons/hicolor/256x256/apps/calligrakarbon.png
 share/icons/hicolor/256x256/apps/calligrakexi.png
 share/icons/hicolor/256x256/apps/calligrakrita.png
@@ -7131,9 +7460,12 @@ share/icons/hicolor/256x256/apps/calligr
 share/icons/hicolor/256x256/apps/calligrasheets.png
 share/icons/hicolor/256x256/apps/calligrastage.png
 share/icons/hicolor/256x256/apps/calligrawords.png
+share/icons/hicolor/256x256/apps/kritagemini.png
+share/icons/hicolor/256x256/apps/kritasketch.png
 share/icons/hicolor/32x32/apps/braindump.png
 share/icons/hicolor/32x32/apps/calligraauthor.png
 share/icons/hicolor/32x32/apps/calligraflow.png
+share/icons/hicolor/32x32/apps/calligragemini.png
 share/icons/hicolor/32x32/apps/calligrakarbon.png
 share/icons/hicolor/32x32/apps/calligrakexi.png
 share/icons/hicolor/32x32/apps/calligrakrita.png
@@ -7142,11 +7474,14 @@ share/icons/hicolor/32x32/apps/calligrap
 share/icons/hicolor/32x32/apps/calligrasheets.png
 share/icons/hicolor/32x32/apps/calligrastage.png
 share/icons/hicolor/32x32/apps/calligrawords.png
+share/icons/hicolor/32x32/apps/kritagemini.png
+share/icons/hicolor/32x32/apps/kritasketch.png
 share/icons/hicolor/32x32/mimetypes/application-x-vnd.kde.kplato.work.png
 share/icons/hicolor/32x32/mimetypes/application-x-vnd.kde.plan.work.png
 share/icons/hicolor/48x48/apps/braindump.png
 share/icons/hicolor/48x48/apps/calligraauthor.png
 share/icons/hicolor/48x48/apps/calligraflow.png
+share/icons/hicolor/48x48/apps/calligragemini.png
 share/icons/hicolor/48x48/apps/calligrakarbon.png
 share/icons/hicolor/48x48/apps/calligrakexi.png
 share/icons/hicolor/48x48/apps/calligrakrita.png
@@ -7155,13 +7490,14 @@ share/icons/hicolor/48x48/apps/calligrap
 share/icons/hicolor/48x48/apps/calligrasheets.png
 share/icons/hicolor/48x48/apps/calligrastage.png
 share/icons/hicolor/48x48/apps/calligrawords.png
+share/icons/hicolor/48x48/apps/kritagemini.png
+share/icons/hicolor/48x48/apps/kritasketch.png
 share/icons/hicolor/48x48/mimetypes/application-x-vnd.kde.kplato.work.png
 share/icons/hicolor/48x48/mimetypes/application-x-vnd.kde.plan.work.png
-share/icons/hicolor/512x512/
-share/icons/hicolor/512x512/apps/
 share/icons/hicolor/512x512/apps/braindump.png
 share/icons/hicolor/512x512/apps/calligraauthor.png
 share/icons/hicolor/512x512/apps/calligraflow.png
+share/icons/hicolor/512x512/apps/calligragemini.png
 share/icons/hicolor/512x512/apps/calligrakarbon.png
 share/icons/hicolor/512x512/apps/calligrakexi.png
 share/icons/hicolor/512x512/apps/calligrakrita.png
@@ -7172,6 +7508,7 @@ share/icons/hicolor/512x512/apps/calligr
 share/icons/hicolor/64x64/apps/braindump.png
 share/icons/hicolor/64x64/apps/calligraauthor.png
 share/icons/hicolor/64x64/apps/calligraflow.png
+share/icons/hicolor/64x64/apps/calligragemini.png
 share/icons/hicolor/64x64/apps/calligrakarbon.png
 share/icons/hicolor/64x64/apps/calligrakexi.png
 share/icons/hicolor/64x64/apps/calligrakrita.png
@@ -7180,6 +7517,8 @@ share/icons/hicolor/64x64/apps/calligrap
 share/icons/hicolor/64x64/apps/calligrasheets.png
 share/icons/hicolor/64x64/apps/calligrastage.png
 share/icons/hicolor/64x64/apps/calligrawords.png
+share/icons/hicolor/64x64/apps/kritagemini.png
+share/icons/hicolor/64x64/apps/kritasketch.png
 share/icons/hicolor/64x64/mimetypes/application-x-vnd.kde.kplato.png
 share/icons/hicolor/64x64/mimetypes/application-x-vnd.kde.kplato.work.png
 share/icons/hicolor/64x64/mimetypes/application-x-vnd.kde.plan.png
@@ -7232,16 +7571,90 @@ share/icons/oxygen/scalable/
 share/icons/oxygen/scalable/actions/
 share/icons/oxygen/scalable/actions/table.svgz
 share/kde4/services/ServiceMenus/
-share/kde4/services/ServiceMenus/flow_print.desktop
-share/kde4/services/ServiceMenus/karbon_print.desktop
-share/kde4/services/ServiceMenus/krita_print.desktop
-share/kde4/services/ServiceMenus/sheets_print.desktop
-share/kde4/services/ServiceMenus/stage_print.desktop
-share/kde4/services/ServiceMenus/words_print.desktop
-share/kde4/services/authorpart.desktop
-share/kde4/services/braindump_shape_state.desktop
-share/kde4/services/braindump_shape_web.desktop
+share/kde4/services/ServiceMenus/calligra/
+share/kde4/services/ServiceMenus/calligra/flow_print.desktop
+share/kde4/services/ServiceMenus/calligra/karbon_print.desktop
+share/kde4/services/ServiceMenus/calligra/krita_print.desktop
+share/kde4/services/ServiceMenus/calligra/sheets_print.desktop
+share/kde4/services/ServiceMenus/calligra/stage_print.desktop
+share/kde4/services/ServiceMenus/calligra/words_print.desktop
 share/kde4/services/calligra/
+share/kde4/services/calligra/authorpart.desktop
+share/kde4/services/calligra/braindump_shape_state.desktop
+share/kde4/services/calligra/braindump_shape_web.desktop
+share/kde4/services/calligra/calligra_docker_defaults.desktop
+share/kde4/services/calligra/calligra_filter_applixspread2kspread.desktop
+share/kde4/services/calligra/calligra_filter_applixword2odt.desktop
+share/kde4/services/calligra/calligra_filter_ascii2words.desktop
+share/kde4/services/calligra/calligra_filter_csv2sheets.desktop
+share/kde4/services/calligra/calligra_filter_dbase2kspread.desktop
+share/kde4/services/calligra/calligra_filter_doc2odt.desktop
+share/kde4/services/calligra/calligra_filter_docx2odt.desktop
+share/kde4/services/calligra/calligra_filter_gnumeric2sheets.desktop
+share/kde4/services/calligra/calligra_filter_html2ods.desktop
+share/kde4/services/calligra/calligra_filter_karbon1x2karbon.desktop
+share/kde4/services/calligra/calligra_filter_karbon2image.desktop
+share/kde4/services/calligra/calligra_filter_karbon2svg.desktop
+share/kde4/services/calligra/calligra_filter_karbon2wmf.desktop
+share/kde4/services/calligra/calligra_filter_kpr2odp.desktop
+share/kde4/services/calligra/calligra_filter_kspread2tex.desktop
+share/kde4/services/calligra/calligra_filter_mpp2plan.desktop
+share/kde4/services/calligra/calligra_filter_mpx2plan.desktop
+share/kde4/services/calligra/calligra_filter_odt2ascii.desktop
+share/kde4/services/calligra/calligra_filter_odt2docx.desktop
+share/kde4/services/calligra/calligra_filter_odt2epub2.desktop
+share/kde4/services/calligra/calligra_filter_odt2html.desktop
+share/kde4/services/calligra/calligra_filter_odt2mobi.desktop
+share/kde4/services/calligra/calligra_filter_opencalc2sheets.desktop
+share/kde4/services/calligra/calligra_filter_pdf2svg.desktop
+share/kde4/services/calligra/calligra_filter_planner2plan.desktop
+share/kde4/services/calligra/calligra_filter_ppt2odp.desktop
+share/kde4/services/calligra/calligra_filter_pptx2odp.desktop
+share/kde4/services/calligra/calligra_filter_qpro2sheets.desktop
+share/kde4/services/calligra/calligra_filter_rtf2odt.desktop
+share/kde4/services/calligra/calligra_filter_sheets2csv.desktop
+share/kde4/services/calligra/calligra_filter_sheets2gnumeric.desktop
+share/kde4/services/calligra/calligra_filter_sheets2html.desktop
+share/kde4/services/calligra/calligra_filter_sheets2opencalc.desktop
+share/kde4/services/calligra/calligra_filter_svg2karbon.desktop
+share/kde4/services/calligra/calligra_filter_wmf2svg.desktop
+share/kde4/services/calligra/calligra_filter_xfig2odg.desktop
+share/kde4/services/calligra/calligra_filter_xls2ods.desktop
+share/kde4/services/calligra/calligra_filter_xlsx2ods.desktop
+share/kde4/services/calligra/calligra_semanticitem_contact.desktop
+share/kde4/services/calligra/calligra_semanticitem_event.desktop
+share/kde4/services/calligra/calligra_semanticitem_location.desktop
+share/kde4/services/calligra/calligra_shape_artistictext.desktop
+share/kde4/services/calligra/calligra_shape_chart.desktop
+share/kde4/services/calligra/calligra_shape_formular.desktop
+share/kde4/services/calligra/calligra_shape_music.desktop
+share/kde4/services/calligra/calligra_shape_paths.desktop
+share/kde4/services/calligra/calligra_shape_picture.desktop
+share/kde4/services/calligra/calligra_shape_plugin.desktop
+share/kde4/services/calligra/calligra_shape_spreadsheet-deferred.desktop
+share/kde4/services/calligra/calligra_shape_spreadsheet.desktop
+share/kde4/services/calligra/calligra_shape_text.desktop
+share/kde4/services/calligra/calligra_shape_vector.desktop
+share/kde4/services/calligra/calligra_shape_video.desktop
+share/kde4/services/calligra/calligra_textediting_autocorrect.desktop
+share/kde4/services/calligra/calligra_textediting_changecase.desktop
+share/kde4/services/calligra/calligra_textediting_spellcheck.desktop
+share/kde4/services/calligra/calligra_textediting_thesaurus.desktop
+share/kde4/services/calligra/calligra_textinlineobject_variables.desktop
+share/kde4/services/calligra/calligra_tool_basicflakes.desktop
+share/kde4/services/calligra/calligra_tool_defaults.desktop
+share/kde4/services/calligra/calligradocinfopropspage.desktop
+share/kde4/services/calligra/calligrastageeventactions.desktop
+share/kde4/services/calligra/calligrastagetoolanimation.desktop
+share/kde4/services/calligra/flowdockersplugin.desktop
+share/kde4/services/calligra/flowpart.desktop
+share/kde4/services/calligra/karbonfiltereffects.desktop
+share/kde4/services/calligra/karbonflattenpathplugin.desktop
+share/kde4/services/calligra/karbonpart.desktop
+share/kde4/services/calligra/karbonrefinepathplugin.desktop
+share/kde4/services/calligra/karbonroundcornersplugin.desktop
+share/kde4/services/calligra/karbontools.desktop
+share/kde4/services/calligra/karbonwhirlpinchplugin.desktop
 share/kde4/services/calligra/kexicsv_importexporthandler.desktop
 share/kde4/services/calligra/kexidb_mysqldriver.desktop
 share/kde4/services/calligra/kexidb_pqxxsqldriver.desktop
@@ -7265,251 +7678,193 @@ share/kde4/services/calligra/kformdesign
 share/kde4/services/calligra/kformdesigner_mapbrowser.desktop
 share/kde4/services/calligra/kformdesigner_stdwidgets.desktop
 share/kde4/services/calligra/kformdesigner_webbrowser.desktop
+share/kde4/services/calligra/kformulapart.desktop
+share/kde4/services/calligra/kolcmsengine.desktop
+share/kde4/services/calligra/kopabackgroundtool.desktop
 share/kde4/services/calligra/koreport_barcodeplugin.desktop
 share/kde4/services/calligra/koreport_chartplugin.desktop
 share/kde4/services/calligra/koreport_mapsplugin.desktop
 share/kde4/services/calligra/koreport_webplugin.desktop
-share/kde4/services/calligra_docker_defaults.desktop
-share/kde4/services/calligra_filter_applixspread2kspread.desktop
-share/kde4/services/calligra_filter_applixword2odt.desktop
-share/kde4/services/calligra_filter_ascii2words.desktop
-share/kde4/services/calligra_filter_csv2sheets.desktop
-share/kde4/services/calligra_filter_dbase2kspread.desktop
-share/kde4/services/calligra_filter_doc2odt.desktop
-share/kde4/services/calligra_filter_docx2odt.desktop
-share/kde4/services/calligra_filter_gnumeric2sheets.desktop
-share/kde4/services/calligra_filter_html2ods.desktop
-share/kde4/services/calligra_filter_karbon1x2karbon.desktop
-share/kde4/services/calligra_filter_karbon2jpg.desktop
-share/kde4/services/calligra_filter_karbon2png.desktop
-share/kde4/services/calligra_filter_karbon2svg.desktop
-share/kde4/services/calligra_filter_karbon2wmf.desktop
-share/kde4/services/calligra_filter_kpr2odp.desktop
-share/kde4/services/calligra_filter_kspread2tex.desktop
-share/kde4/services/calligra_filter_mpp2plan.desktop
-share/kde4/services/calligra_filter_mpx2plan.desktop
-share/kde4/services/calligra_filter_odt2ascii.desktop
-share/kde4/services/calligra_filter_odt2epub2.desktop
-share/kde4/services/calligra_filter_odt2html.desktop
-share/kde4/services/calligra_filter_odt2mobi.desktop
-share/kde4/services/calligra_filter_opencalc2sheets.desktop
-share/kde4/services/calligra_filter_pdf2svg.desktop
-share/kde4/services/calligra_filter_planner2plan.desktop
-share/kde4/services/calligra_filter_ppt2odp.desktop
-share/kde4/services/calligra_filter_pptx2odp.desktop
-share/kde4/services/calligra_filter_qpro2sheets.desktop
-share/kde4/services/calligra_filter_rtf2odt.desktop
-share/kde4/services/calligra_filter_sheets2csv.desktop
-share/kde4/services/calligra_filter_sheets2gnumeric.desktop
-share/kde4/services/calligra_filter_sheets2html.desktop
-share/kde4/services/calligra_filter_sheets2opencalc.desktop
-share/kde4/services/calligra_filter_svg2karbon.desktop
-share/kde4/services/calligra_filter_svgz2karbon.desktop
-share/kde4/services/calligra_filter_wmf2svg.desktop
-share/kde4/services/calligra_filter_xfig2odg.desktop
-share/kde4/services/calligra_filter_xls2ods.desktop
-share/kde4/services/calligra_filter_xlsx2ods.desktop
+share/kde4/services/calligra/kpr_pageeffect_barwipe.desktop
+share/kde4/services/calligra/kpr_pageeffect_clockwipe.desktop
+share/kde4/services/calligra/kpr_pageeffect_edgewipe.desktop
+share/kde4/services/calligra/kpr_pageeffect_fade.desktop
+share/kde4/services/calligra/kpr_pageeffect_iriswipe.desktop
+share/kde4/services/calligra/kpr_pageeffect_matrixwipe.desktop
+share/kde4/services/calligra/kpr_pageeffect_slidewipe.desktop
+share/kde4/services/calligra/kpr_pageeffect_spacerotation.desktop
+share/kde4/services/calligra/kpr_pageeffect_swapeffect.desktop
+share/kde4/services/calligra/kpr_shapeanimation_example.desktop
+share/kde4/services/calligra/kprvariables.desktop
+share/kde4/services/calligra/krita_artisticcolorselector.desktop
+share/kde4/services/calligra/krita_bmp_export.desktop
+share/kde4/services/calligra/krita_bmp_import.desktop
+share/kde4/services/calligra/krita_channeldocker.desktop
+share/kde4/services/calligra/krita_colorselectorng.desktop
+share/kde4/services/calligra/krita_colorslider.desktop
+share/kde4/services/calligra/krita_colorspaces_extensions_plugin.desktop
+share/kde4/services/calligra/krita_compositiondocker.desktop
+share/kde4/services/calligra/krita_digitalmixer.desktop
+share/kde4/services/calligra/krita_exr_export.desktop
+share/kde4/services/calligra/krita_exr_import.desktop
+share/kde4/services/calligra/krita_heightmap_export.desktop
+share/kde4/services/calligra/krita_heightmap_import.desktop
+share/kde4/services/calligra/krita_jp2_export.desktop
+share/kde4/services/calligra/krita_jp2_import.desktop
+share/kde4/services/calligra/krita_jpeg_export.desktop
+share/kde4/services/calligra/krita_jpeg_import.desktop
+share/kde4/services/calligra/krita_lutdocker.desktop
+share/kde4/services/calligra/krita_odg_import.desktop
+share/kde4/services/calligra/krita_ora_export.desktop
+share/kde4/services/calligra/krita_ora_import.desktop
+share/kde4/services/calligra/krita_ora_thumbnail.desktop
+share/kde4/services/calligra/krita_overviewdocker.desktop
+share/kde4/services/calligra/krita_palettedocker.desktop
+share/kde4/services/calligra/krita_patterndocker.desktop
+share/kde4/services/calligra/krita_pdf_import.desktop
+share/kde4/services/calligra/krita_png_export.desktop
+share/kde4/services/calligra/krita_png_import.desktop
+share/kde4/services/calligra/krita_ppm_export.desktop
+share/kde4/services/calligra/krita_ppm_import.desktop
+share/kde4/services/calligra/krita_presetdocker.desktop
+share/kde4/services/calligra/krita_presethistory.desktop
+share/kde4/services/calligra/krita_psd_export.desktop
+share/kde4/services/calligra/krita_psd_import.desktop
+share/kde4/services/calligra/krita_qml_export.desktop
+share/kde4/services/calligra/krita_raw_import.desktop
+share/kde4/services/calligra/krita_smallcolorselector.desktop
+share/kde4/services/calligra/krita_specificcolorselector.desktop
+share/kde4/services/calligra/krita_tasksetdocker.desktop
+share/kde4/services/calligra/krita_tga_export.desktop
+share/kde4/services/calligra/krita_tga_import.desktop
+share/kde4/services/calligra/krita_tiff_export.desktop
+share/kde4/services/calligra/krita_tiff_import.desktop
+share/kde4/services/calligra/krita_xcf_import.desktop
+share/kde4/services/calligra/kritabigbrother.desktop
+share/kde4/services/calligra/kritablurfilter.desktop
+share/kde4/services/calligra/kritachalkpaintop.desktop
+share/kde4/services/calligra/kritaclonesarray.desktop
+share/kde4/services/calligra/kritacolorgenerator.desktop
+share/kde4/services/calligra/kritacolorrange.desktop
+share/kde4/services/calligra/kritacolorsfilter.desktop
+share/kde4/services/calligra/kritacolorsmudgepaintop.desktop
+share/kde4/services/calligra/kritacolorspaceconversion.desktop
+share/kde4/services/calligra/kritaconvolutionfilters.desktop
+share/kde4/services/calligra/kritacurvepaintop.desktop
+share/kde4/services/calligra/kritadefaultdockers.desktop
+share/kde4/services/calligra/kritadefaultpaintops.desktop
+share/kde4/services/calligra/kritadefaulttools.desktop
+share/kde4/services/calligra/kritadeformpaintop.desktop
+share/kde4/services/calligra/kritadodgeburn.desktop
+share/kde4/services/calligra/kritadynapaintop.desktop
+share/kde4/services/calligra/kritaembossfilter.desktop
+share/kde4/services/calligra/kritaexample.desktop
+share/kde4/services/calligra/kritaexperimentpaintop.desktop
+share/kde4/services/calligra/kritaextensioncolorsfilters.desktop
+share/kde4/services/calligra/kritafastcolortransfer.desktop
+share/kde4/services/calligra/kritafilterop.desktop
+share/kde4/services/calligra/kritagmic.desktop
+share/kde4/services/calligra/kritagridpaintop.desktop
+share/kde4/services/calligra/kritahairypaintop.desktop
+share/kde4/services/calligra/kritahatchingpaintop.desktop
+share/kde4/services/calligra/kritahistogram.desktop
+share/kde4/services/calligra/kritahistorydocker.desktop
+share/kde4/services/calligra/kritaimagedocker.desktop
+share/kde4/services/calligra/kritaimageenhancement.desktop
+share/kde4/services/calligra/kritaimagesize.desktop
+share/kde4/services/calligra/kritaimagesplit.desktop
+share/kde4/services/calligra/kritaindexcolors.desktop
+share/kde4/services/calligra/kritalayergroupswitcher.desktop
+share/kde4/services/calligra/kritalayersplit.desktop
+share/kde4/services/calligra/kritalevelfilter.desktop
+share/kde4/services/calligra/kritametadataeditor.desktop
+share/kde4/services/calligra/kritamodifyselection.desktop
+share/kde4/services/calligra/kritanoisefilter.desktop
+share/kde4/services/calligra/kritaoffsetimage.desktop
+share/kde4/services/calligra/kritaoilpaintfilter.desktop
+share/kde4/services/calligra/kritaparticlepaintop.desktop
+share/kde4/services/calligra/kritapatterngenerator.desktop
+share/kde4/services/calligra/kritaphongbumpmapfilter.desktop
+share/kde4/services/calligra/kritapixelizefilter.desktop
+share/kde4/services/calligra/kritaposterize.desktop
+share/kde4/services/calligra/kritaraindropsfilter.desktop
+share/kde4/services/calligra/kritarandompickfilter.desktop
+share/kde4/services/calligra/kritaresourcemanager.desktop
+share/kde4/services/calligra/kritarotateimage.desktop
+share/kde4/services/calligra/kritaroundcornersfilter.desktop
+share/kde4/services/calligra/kritarulerassistanttool.desktop
+share/kde4/services/calligra/kritaselectiontools.desktop
+share/kde4/services/calligra/kritaseparatechannels.desktop
+share/kde4/services/calligra/kritashearimage.desktop
+share/kde4/services/calligra/kritasketchpaintop.desktop
+share/kde4/services/calligra/kritasmalltilesfilter.desktop
+share/kde4/services/calligra/kritasobelfilter.desktop
+share/kde4/services/calligra/kritaspraypaintop.desktop
+share/kde4/services/calligra/kritatoolcrop.desktop
+share/kde4/services/calligra/kritatooldyna.desktop
+share/kde4/services/calligra/kritatoolgrid.desktop
+share/kde4/services/calligra/kritatoolperspectivegrid.desktop
+share/kde4/services/calligra/kritatoolpolygon.desktop
+share/kde4/services/calligra/kritatoolpolyline.desktop
+share/kde4/services/calligra/kritatooltext.desktop
+share/kde4/services/calligra/kritatooltransform.desktop
+share/kde4/services/calligra/kritaunsharpfilter.desktop
+share/kde4/services/calligra/kritawavefilter.desktop
+share/kde4/services/calligra/krossmoduleplan.desktop
+share/kde4/services/calligra/krossmodulesheets.desktop
+share/kde4/services/calligra/kspread_plugin_tool_calendar.desktop
+share/kde4/services/calligra/kspreadbitopsmodule.desktop
+share/kde4/services/calligra/kspreadconversionmodule.desktop
+share/kde4/services/calligra/kspreaddatabasemodule.desktop
+share/kde4/services/calligra/kspreaddatetimemodule.desktop
+share/kde4/services/calligra/kspreadengineeringmodule.desktop
+share/kde4/services/calligra/kspreadfinancialmodule.desktop
+share/kde4/services/calligra/kspreadinformationmodule.desktop
+share/kde4/services/calligra/kspreadlogicmodule.desktop
+share/kde4/services/calligra/kspreadmathmodule.desktop
+share/kde4/services/calligra/kspreadreferencemodule.desktop
+share/kde4/services/calligra/kspreadstatisticalmodule.desktop
+share/kde4/services/calligra/kspreadtextmodule.desktop
+share/kde4/services/calligra/kspreadtrigonometrymodule.desktop
+share/kde4/services/calligra/libokularGenerator_doc_calligra.desktop
+share/kde4/services/calligra/libokularGenerator_docx_calligra.desktop
+share/kde4/services/calligra/okularDoc_calligra.desktop
+share/kde4/services/calligra/okularDocx_calligra.desktop
+share/kde4/services/calligra/plan_icalendar_export.desktop
+share/kde4/services/calligra/plan_kplato_import.desktop
+share/kde4/services/calligra/planpart.desktop
+share/kde4/services/calligra/planrcpsscheduler.desktop
+share/kde4/services/calligra/planscripting.desktop
+share/kde4/services/calligra/plantjscheduler.desktop
+share/kde4/services/calligra/planworkpart.desktop
+share/kde4/services/calligra/sheetspart.desktop
+share/kde4/services/calligra/sheetsscripting.desktop
+share/kde4/services/calligra/sheetssolver.desktop
+share/kde4/services/calligra/stagepart.desktop
+share/kde4/services/calligra/wordspart.desktop
+share/kde4/services/calligra_filter_odt2wiki.desktop
 share/kde4/services/calligra_odg_thumbnail.desktop
-share/kde4/services/calligra_semanticitem_contact.desktop
-share/kde4/services/calligra_semanticitem_event.desktop
-share/kde4/services/calligra_semanticitem_location.desktop
-share/kde4/services/calligra_shape_artistictext.desktop
-share/kde4/services/calligra_shape_chart.desktop
-share/kde4/services/calligra_shape_formular.desktop
-share/kde4/services/calligra_shape_music.desktop
-share/kde4/services/calligra_shape_paths.desktop
-share/kde4/services/calligra_shape_picture.desktop
-share/kde4/services/calligra_shape_plugin.desktop
-share/kde4/services/calligra_shape_spreadsheet-deferred.desktop
-share/kde4/services/calligra_shape_spreadsheet.desktop
-share/kde4/services/calligra_shape_text.desktop
-share/kde4/services/calligra_shape_vector.desktop
-share/kde4/services/calligra_shape_video.desktop
-share/kde4/services/calligra_textediting_autocorrect.desktop
-share/kde4/services/calligra_textediting_changecase.desktop
-share/kde4/services/calligra_textediting_spellcheck.desktop
-share/kde4/services/calligra_textediting_thesaurus.desktop
-share/kde4/services/calligra_textinlineobject_variables.desktop
-share/kde4/services/calligra_tool_basicflakes.desktop
-share/kde4/services/calligra_tool_defaults.desktop
-share/kde4/services/calligradocinfopropspage.desktop
-share/kde4/services/calligrastageeventactions.desktop
-share/kde4/services/calligrastagetoolanimation.desktop
-share/kde4/services/flowdockersplugin.desktop
-share/kde4/services/flowpart.desktop
 share/kde4/services/karbon_karbon1x_thumbnail.desktop
 share/kde4/services/karbon_wmf_thumbnail.desktop
 share/kde4/services/karbon_xfig_thumbnail.desktop
-share/kde4/services/karbonfiltereffects.desktop
-share/kde4/services/karbonflattenpathplugin.desktop
-share/kde4/services/karbonpart.desktop
-share/kde4/services/karbonrefinepathplugin.desktop
-share/kde4/services/karbonroundcornersplugin.desktop
-share/kde4/services/karbontools.desktop
-share/kde4/services/karbonwhirlpinchplugin.desktop
-share/kde4/services/kformulapart.desktop
-share/kde4/services/kolcmsengine.desktop
-share/kde4/services/kopabackgroundtool.desktop
-share/kde4/services/kpr_pageeffect_barwipe.desktop
-share/kde4/services/kpr_pageeffect_clockwipe.desktop
-share/kde4/services/kpr_pageeffect_edgewipe.desktop
-share/kde4/services/kpr_pageeffect_fade.desktop
-share/kde4/services/kpr_pageeffect_iriswipe.desktop
-share/kde4/services/kpr_pageeffect_matrixwipe.desktop
-share/kde4/services/kpr_pageeffect_slidewipe.desktop
-share/kde4/services/kpr_pageeffect_spacerotation.desktop
-share/kde4/services/kpr_pageeffect_swapeffect.desktop
-share/kde4/services/kpr_shapeanimation_example.desktop
-share/kde4/services/kprvariables.desktop
-share/kde4/services/krita_artisticcolorselector.desktop
-share/kde4/services/krita_bmp_export.desktop
-share/kde4/services/krita_bmp_import.desktop
-share/kde4/services/krita_channeldocker.desktop
-share/kde4/services/krita_colorselectorng.desktop
-share/kde4/services/krita_colorspaces_extensions_plugin.desktop
-share/kde4/services/krita_compositiondocker.desktop
-share/kde4/services/krita_digitalmixer.desktop
-share/kde4/services/krita_exr_export.desktop
-share/kde4/services/krita_exr_import.desktop
-share/kde4/services/krita_flipbook_import.desktop
-share/kde4/services/krita_jp2_export.desktop
-share/kde4/services/krita_jp2_import.desktop
-share/kde4/services/krita_jpeg_export.desktop
-share/kde4/services/krita_jpeg_import.desktop
 share/kde4/services/krita_kra_thumbnail.desktop
-share/kde4/services/krita_lutdocker.desktop
-share/kde4/services/krita_odg_import.desktop
-share/kde4/services/krita_ora_export.desktop
-share/kde4/services/krita_ora_import.desktop
-share/kde4/services/krita_ora_thumbnail.desktop
-share/kde4/services/krita_overviewdocker.desktop
-share/kde4/services/krita_palettedocker.desktop
-share/kde4/services/krita_patterndocker.desktop
-share/kde4/services/krita_pdf_import.desktop
-share/kde4/services/krita_png_export.desktop
-share/kde4/services/krita_png_import.desktop
-share/kde4/services/krita_ppm_export.desktop
-share/kde4/services/krita_ppm_import.desktop
-share/kde4/services/krita_presetdocker.desktop
-share/kde4/services/krita_psd_export.desktop
-share/kde4/services/krita_psd_import.desktop
-share/kde4/services/krita_qml_export.desktop
-share/kde4/services/krita_raw_import.desktop
-share/kde4/services/krita_smallcolorselector.desktop
-share/kde4/services/krita_specificcolorselector.desktop
-share/kde4/services/krita_tasksetdocker.desktop
-share/kde4/services/krita_tiff_export.desktop
-share/kde4/services/krita_tiff_import.desktop
-share/kde4/services/krita_xcf_import.desktop
-share/kde4/services/kritabigbrother.desktop
-share/kde4/services/kritablurfilter.desktop
-share/kde4/services/kritachalkpaintop.desktop
-share/kde4/services/kritaclonesarray.desktop
-share/kde4/services/kritacolorgenerator.desktop
-share/kde4/services/kritacolorrange.desktop
-share/kde4/services/kritacolorsfilter.desktop
-share/kde4/services/kritacolorsmudgepaintop.desktop
-share/kde4/services/kritacolorspaceconversion.desktop
-share/kde4/services/kritaconvolutionfilters.desktop
-share/kde4/services/kritacurvepaintop.desktop
-share/kde4/services/kritadefaultdockers.desktop
-share/kde4/services/kritadefaultpaintops.desktop
-share/kde4/services/kritadefaulttools.desktop
-share/kde4/services/kritadeformpaintop.desktop
-share/kde4/services/kritadodgeburn.desktop
-share/kde4/services/kritadropshadow.desktop
-share/kde4/services/kritadynapaintop.desktop
-share/kde4/services/kritaembossfilter.desktop
-share/kde4/services/kritaexample.desktop
-share/kde4/services/kritaexperimentpaintop.desktop
-share/kde4/services/kritaextensioncolorsfilters.desktop
-share/kde4/services/kritafastcolortransfer.desktop
-share/kde4/services/kritafilterop.desktop
-share/kde4/services/kritagmic.desktop
-share/kde4/services/kritagridpaintop.desktop
-share/kde4/services/kritahairypaintop.desktop
-share/kde4/services/kritahatchingpaintop.desktop
-share/kde4/services/kritahistogram.desktop
-share/kde4/services/kritahistorydocker.desktop
-share/kde4/services/kritaimagedocker.desktop
-share/kde4/services/kritaimageenhancement.desktop
-share/kde4/services/kritaimagesize.desktop
-share/kde4/services/kritaimagesplit.desktop
-share/kde4/services/kritalayergroupswitcher.desktop
-share/kde4/services/kritalevelfilter.desktop
-share/kde4/services/kritametadataeditor.desktop
-share/kde4/services/kritamodifyselection.desktop
-share/kde4/services/kritanoisefilter.desktop
-share/kde4/services/kritaoffsetimage.desktop
-share/kde4/services/kritaoilpaintfilter.desktop
-share/kde4/services/kritapart.desktop
-share/kde4/services/kritaparticlepaintop.desktop
-share/kde4/services/kritapatterngenerator.desktop
-share/kde4/services/kritaphongbumpmapfilter.desktop
-share/kde4/services/kritapixelizefilter.desktop
-share/kde4/services/kritaraindropsfilter.desktop
-share/kde4/services/kritarandompickfilter.desktop
-share/kde4/services/kritarotateimage.desktop
-share/kde4/services/kritaroundcornersfilter.desktop
-share/kde4/services/kritarulerassistanttool.desktop
-share/kde4/services/kritaselectiontools.desktop
-share/kde4/services/kritaseparatechannels.desktop
-share/kde4/services/kritashearimage.desktop
-share/kde4/services/kritasketchpaintop.desktop
-share/kde4/services/kritasmalltilesfilter.desktop
-share/kde4/services/kritasobelfilter.desktop
-share/kde4/services/kritaspraypaintop.desktop
-share/kde4/services/kritatoolcrop.desktop
-share/kde4/services/kritatooldyna.desktop
-share/kde4/services/kritatoolgrid.desktop
-share/kde4/services/kritatoolperspectivegrid.desktop
-share/kde4/services/kritatoolpolygon.desktop
-share/kde4/services/kritatoolpolyline.desktop
-share/kde4/services/kritatooltext.desktop
-share/kde4/services/kritatooltransform.desktop
-share/kde4/services/kritaunsharpfilter.desktop
-share/kde4/services/kritawavefilter.desktop
-share/kde4/services/krossmoduleplan.desktop
-share/kde4/services/krossmodulesheets.desktop
-share/kde4/services/kspread_plugin_tool_calendar.desktop
-share/kde4/services/kspreadbitopsmodule.desktop
-share/kde4/services/kspreadconversionmodule.desktop
-share/kde4/services/kspreaddatabasemodule.desktop
-share/kde4/services/kspreaddatetimemodule.desktop
-share/kde4/services/kspreadengineeringmodule.desktop
-share/kde4/services/kspreadfinancialmodule.desktop
-share/kde4/services/kspreadinformationmodule.desktop
-share/kde4/services/kspreadlogicmodule.desktop
-share/kde4/services/kspreadmathmodule.desktop
-share/kde4/services/kspreadreferencemodule.desktop
-share/kde4/services/kspreadstatisticalmodule.desktop
-share/kde4/services/kspreadtextmodule.desktop
-share/kde4/services/kspreadtrigonometrymodule.desktop
 share/kde4/services/libokularGenerator_odp.desktop
+share/kde4/services/libokularGenerator_odt.desktop
 share/kde4/services/okularOdp.desktop
-share/kde4/services/plan_icalendar_export.desktop
-share/kde4/services/plan_kplato_import.desktop
-share/kde4/services/planpart.desktop
-share/kde4/services/planrcpsscheduler.desktop
-share/kde4/services/planscripting.desktop
-share/kde4/services/plantjscheduler.desktop
-share/kde4/services/planworkpart.desktop
+share/kde4/services/okularOdt.desktop
+share/kde4/services/qimageioplugins/kra.desktop
+share/kde4/services/qimageioplugins/ora.desktop
 share/kde4/services/sheets_excel_thumbnail.desktop
 share/kde4/services/sheets_ods_thumbnail.desktop
 share/kde4/services/sheets_xlsx_thumbnail.desktop
-share/kde4/services/sheetspart.desktop
-share/kde4/services/sheetsscripting.desktop
-share/kde4/services/sheetssolver.desktop
 share/kde4/services/stage_kpr_thumbnail.desktop
 share/kde4/services/stage_odp_thumbnail.desktop
 share/kde4/services/stage_powerpoint_thumbnail.desktop
 share/kde4/services/stage_pptx_thumbnail.desktop
-share/kde4/services/stagepart.desktop
 share/kde4/services/words_docx_thumbnail.desktop
 share/kde4/services/words_msword_thumbnail.desktop
 share/kde4/services/words_odt_thumbnail.desktop
 share/kde4/services/words_rtf_thumbnail.desktop
-share/kde4/services/wordspart.desktop
 share/kde4/servicetypes/braindump_extensions.desktop
 share/kde4/servicetypes/calligra_application.desktop
 share/kde4/servicetypes/calligra_deferred_plugin.desktop
@@ -7529,11 +7884,14 @@ share/kde4/servicetypes/karbon_dock.desk
 share/kde4/servicetypes/karbon_viewplugin.desktop
 share/kde4/servicetypes/kexihandler.desktop
 share/kde4/servicetypes/keximigration_driver.desktop
+share/kde4/servicetypes/kopa_tool.desktop
 share/kde4/servicetypes/koreport_itemplugin.desktop
 share/kde4/servicetypes/kpr_pageeffect.desktop
 share/kde4/servicetypes/kpr_shapeanimation.desktop
+share/kde4/servicetypes/kpr_tool.desktop
 share/kde4/servicetypes/krita_brush.desktop
 share/kde4/servicetypes/krita_dock.desktop
+share/kde4/servicetypes/krita_filefilter.desktop
 share/kde4/servicetypes/krita_filter.desktop
 share/kde4/servicetypes/krita_generator.desktop
 share/kde4/servicetypes/krita_paintop.desktop
@@ -7554,6 +7912,7 @@ share/mime/packages/calligra_svm.xml
 share/mime/packages/krita.xml
 share/mime/packages/krita_ora.xml
 share/mime/packages/msooxml-all.xml
+share/mime/packages/wiki-format.xml
 share/templates/
 share/templates/.source/
 share/templates/.source/Illustration.odg