8 files changed, 206 insertions, 148 deletions

diff --git a/finance/kmymoney/Makefile b/finance/kmymoney/Makefile
index cb5418d9c3de..db90bdc974e4 100644
--- a/finance/kmymoney/Makefile
+++ b/finance/kmymoney/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	kmymoney
-PORTVERSION=	5.0.1
-PORTREVISION=	4
+PORTVERSION=	5.0.3
 CATEGORIES=	finance kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}/src
 
@@ -26,12 +25,10 @@ USE_KDE=	activities archive auth bookmarks codecs completion config \
 		wallet widgetsaddons xmlgui
 USE_LDCONFIG=	yes
 
-CONFLICTS_INSTALL=	kmymoney-kde4
-
 SHEBANG_FILES=	kmymoney/misc/financequote.pl
 
 OPTIONS_GROUP=		PLUGINS
-OPTIONS_GROUP_PLUGINS=	CALENDAR KBANKING OFX WEBOOB
+OPTIONS_GROUP_PLUGINS=	CALENDAR KBANKING OFX SQLCIPHER WEBOOB
 WEB_DESC=		Web content renderer
 OPTIONS_SINGLE=		WEB
 OPTIONS_SINGLE_WEB=	KDEWEBKIT QTWEBENGINE
@@ -87,6 +84,10 @@ QUOTES_RUN_DEPENDS=	p5-Date-Manip>=0:devel/p5-Date-Manip \
 			p5-XML-Writer>=0:textproc/p5-XML-Writer \
 			p5-libwww>=0:www/p5-libwww
 
+SQLCIPHER_DESC=		KMyMoney database encryption
+SQLCIPHER_LIB_DEPENDS=	libsqlcipher.so:databases/sqlcipher
+SQLCIPHER_CMAKE_BOOL=	ENABLE_SQLCIPHER
+
 WEBOOB_DESC=		Online banking via Web Outside Of Browsers
 WEBOOB_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}weboob>0:www/py-weboob@${PY_FLAVOR}
 WEBOOB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}weboob>0:www/py-weboob@${PY_FLAVOR}
@@ -100,7 +101,8 @@ create-plist: stage
 	@(cd ${.CURDIR} && ${MAKE} makeplist > pkg-plist && \
 	${SED} -i "" -e '1d' \
 		-e '/icalendar/s|^|%%CALENDAR%%|g' -e '/kbanking/s|^|%%KBANKING%%|g' \
-		-e '/ofximport/s|^|%%OFX%%|g' -e '/weboob/s|^|%%WEBOOB%%|g' \
+		-e '/ofximport/s|^|%%OFX%%|g' -e '/qsqlcipher/s|^|%%SQLCIPHER%%|g' \
+		-e '/weboob/s|^|%%WEBOOB%%|g' \
 		pkg-plist)
 .endif
 
