diff --git a/CMakeModules/IncludeKPMCore.cmake b/CMakeModules/IncludeKPMCore.cmake index b06299d91..4b4b8b3f2 100644 --- a/CMakeModules/IncludeKPMCore.cmake +++ b/CMakeModules/IncludeKPMCore.cmake @@ -12,6 +12,6 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH}) include(KDEInstallDirs) include(GenerateExportHeader) find_package( KF5 REQUIRED CoreAddons ) -find_package( KF5 REQUIRED Config I18n IconThemes KIO Service ) +find_package( KF5 REQUIRED Config I18n Service WidgetsAddons ) -find_package( KPMcore 3.0.3 REQUIRED ) +find_package( KPMcore 3.2 REQUIRED ) diff --git a/Dockerfile b/Dockerfile index cd0e4f365..d6ca0926d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,2 +1,2 @@ FROM kdeneon/all -RUN sudo apt-get update && sudo apt-get -y install build-essential cmake extra-cmake-modules gettext kio-dev libatasmart-dev libboost-python-dev libkf5config-dev libkf5coreaddons-dev libkf5i18n-dev libkf5iconthemes-dev libkf5parts-dev libkf5service-dev libkf5solid-dev libkpmcore-dev libparted-dev libpolkit-qt5-1-dev libqt5svg5-dev libqt5webkit5-dev libyaml-cpp-dev os-prober pkg-config python3-dev qtbase5-dev qtdeclarative5-dev qttools5-dev qttools5-dev-tools +RUN sudo apt-get update && sudo apt-get -y install build-essential cmake extra-cmake-modules gettext libatasmart-dev libboost-python-dev libkf5config-dev libkf5coreaddons-dev libkf5i18n-dev libkf5parts-dev libkf5service-dev libkf5widgetsaddons-dev libkpmcore-dev libparted-dev libpolkit-qt5-1-dev libqt5svg5-dev libqt5webkit5-dev libyaml-cpp-dev os-prober pkg-config python3-dev qtbase5-dev qtdeclarative5-dev qttools5-dev qttools5-dev-tools diff --git a/README.md b/README.md index dcb5e3b67..2304c2d8e 100644 --- a/README.md +++ b/README.md @@ -27,8 +27,8 @@ Modules: * UPower * partition: * extra-cmake-modules - * KF5: KCoreAddons, KConfig, KI18n, KIconThemes, KIO, KService - * KPMcore >= 3.0.3 + * KF5: KCoreAddons, KConfig, KI18n, KService, KWidgetsAddons + * KPMcore >= 3.2 * bootloader: * systemd-boot or GRUB * unpackfs: diff --git a/src/modules/partition/CMakeLists.txt b/src/modules/partition/CMakeLists.txt index 8509ec25d..cc3680c62 100644 --- a/src/modules/partition/CMakeLists.txt +++ b/src/modules/partition/CMakeLists.txt @@ -5,8 +5,9 @@ include(KDEInstallDirs) include(GenerateExportHeader) find_package( KF5 REQUIRED CoreAddons ) -# These are needed because KPMcore links publicly against ConfigCore, I18n, IconThemes, KIOCore and Service -find_package( KF5 REQUIRED Config I18n IconThemes KIO Service ) +# These are needed because KPMcore links publicly against ConfigCore, I18n, WidgetsAddons and Service +find_package( Qt5 REQUIRED DBus ) +find_package( KF5 REQUIRED Config I18n WidgetsAddons Service ) find_package( KPMcore 3.2 REQUIRED )