diff --git a/classes/cmake_plasma.bbclass b/classes/cmake_plasma.bbclass index 7e6aa80..6b3f9dd 100644 --- a/classes/cmake_plasma.bbclass +++ b/classes/cmake_plasma.bbclass @@ -45,6 +45,7 @@ FILES_${PN} += " \ FILES_${PN}-dev += " \ ${datadir}/dbus-1/interfaces/*.xml \ ${datadir}/kdevappwizard/templates/*.tar.bz2 \ + ${datadir}/qlogging-categories5/* \ ${libdir}/cmake/*/*.cmake \ ${prefix}/mkspecs/modules/qt_*.pri \ " diff --git a/recipes-plasma/bluedevil_5.16.4.bb b/recipes-plasma/bluedevil_5.17.2.bb similarity index 100% rename from recipes-plasma/bluedevil_5.16.4.bb rename to recipes-plasma/bluedevil_5.17.2.bb diff --git a/recipes-plasma/breeze_5.16.4.bb b/recipes-plasma/breeze_5.17.2.bb similarity index 100% rename from recipes-plasma/breeze_5.16.4.bb rename to recipes-plasma/breeze_5.17.2.bb diff --git a/recipes-plasma/discover_5.16.4.bb b/recipes-plasma/discover_5.17.2.bb similarity index 100% rename from recipes-plasma/discover_5.16.4.bb rename to recipes-plasma/discover_5.17.2.bb diff --git a/recipes-plasma/kactivitymanagerd.inc b/recipes-plasma/kactivitymanagerd.inc index 8220b4b..981cf30 100644 --- a/recipes-plasma/kactivitymanagerd.inc +++ b/recipes-plasma/kactivitymanagerd.inc @@ -39,4 +39,6 @@ FILES_${PN} += " \ ${libdir}/*.so \ " -FILES_${PN}-dev = "" +FILES_${PN}-dev = " \ + ${datadir}/qlogging-categories5 \ +" diff --git a/recipes-plasma/kactivitymanagerd_5.16.4.bb b/recipes-plasma/kactivitymanagerd_5.17.2.bb similarity index 100% rename from recipes-plasma/kactivitymanagerd_5.16.4.bb rename to recipes-plasma/kactivitymanagerd_5.17.2.bb diff --git a/recipes-plasma/kde-cli-tools_5.16.4.bb b/recipes-plasma/kde-cli-tools_5.17.2.bb similarity index 100% rename from recipes-plasma/kde-cli-tools_5.16.4.bb rename to recipes-plasma/kde-cli-tools_5.17.2.bb diff --git a/recipes-plasma/kdecoration_5.16.4.bb b/recipes-plasma/kdecoration_5.17.2.bb similarity index 100% rename from recipes-plasma/kdecoration_5.16.4.bb rename to recipes-plasma/kdecoration_5.17.2.bb diff --git a/recipes-plasma/kscreen.inc b/recipes-plasma/kscreen.inc index bb06132..c3a1f07 100644 --- a/recipes-plasma/kscreen.inc +++ b/recipes-plasma/kscreen.inc @@ -9,6 +9,7 @@ DEPENDS = " \ kdbusaddons \ plasma-framework \ kconfigwidgets \ + kcmutils \ kglobalaccel \ kwidgetsaddons \ kxmlgui \ @@ -25,5 +26,6 @@ inherit cmake_plasma FILES_${PN} += " \ ${datadir}/kded_kscreen \ ${datadir}/kcm_kscreen \ + ${datadir}/kpackage \ ${datadir}/plasma/plasmoids/org.kde.kscreen \ " diff --git a/recipes-plasma/kscreen_5.16.4.bb b/recipes-plasma/kscreen_5.17.2.bb similarity index 100% rename from recipes-plasma/kscreen_5.16.4.bb rename to recipes-plasma/kscreen_5.17.2.bb diff --git a/recipes-plasma/kscreenlocker_5.16.4.bb b/recipes-plasma/kscreenlocker_5.17.2.bb similarity index 100% rename from recipes-plasma/kscreenlocker_5.16.4.bb rename to recipes-plasma/kscreenlocker_5.17.2.bb diff --git a/recipes-plasma/ksysguard_5.16.4.bb b/recipes-plasma/ksysguard_5.17.2.bb similarity index 100% rename from recipes-plasma/ksysguard_5.16.4.bb rename to recipes-plasma/ksysguard_5.17.2.bb diff --git a/recipes-plasma/kwayland-integration.inc b/recipes-plasma/kwayland-integration.inc index af8d48d..ab0537d 100644 --- a/recipes-plasma/kwayland-integration.inc +++ b/recipes-plasma/kwayland-integration.inc @@ -7,6 +7,7 @@ PR = "r0" DEPENDS = " \ kidletime \ kwindowsystem \ + kguiaddons \ kwayland \ " @@ -16,3 +17,7 @@ SRC_URI = " \ S = "${WORKDIR}/git" inherit cmake_plasma + +FILES_${PN} += " \ + ${libdir}/plugins/kf5/kguiaddons \ +" diff --git a/recipes-plasma/kwayland-integration_5.16.4.bb b/recipes-plasma/kwayland-integration_5.17.2.bb similarity index 100% rename from recipes-plasma/kwayland-integration_5.16.4.bb rename to recipes-plasma/kwayland-integration_5.17.2.bb diff --git a/recipes-plasma/kwin.inc b/recipes-plasma/kwin.inc index f6c8052..b4c1cf9 100644 --- a/recipes-plasma/kwin.inc +++ b/recipes-plasma/kwin.inc @@ -49,6 +49,7 @@ do_install_append() { # dirty workaround for aurora crash on Wayland rm -rf ${D}/${libdir}/plugins/org.kde.kdecoration2/ + mkdir -p ${D}/${sysconfdir}/xdg/kwinrc install -m 644 ${WORKDIR}/kwinrc ${D}/${sysconfdir}/xdg/kwinrc } diff --git a/recipes-plasma/kwin_5.16.4.bb b/recipes-plasma/kwin_5.17.2.bb similarity index 100% rename from recipes-plasma/kwin_5.16.4.bb rename to recipes-plasma/kwin_5.17.2.bb diff --git a/recipes-plasma/libkscreen_5.16.4.bb b/recipes-plasma/libkscreen_5.17.2.bb similarity index 100% rename from recipes-plasma/libkscreen_5.16.4.bb rename to recipes-plasma/libkscreen_5.17.2.bb diff --git a/recipes-plasma/libksysguard_5.16.4.bb b/recipes-plasma/libksysguard_5.17.2.bb similarity index 100% rename from recipes-plasma/libksysguard_5.16.4.bb rename to recipes-plasma/libksysguard_5.17.2.bb diff --git a/recipes-plasma/milou.inc b/recipes-plasma/milou.inc index f36bbe9..0d8f09c 100644 --- a/recipes-plasma/milou.inc +++ b/recipes-plasma/milou.inc @@ -7,6 +7,7 @@ PR = "r0" DEPENDS = " \ qtdeclarative \ kcoreaddons \ + kitemmodels \ kdeclarative \ kservice \ plasma-framework \ diff --git a/recipes-plasma/milou_5.16.4.bb b/recipes-plasma/milou_5.17.2.bb similarity index 100% rename from recipes-plasma/milou_5.16.4.bb rename to recipes-plasma/milou_5.17.2.bb diff --git a/recipes-plasma/plasma-integration_5.16.4.bb b/recipes-plasma/plasma-integration_5.17.2.bb similarity index 100% rename from recipes-plasma/plasma-integration_5.16.4.bb rename to recipes-plasma/plasma-integration_5.17.2.bb diff --git a/recipes-plasma/plasma-nm.inc b/recipes-plasma/plasma-nm.inc index 89a25a4..909f9a2 100644 --- a/recipes-plasma/plasma-nm.inc +++ b/recipes-plasma/plasma-nm.inc @@ -32,7 +32,6 @@ DEPENDS = " \ SRC_URI = " \ git://anongit.kde.org/${BPN};nobranch=1 \ - file://0001-wifi-list-view-hotfix.diff \ " S = "${WORKDIR}/git" diff --git a/recipes-plasma/plasma-nm/0001-wifi-list-view-hotfix.diff b/recipes-plasma/plasma-nm/0001-wifi-list-view-hotfix.diff deleted file mode 100644 index 666ae93..0000000 --- a/recipes-plasma/plasma-nm/0001-wifi-list-view-hotfix.diff +++ /dev/null @@ -1,26 +0,0 @@ -commit ac38ebd52d2936d1c2fd34507df90ba3ed64c841 -Author: Volker Krause -Date: Sat Mar 30 22:29:55 2019 +0100 - - Actually make the network list view show up - - Reviewers: jgrulich! - - Subscribers: plasma-devel - - Tags: #plasma - - Differential Revision: https://phabricator.kde.org/D20132 - -diff --git a/mobile/wifi/package/contents/ui/main.qml b/mobile/wifi/package/contents/ui/main.qml -index 224de727..31aeff57 100644 ---- a/mobile/wifi/package/contents/ui/main.qml -+++ b/mobile/wifi/package/contents/ui/main.qml -@@ -79,7 +79,6 @@ Kirigami.ApplicationItem { - - NetworkListView { - id: networkListview -- anchors.fill: parent - } - - Component { diff --git a/recipes-plasma/plasma-nm_5.16.4.bb b/recipes-plasma/plasma-nm_5.17.2.bb similarity index 100% rename from recipes-plasma/plasma-nm_5.16.4.bb rename to recipes-plasma/plasma-nm_5.17.2.bb diff --git a/recipes-plasma/plasma-pa_5.16.4.bb b/recipes-plasma/plasma-pa_5.17.2.bb similarity index 100% rename from recipes-plasma/plasma-pa_5.16.4.bb rename to recipes-plasma/plasma-pa_5.17.2.bb diff --git a/recipes-plasma/plasma-workspace.inc b/recipes-plasma/plasma-workspace.inc index 69ee5a2..e72ddb1 100644 --- a/recipes-plasma/plasma-workspace.inc +++ b/recipes-plasma/plasma-workspace.inc @@ -34,6 +34,9 @@ DEPENDS = " \ phonon \ plasma-framework \ prison \ + kpeople \ + kactivitiesstats \ + libkscreen \ " SRC_URI = " \ @@ -49,6 +52,7 @@ EXTRA_OECMAKE += " -DBUILD_xembed-sni-proxy=OFF" FILES_SOLIBSDEV = "" FILES_${PN} += " \ ${libdir}/qml/org/kde \ + ${datadir}/kglobalaccel \ ${datadir}/kstyle/themes/*.themerc \ ${datadir}/ksmserver/themes \ ${datadir}/ksplash/Themes \ diff --git a/recipes-plasma/plasma-workspace_5.16.4.bb b/recipes-plasma/plasma-workspace_5.17.2.bb similarity index 100% rename from recipes-plasma/plasma-workspace_5.16.4.bb rename to recipes-plasma/plasma-workspace_5.17.2.bb diff --git a/recipes-plasma/polkit-kde-agent-1_5.16.4.bb b/recipes-plasma/polkit-kde-agent-1_5.17.2.bb similarity index 100% rename from recipes-plasma/polkit-kde-agent-1_5.16.4.bb rename to recipes-plasma/polkit-kde-agent-1_5.17.2.bb diff --git a/recipes-plasma/powerdevil_5.16.4.bb b/recipes-plasma/powerdevil_5.17.2.bb similarity index 100% rename from recipes-plasma/powerdevil_5.16.4.bb rename to recipes-plasma/powerdevil_5.17.2.bb diff --git a/recipes-plasma/systemsettings_5.16.4.bb b/recipes-plasma/systemsettings_5.17.2.bb similarity index 100% rename from recipes-plasma/systemsettings_5.16.4.bb rename to recipes-plasma/systemsettings_5.17.2.bb diff --git a/recipes-plasma/xdg-desktop-portal-kde_5.16.4.bb b/recipes-plasma/xdg-desktop-portal-kde_5.17.2.bb similarity index 100% rename from recipes-plasma/xdg-desktop-portal-kde_5.16.4.bb rename to recipes-plasma/xdg-desktop-portal-kde_5.17.2.bb