Make it compile as standalone

CMakeLists.txt

@@ -30,6 +30,8 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${akregator_SOURCE_DIR})
     set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION}")
 
 
+    find_package(Grantlee5 "5.0" CONFIG REQUIRED)
+    set(LIBKLEO_LIB_VERSION_LIB "5.2.40")
     set(MESSAGELIB_LIB_VERSION_LIB "5.2.56")
     set(KDEPIMLIBS_LIB_VERSION "5.2.40")
     set(KPIMTEXTEDIT_LIB_VERSION "5.2.40")
@@ -38,6 +40,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${akregator_SOURCE_DIR})
     set(KDEPIM_LIB_SOVERSION "5")
     set(KDEPIM_APPS_LIB_VERSION_LIB "5.2.42")
     set(KONTACTINTERFACE_LIB_VERSION "5.2.40")
+    set(LIBGRANTLEETHEME_LIB_VERSION_LIB "5.2.40")
 
     set(QT_REQUIRED_VERSION "5.6.0")
     find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test Sql)
@@ -45,20 +48,27 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${akregator_SOURCE_DIR})
     set(MAILCOMMON_LIB_VERSION_LIB "5.2.40")
     set(PIMCOMMON_LIB_VERSION_LIB "5.2.40")
     set(LIBKDEPIM_LIB_VERSION_LIB "5.2.40")
+    set(SYNDICATION_LIB_VERSION "5.2.40")
     # Find KF5 package
     find_package(KF5DBusAddons ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5DocTools REQUIRED)
     find_package(KF5XmlGui ${KF5_VERSION} CONFIG REQUIRED)
+    find_package(KF5KCMUtils ${KF5_VERSION} CONFIG REQUIRED)
+    find_package(KF5NotifyConfig ${KF5_VERSION} CONFIG REQUIRED)
+
     find_package(KF5TextEditor ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5Wallet ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5PimCommon ${PIMCOMMON_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5MessageViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5KontactInterface ${KONTACTINTERFACE_LIB_VERSION} CONFIG REQUIRED)
+    find_package(KF5GrantleeTheme ${LIBGRANTLEETHEME_LIB_VERSION_LIB} CONFIG REQUIRED)
 
     # Find KdepimLibs Package
-    find_package(KF5Blog ${KBLOG_LIB_VERSION} CONFIG REQUIRED)
+    find_package(KF5AkonadiMime ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
     find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED)
     find_package(KF5Libkdepim ${LIBKDEPIM_LIB_VERSION_LIB} CONFIG REQUIRED)
+    find_package(KF5Syndication ${SYNDICATION_LIB_VERSION} CONFIG REQUIRED)
+    find_package(KF5Libkleo ${LIBKLEO_LIB_VERSION_LIB} CONFIG REQUIRED)
 
     option(QTWEBENGINE_SUPPORT_OPTION "Enable support for QtWebEngine. False by default." FALSE)
     if (QTWEBENGINE_SUPPORT_OPTION)

configuration/CMakeLists.txt

 
 include_directories(
-    ${CMAKE_BINARY_DIR}/akregator/interfaces
-    ${CMAKE_SOURCE_DIR}/akregator/interfaces
+    ${akregator_BINARY_DIR}/interfaces
+    ${akregator_SOURCE_DIR}/interfaces
     )
 
 ########### next target ###############

kontactplugin/CMakeLists.txt

 
 include_directories(
-    ${CMAKE_SOURCE_DIR}/akregator/src
+    ${akregator_SOURCE_DIR}/src
     )
 
 ########### next target ###############
 
 set(kontact_akregator_PART_SRCS akregator_plugin.cpp)
 
-qt5_add_dbus_interfaces(kontact_akregator_PART_SRCS ${CMAKE_SOURCE_DIR}/akregator/src/org.kde.akregator.part.xml)
+qt5_add_dbus_interfaces(kontact_akregator_PART_SRCS ${akregator_SOURCE_DIR}/src/org.kde.akregator.part.xml)
 
 add_library(kontact_akregatorplugin MODULE ${kontact_akregator_PART_SRCS})
 

plugins/mk4storage/CMakeLists.txt

@@ -2,9 +2,9 @@ include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/akregator/interfaces
-  ${CMAKE_SOURCE_DIR}/akregator/plugins/mk4storage/metakit/include
-  ${CMAKE_BINARY_DIR}/akregator
+  ${akregator_SOURCE_DIR}/interfaces
+  ${akregator_SOURCE_DIR}/plugins/mk4storage/metakit/include
+  ${akregator_BINARY_DIR}
 )
 
 set(libmetakitlocal_SRCS

src/CMakeLists.txt

+configure_file(config-akregator.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-akregator.h )
+configure_file(akregator-version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/akregator-version.h @ONLY)
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/command/
     ${CMAKE_CURRENT_SOURCE_DIR}/formatter/
@@ -8,7 +10,6 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/frame/
     )
 