diff --git a/finance/kmymoney/distinfo b/finance/kmymoney/distinfo
index d7121eb418c3..f1f58a7295eb 100644
--- a/finance/kmymoney/distinfo
+++ b/finance/kmymoney/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523625920
-SHA256 (kmymoney-5.0.1.tar.xz) = dd6e8fc22a48ddcb322565c8f385d6aa44d582cfcf6fe2ff3dc11fc0b6bd2ab1
-SIZE (kmymoney-5.0.1.tar.xz) = 13307860
+TIMESTAMP = 1550766280
+SHA256 (kmymoney-5.0.3.tar.xz) = 698c0fc7ef2134c5c120a98b10f033e14dc37bff723b562c3b50a018c6ebdbf8
+SIZE (kmymoney-5.0.3.tar.xz) = 11690060
diff --git a/finance/kmymoney/files/patch-CMakeLists.txt b/finance/kmymoney/files/patch-CMakeLists.txt
deleted file mode 100644
index aaff6df3dee3..000000000000
--- a/finance/kmymoney/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-Fix finding libofx
-Fix Weboob yes/no configure summary
-
---- CMakeLists.txt.orig	2018-03-18 15:56:39 UTC
-+++ CMakeLists.txt
-@@ -135,11 +135,7 @@ endif(ENABLE_WEBENGINE)
- find_package(LibOfx)
- if(LIBOFX_FOUND)
-   option(ENABLE_OFXIMPORTER "Enable OFX Importer" ON)
--  if(CMAKE_SYSTEM_NAME MATCHES "Windows")
--    set(PATH_TO_LIBOFX_HEADER "${LIBOFX_INCLUDE_DIR}/libofx/libofx.h")  # Windows doesn't even see the header if it's not full path
--  else()
--    set(PATH_TO_LIBOFX_HEADER "libofx/libofx.h")
--  endif()
-+  set(PATH_TO_LIBOFX_HEADER "${LIBOFX_INCLUDE_DIR}/libofx/libofx.h")
- 
-   unset(LIBOFX_HAVE_CLIENTUID)
-   unset(LIBOFX_HAVE_CLIENTUID CACHE) #not doing this will prevent updating below check
-@@ -317,7 +313,7 @@ nice_yesno("KMM_ADDRESSBOOK_FOUND")
- nice_yesno("LIBOFX_FOUND")
- nice_yesno("LIBOFX_HAVE_CLIENTUID")
- nice_yesno("KBANKING_FOUND")
--nice_yesno("WEBOOB_FOUND")
-+nice_yesno("ENABLE_WEBOOB")
- nice_yesno("LIBICAL_FOUND")
- nice_yesno("ENABLE_SQLCIPHER")
- nice_yesno("USE_QT_DESIGNER")
-@@ -340,7 +336,7 @@ OFX plugin:                              ${nice_LIBOFX
- 
- KBanking plugin:                         ${nice_KBANKING_FOUND}
- 
--weboob plugin:                           ${nice_WEBOOB_FOUND}
-+weboob plugin:                           ${nice_ENABLE_WEBOOB}
- 
- iCalendar export plugin:                 ${nice_LIBICAL_FOUND}
- 
diff --git a/finance/kmymoney/files/patch-cmake_modules_FindLibOfx.cmake b/finance/kmymoney/files/patch-cmake_modules_FindLibOfx.cmake
index 8da21c0a3704..5c53c97c4d5c 100644
--- a/finance/kmymoney/files/patch-cmake_modules_FindLibOfx.cmake
+++ b/finance/kmymoney/files/patch-cmake_modules_FindLibOfx.cmake
@@ -1,20 +1,156 @@
 Use CMake to find libofx instead of just relying on pkgconf
 
---- cmake/modules/FindLibOfx.cmake.orig	2018-02-06 18:22:38 UTC
+--- cmake/modules/FindLibOfx.cmake.orig	2018-09-08 21:02:21 UTC
 +++ cmake/modules/FindLibOfx.cmake
-@@ -25,14 +25,13 @@ IF (NOT WIN32)
-    # use pkg-config to get the directories and then use these values
-    # in the FIND_PATH() and FIND_LIBRARY() calls
-    FIND_PACKAGE(PkgConfig)
--   PKG_CHECK_MODULES(LIBOFX libofx>=${LIBOFX_MIN_VERSION})
-+   PKG_CHECK_MODULES(PC_OFX libofx>=${LIBOFX_MIN_VERSION})
-    # I am not sure what the next statement should do, since the
-    # var LIBOFX_DEFINITIONS is not used anywhere. Leave it here
-    # in case I overlooked something, but it could really go
-    # at some point in time (ipwizard, 2011-02-15)
-    # SET(LIBOFX_DEFINITIONS ${LIBOFX_CFLAGS_OTHER})
- 
--ELSE (NOT WIN32)
-   FIND_PATH(LIBOFX_INCLUDE_DIR libofx/libofx.h
-       PATHS
-       ${PC_OFX_INCLUDEDIR}
+@@ -5,6 +5,7 @@
+ #  LIBOFX_INCLUDE_DIR - the LibOfx include directory
+ #  LIBOFX_LIBRARIES - Link these to LibOfx
+ #  LIBOFX_DEFINITIONS - Compiler switches required for using LibOfx
++#  LIBOFX_VERSION_STRING - version of LibOfx found (since CMake 2.8.8)
+ 
+ # Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
+ # Copied from FindLibXslt.cmake, 2009, Guillaume DE BURE, <gdebure@yahoo.com>
+@@ -12,95 +13,66 @@
+ # Redistribution and use is allowed according to the terms of the BSD license.
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+ 
++include(FindPackageHandleStandardArgs)
++
+ if(NOT LIBOFX_MIN_VERSION)
+   set(LIBOFX_MIN_VERSION "0.9.4")
+ endif(NOT LIBOFX_MIN_VERSION)
+ 
+-IF (LIBOFX_INCLUDE_DIR AND LIBOFX_LIBRARIES)
+-   # in cache already
+-   SET(LIBOFX_FIND_QUIETLY TRUE)
+-ENDIF (LIBOFX_INCLUDE_DIR AND LIBOFX_LIBRARIES)
++# use pkg-config to get the directories and then use these values
++# in the find_path() and find_library() calls
++find_package(PkgConfig QUIET)
++pkg_check_modules(PC_LIBOFX QUIET libofx>=${LIBOFX_MIN_VERSION})
++set(LIBOFX_DEFINITIONS ${PC_LIBOFX_CFLAGS_OTHER})
+ 
+-IF (NOT WIN32 AND NOT APPLE)
+-   # use pkg-config to get the directories and then use these values
+-   # in the FIND_PATH() and FIND_LIBRARY() calls
+-   FIND_PACKAGE(PkgConfig)
++find_path(LIBOFX_INCLUDE_DIR
++  NAMES libofx/libofx.h
++  HINTS ${PC_OFX_INCLUDEDIR}
++)
+ 
+-   # according to https://svnweb.freebsd.org/ports/head/finance/kmymoney/files/patch-cmake_modules_FindLibOfx.cmake?view=markup
+-   # FreeBSD needs a little different variable name here to setup the LibOFX package infrastructure for us.
+-   if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+-      PKG_CHECK_MODULES(PC_OFX libofx>=${LIBOFX_MIN_VERSION})
+-   else (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+-      PKG_CHECK_MODULES(LIBOFX libofx>=${LIBOFX_MIN_VERSION})
+-   endif (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
++find_library(LIBOFX_LIBRARIES
++  NAMES ofx libofx
++  HINTS ${PC_OFX_LIBDIR}
++)
+ 
+-  FIND_PATH(LIBOFX_INCLUDE_DIR libofx/libofx.h
+-      PATHS
+-      ${LIBOFX_INCLUDE_DIRS}
+-      ${PC_OFX_INCLUDE_DIRS}
+-  )
++if(PC_LIBOFX_VERSION)
++  set(LIBOFX_VERSION_STRING ${PC_LIBOFX_VERSION})
++elseif(LIBOFX_INCLUDE_DIR AND EXISTS "${LIBOFX_INCLUDE_DIR}/libofx/libofx.h")
++  file(STRINGS "${LIBOFX_INCLUDE_DIR}/libofx/libofx.h" libofx_version_str
++       REGEX "^#define[\t ]+LIBOFX_VERSION_RELEASE_STRING[\t ]+\".*\"")
++  string(REGEX REPLACE "^#define[\t ]+LIBOFX_VERSION_RELEASE_STRING[\t ]+\"([^\"]*)\".*" "\\1"
++         LIBOFX_VERSION_STRING "${libofx_version_str}")
++  unset(libofx_version_str)
++endif()
+ 
+-ELSE (NOT WIN32 AND NOT APPLE)
+-  FIND_PATH(LIBOFX_INCLUDE_DIR libofx/libofx.h
+-      PATHS
+-      ${PC_OFX_INCLUDEDIR}
+-      ${PC_OFX_INCLUDE_DIRS}
+-    )
+-
+-  FIND_LIBRARY(LIBOFX_LIBRARIES NAMES ofx libofx
+-      PATHS
+-      ${PC_OFX_LIBDIR}
+-      ${PC_OFX_LIBRARY_DIRS}
+-    )
+-
+-  IF (LIBOFX_INCLUDE_DIR AND LIBOFX_LIBRARIES)
+-    SET(LIBOFX_FOUND TRUE)
+-  ELSE (LIBOFX_INCLUDE_DIR AND LIBOFX_LIBRARIES)
+-    SET(LIBOFX_FOUND FALSE)
+-  ENDIF (LIBOFX_INCLUDE_DIR AND LIBOFX_LIBRARIES)
+-ENDIF (NOT WIN32 AND NOT APPLE)
+-
+-IF (LIBOFX_FOUND)
+-   IF (NOT LIBOFX_FIND_QUIETLY)
+-      MESSAGE(STATUS "Found LibOfx: ${LIBOFX_LIBRARY_DIRS}")
+-   ENDIF (NOT LIBOFX_FIND_QUIETLY)
+-ELSE (LIBOFX_FOUND)
+-   IF (LibOfx_FIND_REQUIRED)
+-      MESSAGE(FATAL_ERROR "Could NOT find LibOfx")
+-   ENDIF (LibOfx_FIND_REQUIRED)
+-ENDIF (LIBOFX_FOUND)
+-
+ # since on Windows for now libofx is a static library we need to add libopensp and libiconv (just like when linking libofx)
+-IF (WIN32)
+-    SET(OPENSP_FOUND FALSE)
+-    FIND_PATH(OPENSP_INCLUDES ParserEventGeneratorKit.h
+-        $ENV{KDEROOT}/include/opensp
+-    )
++if(WIN32)
++  find_path(OPENSP_INCLUDE_DIR
++    NAMES ParserEventGeneratorKit.h
++    HINTS $ENV{KDEROOT}/include/opensp $ENV{KDEROOT}/include/OpenSP
++  )
+ 
+-    FIND_LIBRARY(OPENSP_LIBRARIES
+-        NAMES sp133 libosp
+-        PATHS
+-            $ENV{KDEROOT}/lib
+-    )
++  find_library(OPENSP_LIBRARIES
++    NAMES osp libosp sp133
++    HINTS $ENV{KDEROOT}/lib
++  )
+ 
+-    FIND_LIBRARY(ICONV_LIBRARIES iconv)
++  find_library(ICONV_LIBRARIES iconv)
+ 
+-    IF (OPENSP_INCLUDES AND OPENSP_OPENSP_LIBRARIES)
+-        set(OPENSP_FOUND TRUE)
+-    ENDIF (OPENSP_INCLUDES AND OPENSP_OPENSP_LIBRARIES)
++  find_package_handle_standard_args(OpenSP
++                                    REQUIRED_VARS OPENSP_LIBRARIES OPENSP_INCLUDE_DIR
++  )
++  find_package_handle_standard_args(iconv
++                                    REQUIRED_VARS ICONV_LIBRARIES
++  )
+ 
+-  IF (OPENSP_FOUND)
+-    IF (NOT OPENSP_FIND_QUIETLY)
+-      MESSAGE(STATUS "Found OPENSP library: ${OPENSP_LIBRARIES}")
+-    ENDIF (NOT OPENSP_FIND_QUIETLY)
++  set(LIBOFX_LIBRARIES ${LIBOFX_LIBRARIES} ${OPENSP_LIBRARIES} ${ICONV_LIBRARIES})
++endif()
+ 
+-  ELSE (OPENSP_FOUND)
+-    IF (OPENSP_FIND_REQUIRED)
+-      MESSAGE(FATAL_ERROR "Could NOT find OPENSP library\nPlease install it first")
+-    ENDIF (OPENSP_FIND_REQUIRED)
+-  ENDIF (OPENSP_FOUND)
+-  SET(LIBOFX_LIBRARIES ${LIBOFX_LIBRARIES} ${OPENSP_LIBRARIES} ${ICONV_LIBRARIES})
+-ENDIF (WIN32)
+-
+-MARK_AS_ADVANCED(LIBOFX_INCLUDE_DIR  LIBOFX_LIBRARIES )
++find_package_handle_standard_args(LibOFX
++                                  REQUIRED_VARS LIBOFX_LIBRARIES LIBOFX_INCLUDE_DIR
++                                  VERSION_VAR LIBOFX_VERSION_STRING
++)
++                                  
++mark_as_advanced(LIBOFX_INCLUDE_DIR LIBOFX_LIBRARIES)
+ 
diff --git a/finance/kmymoney/files/patch-kmymoney_converter_mymoneystatementreader.cpp b/finance/kmymoney/files/patch-kmymoney_converter_mymoneystatementreader.cpp
deleted file mode 100644
index 4806313e5347..000000000000
--- a/finance/kmymoney/files/patch-kmymoney_converter_mymoneystatementreader.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-kmymoney/converter/mymoneystatementreader.cpp:1555:19: error: no member named 'abs' in namespace 'std'; did you mean 'labs'?
-  const int gap = std::abs(matchedSchedule.transaction().postDate().toJulianDay() - importedTransaction.postDate().toJulianDay());
-                  ^~~~~~~~
-                  labs
-
---- kmymoney/converter/mymoneystatementreader.cpp.orig	2018-04-17 04:30:23 UTC
-+++ kmymoney/converter/mymoneystatementreader.cpp
-@@ -23,6 +23,7 @@
- 
- #include "mymoneystatementreader.h"
- #include <typeinfo>
-+#include <cstdlib>
- 
- // ----------------------------------------------------------------------------
- // QT Headers
diff --git a/finance/kmymoney/files/patch-kmymoney_plugins_kbanking_widgets_chiptandialog.cpp b/finance/kmymoney/files/patch-kmymoney_plugins_kbanking_widgets_chiptandialog.cpp
deleted file mode 100644
index 7eba5a1086bd..000000000000
--- a/finance/kmymoney/files/patch-kmymoney_plugins_kbanking_widgets_chiptandialog.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-From e5198a902996b27bf9abde0ad24af82d55ab5dc1 Mon Sep 17 00:00:00 2001
-From: Luca Beltrame <lbeltrame@kde.org>
-Date: Thu, 10 May 2018 09:35:34 +0200
-Subject: [PATCH] Fix build with Qt 5.11
-
---- kmymoney/plugins/kbanking/widgets/chiptandialog.cpp.orig	2018-03-18 15:55:30 UTC
-+++ kmymoney/plugins/kbanking/widgets/chiptandialog.cpp
-@@ -28,6 +28,7 @@
- #include <QQuickView>
- #include <QQuickItem>
- #include <QPushButton>
-+#include <QRegExpValidator>
- #include <QStandardPaths>
- 
- #include <KLocalizedString>
diff --git a/finance/kmymoney/files/patch-kmymoney_widgets_qwidgetcontainer.cpp b/finance/kmymoney/files/patch-kmymoney_widgets_qwidgetcontainer.cpp
deleted file mode 100644
index e39d8d2882f9..000000000000
--- a/finance/kmymoney/files/patch-kmymoney_widgets_qwidgetcontainer.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-Fix crash when editing transactions
-https://bugs.kde.org/show_bug.cgi?id=392735
-
---- kmymoney/widgets/qwidgetcontainer.cpp.orig	2018-03-18 15:55:30 UTC
-+++ kmymoney/widgets/qwidgetcontainer.cpp
-@@ -51,9 +51,10 @@ void QWidgetContainer::removeOrphans()
-     if ((*it_w) && (*it_w)->parent())
-       ++it_w;
-     else {
--      delete(*it_w);
--      remove(it_w.key());
--      it_w = begin();
-+      QWidget* const w = *it_w;
-+      it_w = erase(it_w);
-+      if (w)
-+        w->deleteLater();
-     }
-   }
- }
diff --git a/finance/kmymoney/pkg-plist b/finance/kmymoney/pkg-plist
index fa07735e622b..eacade5a8441 100644
--- a/finance/kmymoney/pkg-plist
+++ b/finance/kmymoney/pkg-plist
@@ -1,23 +1,26 @@
 bin/kmymoney
 include/kmymoney/amountedit.h
 include/kmymoney/amountvalidator.h
+include/kmymoney/appinterface.h
+include/kmymoney/bicvalidator.h
 include/kmymoney/creditdebithelper.h
-include/kmymoney/databasestoreableobject.h
 include/kmymoney/fancydategroupmarker.h
 include/kmymoney/groupmarker.h
+include/kmymoney/ibanbicitemdelegate.h
+include/kmymoney/ibanvalidator.h
 include/kmymoney/importinterface.h
 include/kmymoney/imymoneyprocessingcalendar.h
-include/kmymoney/imymoneyserialize.h
-include/kmymoney/imymoneystorage.h
 include/kmymoney/imymoneystorageformat.h
 include/kmymoney/investtransaction.h
 include/kmymoney/investtransactioneditor.h
 include/kmymoney/kaccounttemplateselector.h
-include/kmymoney/kbudgetvalues.h
+include/kmymoney/kbicedit.h
 include/kmymoney/kcurrencycalculator.h
 include/kmymoney/kguiutils.h
+include/kmymoney/kibanlineedit.h
 include/kmymoney/kmm_mymoney_export.h
 include/kmymoney/kmm_plugin_export.h
+include/kmymoney/kmm_settings_export.h
 include/kmymoney/kmm_widgets_export.h
 include/kmymoney/kmymoneyaccountcombo.h
 include/kmymoney/kmymoneyaccountcompletion.h
@@ -29,12 +32,12 @@ include/kmymoney/kmymoneycurrencyselector.h
 include/kmymoney/kmymoneydateedit.h
 include/kmymoney/kmymoneydateinput.h
 include/kmymoney/kmymoneyedit.h
-include/kmymoney/kmymoneyglobalsettings.h
 include/kmymoney/kmymoneylineedit.h
 include/kmymoney/kmymoneymvccombo.h
 include/kmymoney/kmymoneyplugin.h
 include/kmymoney/kmymoneyselector.h
-include/kmymoney/kmymoneystorageplugin.h
+include/kmymoney/kmymoneysettings.h
+include/kmymoney/kmymoneysettings_addons.h
 include/kmymoney/kmymoneytitlelabel.h
 include/kmymoney/kmymoneyutils.h
 include/kmymoney/kmymoneyvalidationfeedback.h
@@ -42,6 +45,7 @@ include/kmymoney/mymoneyaccount.h
 include/kmymoney/mymoneybudget.h
 include/kmymoney/mymoneycategory.h
 include/kmymoney/mymoneycostcenter.h
+include/kmymoney/mymoneyenums.h
 include/kmymoney/mymoneyexception.h
 include/kmymoney/mymoneyfile.h
 include/kmymoney/mymoneyfinancialcalculator.h
@@ -51,7 +55,6 @@ include/kmymoney/mymoneyinvesttransaction.h
 include/kmymoney/mymoneykeyvaluecontainer.h
 include/kmymoney/mymoneymoney.h
 include/kmymoney/mymoneyobject.h
-include/kmymoney/mymoneyobjectcontainer.h
 include/kmymoney/mymoneypayee.h
 include/kmymoney/mymoneypayeeidentifiercontainer.h
 include/kmymoney/mymoneyprice.h
@@ -60,12 +63,15 @@ include/kmymoney/mymoneyschedule.h
 include/kmymoney/mymoneysecurity.h
 include/kmymoney/mymoneysplit.h
 include/kmymoney/mymoneystatement.h
+include/kmymoney/mymoneystoragemgr.h
 include/kmymoney/mymoneytag.h
 include/kmymoney/mymoneytemplate.h
 include/kmymoney/mymoneytransaction.h
 include/kmymoney/mymoneytransactionfilter.h
 include/kmymoney/mymoneyunittestable.h
 include/kmymoney/mymoneyutils.h
+include/kmymoney/nationalaccountdelegate.h
+include/kmymoney/nationalaccountedit.h
 include/kmymoney/onlinejob.h
 include/kmymoney/onlinejobfolder.h
 include/kmymoney/onlinejobmessage.h
@@ -78,11 +84,8 @@ include/kmymoney/onlinetasks/interfaces/ionlinetasksettings.h
 include/kmymoney/onlinetasks/interfaces/onlinetask.h
 include/kmymoney/onlinetasks/interfaces/onlinetaskconverter.h
 include/kmymoney/onlinetasks/interfaces/onlinetasksettingsfactory.h
-include/kmymoney/onlinetasks/sepa/sepaonlinetransfer.h
 include/kmymoney/register.h
 include/kmymoney/registeritem.h
-include/kmymoney/reportcontrolimpl.h
-include/kmymoney/reporttabimpl.h
 include/kmymoney/scheduledtransaction.h
 include/kmymoney/selectedtransaction.h
 include/kmymoney/selectedtransactions.h
@@ -100,51 +103,57 @@ include/kmymoney/transactionsortoption.h
 include/kmymoney/viewinterface.h
 lib/libkmm_csvimportercore.so
 lib/libkmm_csvimportercore.so.5
-lib/libkmm_csvimportercore.so.5.0.0
+lib/libkmm_csvimportercore.so.5.0.3
 lib/libkmm_icons.so
 lib/libkmm_icons.so.5
-lib/libkmm_icons.so.5.0.0
+lib/libkmm_icons.so.5.0.3
+lib/libkmm_menus.so
+lib/libkmm_menus.so.5
+lib/libkmm_menus.so.5.0.3
+lib/libkmm_models.so
+lib/libkmm_models.so.5
+lib/libkmm_models.so.5.0.3
 lib/libkmm_mymoney.so
 lib/libkmm_mymoney.so.5
-lib/libkmm_mymoney.so.5.0.0
+lib/libkmm_mymoney.so.5.0.3
 lib/libkmm_payeeidentifier.so
 lib/libkmm_payeeidentifier.so.5
-lib/libkmm_payeeidentifier.so.5.0.0
+lib/libkmm_payeeidentifier.so.5.0.3
 lib/libkmm_plugin.so
 lib/libkmm_plugin.so.5
-lib/libkmm_plugin.so.5.0.0
+lib/libkmm_plugin.so.5.0.3
+lib/libkmm_settings.so
+lib/libkmm_settings.so.5
+lib/libkmm_settings.so.5.0.3
 lib/libkmm_widgets.so
 lib/libkmm_widgets.so.5
-lib/libkmm_widgets.so.5.0.0
-lib/libpayeeidentifier_iban_bic.so
-lib/libpayeeidentifier_iban_bic.so.5
-lib/libpayeeidentifier_iban_bic.so.5.0.0
-lib/libpayeeidentifier_iban_bic_widgets.so
-lib/libpayeeidentifier_iban_bic_widgets.so.5
-lib/libpayeeidentifier_iban_bic_widgets.so.5.0.0
-lib/libpayeeidentifier_nationalAccount.so
-lib/libpayeeidentifier_nationalAccount.so.5
-lib/libpayeeidentifier_nationalAccount.so.5.0.0
+lib/libkmm_widgets.so.5.0.3
+%%QT_PLUGINDIR%%/kmymoney/budgetview.so
 %%QT_PLUGINDIR%%/kmymoney/checkprinting.so
 %%QT_PLUGINDIR%%/kmymoney/csvexporter.so
 %%QT_PLUGINDIR%%/kmymoney/csvimporter.so
+%%QT_PLUGINDIR%%/kmymoney/forecastview.so
 %%QT_PLUGINDIR%%/kmymoney/gncimporter.so
 %%CALENDAR%%%%QT_PLUGINDIR%%/kmymoney/icalendarexporter.so
 %%KBANKING%%%%QT_PLUGINDIR%%/kmymoney/kbanking.so
 %%QT_PLUGINDIR%%/kmymoney/kcm_checkprinting.so
 %%QT_PLUGINDIR%%/kmymoney/kcm_csvimporter.so
+%%QT_PLUGINDIR%%/kmymoney/kcm_forecastview.so
 %%CALENDAR%%%%QT_PLUGINDIR%%/kmymoney/kcm_icalendarexporter.so
 %%QT_PLUGINDIR%%/kmymoney/kcm_qif.so
+%%QT_PLUGINDIR%%/kmymoney/kcm_reportsview.so
+%%QT_PLUGINDIR%%/kmymoney/kcm_xmlstorage.so
 %%QT_PLUGINDIR%%/kmymoney/konlinetasks_sepa.so
 %%OFX%%%%QT_PLUGINDIR%%/kmymoney/ofximporter.so
-%%QT_PLUGINDIR%%/kmymoney/payeeidentifier_iban_bic_delegates.so
-%%QT_PLUGINDIR%%/kmymoney/payeeidentifier_ibanbic_storageplugin.so
-%%QT_PLUGINDIR%%/kmymoney/payeeidentifier_nationalAccount_ui.so
-%%QT_PLUGINDIR%%/kmymoney/payeeidentifier_nationalaccount_storageplugin.so
+%%QT_PLUGINDIR%%/kmymoney/onlinejoboutboxview.so
 %%QT_PLUGINDIR%%/kmymoney/qifexporter.so
 %%QT_PLUGINDIR%%/kmymoney/qifimporter.so
 %%QT_PLUGINDIR%%/kmymoney/reconciliationreport.so
+%%QT_PLUGINDIR%%/kmymoney/reportsview.so
+%%QT_PLUGINDIR%%/kmymoney/sqlstorage.so
 %%WEBOOB%%%%QT_PLUGINDIR%%/kmymoney/weboob.so
+%%QT_PLUGINDIR%%/kmymoney/xmlstorage.so
+%%SQLCIPHER%%%%QT_PLUGINDIR%%/sqldrivers/qsqlcipher.so
 man/ca/man1/kmymoney.1.gz
 man/de/man1/kmymoney.1.gz
 man/it/man1/kmymoney.1.gz
@@ -1506,27 +1515,23 @@ share/kconf_update/kmymoney.upd
 %%WEBOOB%%%%DATADIR%%/weboob/kmymoneyweboob.py
 share/kservices5/kcm_checkprinting.desktop
 share/kservices5/kcm_csvimporter.desktop
+share/kservices5/kcm_forecastview.desktop
 %%CALENDAR%%share/kservices5/kcm_icalendarexporter.desktop
 share/kservices5/kcm_qifexporter.desktop
 share/kservices5/kcm_qifimporter.desktop
-share/kservices5/kmymoney-ibanbic-delegate.desktop
-share/kservices5/kmymoney-ibanbic-storageplugin.desktop
-share/kservices5/kmymoney-nationalaccount-delegate.desktop
-share/kservices5/kmymoney-nationalaccount-storageplugin.desktop
-share/kservicetypes5/ibanbicdata.desktop
+share/kservices5/kcm_reportsview.desktop
+share/kservices5/kcm_xmlstorage.desktop
 share/kservicetypes5/kmymoney-importerplugin.desktop
-share/kservicetypes5/kmymoney-nationalaccountnumberplugin.desktop
 share/kservicetypes5/kmymoney-payeeidentifierdelegate.desktop
-share/kservicetypes5/kmymoney-sqlstorageplugin.desktop
 share/kxmlgui5/checkprinting/checkprinting.rc
 share/kxmlgui5/csvexporter/csvexporter.rc
 share/kxmlgui5/csvimporter/csvimporter.rc
-share/kxmlgui5/gncimporter/gncimporter.rc
 %%CALENDAR%%share/kxmlgui5/icalendarexporter/icalendarexporter.rc
 %%KBANKING%%share/kxmlgui5/kbanking/kbanking.rc
 %%OFX%%share/kxmlgui5/ofximporter/ofximporter.rc
 share/kxmlgui5/qifexporter/qifexporter.rc
 share/kxmlgui5/qifimporter/qifimporter.rc
+share/kxmlgui5/sqlstorage/sqlstorage.rc
 %%WEBOOB%%share/kxmlgui5/weboob/weboob.rc
 share/locale/ar/LC_MESSAGES/kmymoney.mo
 share/locale/ast/LC_MESSAGES/kmymoney.mo