recipes-plasma/*: various small Qt6 build adaptations

2023-04-19 21:09:14 +02:00
parent 4871bb8de4
commit 632063c98b
11 changed files with 5 additions and 16 deletions
--- a/recipes-plasma/kde-cli-tools.inc
+++ b/recipes-plasma/kde-cli-tools.inc
@@ -24,7 +24,6 @@ DEPENDS = " \
    qtsvg \
    kconfig \
    kiconthemes \
-    kinit \
    kcmutils \
    kio \
    kservice \
--- a/recipes-plasma/kpipewire.inc
+++ b/recipes-plasma/kpipewire.inc
@@ -17,6 +17,7 @@ SRC_URI:append:visionfive2 = " \
 "

 DEPENDS = " \
+    libepoxy \
    qtdeclarative \
    qtwayland-native \
    pipewire \
--- a/recipes-plasma/kscreenlocker.inc
+++ b/recipes-plasma/kscreenlocker.inc
@@ -26,6 +26,7 @@ DEPENDS = " \
    qtdeclarative \
    solid \
    wayland-native \
+    plasma-framework \
 "

 SRC_URI:append = " \
--- a/recipes-plasma/kwin.inc
+++ b/recipes-plasma/kwin.inc
@@ -15,11 +15,9 @@ DEPENDS:class-target = " \
    qtsensors \
    qtwayland-native \
    kpackage-native \
-    qtscript \
    kconfigwidgets \
    kcrash \
    kglobalaccel \
-    kinit \
    knotifications \
    kpackage \
    kwin-native \
@@ -58,8 +56,6 @@ DEPENDS:class-native = " \

 SRC_URI:append = " \
    file://kwinrc \
-    file://0002-Include-missing-header-for-std-round.patch \
-    file://0003-Add-missing-cmath-include-for-std-ceil.patch \
 "

 SRC_URI:append:class-native = " \
--- a/recipes-plasma/libkscreen.inc
+++ b/recipes-plasma/libkscreen.inc
@@ -16,7 +16,6 @@ LIC_FILES_CHKSUM = " \
 PR = "r0"

 DEPENDS = " \
-    qtx11extras \
    qtwayland-native \
    kwayland \
 "
--- a/recipes-plasma/plank-player.inc
+++ b/recipes-plasma/plank-player.inc
@@ -10,10 +10,9 @@ LIC_FILES_CHKSUM = " \
 "
 PR = "r0"

-DEPENDS = " \
+DEPENDS += " \
    kirigami \
    qtdeclarative \
-    qtquickcontrols2 \
    qtmultimedia \
 "

--- a/recipes-plasma/plasma-integration.inc
+++ b/recipes-plasma/plasma-integration.inc
@@ -10,8 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSES/LGPL-2.0-only.txt;md5=da48810c4ddf8e49efa031
 PR = "r0"

 DEPENDS = " \
-    qtx11extras \
-    qtquickcontrols2 \
+    qtdeclarative \
    qtwayland-native \
    kconfig \
    kconfigwidgets \
@@ -29,5 +28,4 @@ inherit cmake_plasma

 RDEPENDS:${PN} += " \
    perl \
-    qtquickcontrols \
 "
--- a/recipes-plasma/plasma-nm.inc
+++ b/recipes-plasma/plasma-nm.inc
@@ -29,7 +29,6 @@ DEPENDS = " \
    knotifications \
    plasma-framework \
    kdeclarative \
-    kinit \
    kitemmodels \
    qca \
 "
--- a/recipes-plasma/plasma-workspace.inc
+++ b/recipes-plasma/plasma-workspace.inc
@@ -28,7 +28,6 @@ DEPENDS = " \
    kholidays \
    kidletime \
    kitemmodels \
-    kjsembed \
    knewstuff \
    knotifications \
    knotifyconfig \
@@ -113,7 +112,6 @@ FILES:${PN}-dev += " \
 INSANE_SKIP:${PN} = "dev-so"

 RDEPENDS:${PN} += " \
-    kinit \
    kquickcharts \
    milou \
    xprop \
--- a/recipes-plasma/polkit-kde-agent-1.inc
+++ b/recipes-plasma/polkit-kde-agent-1.inc
@@ -21,5 +21,5 @@ DEPENDS = " \
 inherit cmake_plasma

 EXTRA_OECMAKE += " \
-    -DOE_KF5_PATH_HOST_ROOT=${STAGING_DIR_HOST} \
+    -DOE_KF6_PATH_HOST_ROOT=${STAGING_DIR_HOST} \
 "
--- a/recipes-plasma/powerdevil.inc
+++ b/recipes-plasma/powerdevil.inc
@@ -9,7 +9,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24"
 PR = "r0"

 DEPENDS = " \
-    qtx11extras \
    kactivities \
    kidletime \
    kconfig \