-
 add_subdirectory(about)
 add_subdirectory(icons)
 

src/aboutdata.cpp

@@ -24,7 +24,7 @@
 
 #include "aboutdata.h"
 
-#include "kdepim-version.h"
+#include "akregator-version.h"
 
 #include <KLocalizedString>
 

src/akregator-version.h.cmake

+/*
+  Copyright (c) 1998-1999 Preston Brown <pbrown@kde.org>
+  Copyright (c) 2000-2004 Cornelius Schumacher <schumacher@kde.org>
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program; if not, write to the Free Software Foundation, Inc.,
+  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+/*
+  Set the version for this kdepim release.
+
+  This version may be used by programs within this module that
+  do not want to maintain a version on their own.
+
+  Note that we cannot use the kdelibs version because we may
+  build against older kdelibs releases.
+*/
+
+#ifndef KDEPIM_VERSION_H
+#define KDEPIM_VERSION_H
+
+
+#define KDEPIM_VERSION "@KDEPIM_VERSION@ (@WEBENGINE_TYPE@)"
+
+#endif

src/akregator_part.cpp

@@ -25,7 +25,7 @@
 
 #include "akregator_part.h"
 #include "akregator_debug.h"
-#include "config-kdepim.h"
+#include "config-akregator.h"
 #include "messageviewer/messageviewersettings.h"
 #include "akregatorconfig.h"
 #include "aboutdata.h"
@@ -49,7 +49,7 @@
 #include "utils.h"
 #include "akregator_options.h"
 #include <Libkdepim/BroadcastStatus>
-#include "kdepim-version.h"
+#include "akregator-version.h"
 #include <kio/filecopyjob.h>
 #include <knotifyconfigwidget.h>
 #include <kaboutdata.h>

src/articleviewerwidget.cpp

@@ -39,7 +39,7 @@
 #include "utils.h"
 #include "openurlrequest.h"
 #include "akregator_debug.h"
-#include "kdepim-version.h"
+#include "akregator-version.h"
 
 #include <QAction>
 #include <kactioncollection.h>

src/articleviewerwidget.h

@@ -27,7 +27,7 @@
 
 #include "article.h"
 #include "akregator_export.h"
-#include "config-kdepim.h"
+#include "config-akregator.h"
 #include <QWidget>
 
 #include <QPointer>

src/config-akregator.h.cmake

+/* config-akregator.h. Generated by cmake from config-akregator.h.cmake */
+
+#cmakedefine QTWEBENGINE_SUPPORT_OPTION 1

src/frame/framemanager.cpp

@@ -23,7 +23,7 @@
 */
 
 #include "framemanager.h"
-#include "config-kdepim.h"
+#include "config-akregator.h"
 #include "akregatorconfig.h"
 #include "frame.h"
 #include "actionmanager.h"

src/frame/mainframe.h

@@ -19,7 +19,7 @@
 #define MAINFRAME_H
 
 #include "frame.h"
-#include "config-kdepim.h"
+#include "config-akregator.h"
 namespace Akregator
 {
 class ArticleViewerWidget;

src/mainwidget.h

@@ -28,7 +28,7 @@
 #define AKREGATOR_MAINWIDGET_H
 
 #include "akregatorpart_export.h"
-#include "config-kdepim.h"
+#include "config-akregator.h"
 #ifdef QTWEBENGINE_SUPPORT_OPTION
 #include "articleviewer-ng/webengine/articleviewerwebenginewidgetng.h"
 #else