From 660abe64edc4b43eef78d77b3f136cfb354bc392 Mon Sep 17 00:00:00 2001 From: Andreas Cord-Landwehr Date: Tue, 29 Dec 2020 14:09:39 +0100 Subject: [PATCH] Adapt recipes for Plasma 5.20.4 --- recipes-plasma/bluedevil.inc | 27 +++++++++++---------- recipes-plasma/breeze.inc | 2 +- recipes-plasma/discover.inc | 2 +- recipes-plasma/kdecoration.inc | 2 +- recipes-plasma/kscreenlocker.inc | 7 +++--- recipes-plasma/kwin.inc | 3 ++- recipes-plasma/plasma-workspace.inc | 29 ++++++++++++++++------- recipes-plasma/xdg-desktop-portal-kde.inc | 1 + recipes-support/sddm/sddm.inc | 5 +++- 9 files changed, 49 insertions(+), 29 deletions(-) diff --git a/recipes-plasma/bluedevil.inc b/recipes-plasma/bluedevil.inc index 8f310d5..3a58446 100644 --- a/recipes-plasma/bluedevil.inc +++ b/recipes-plasma/bluedevil.inc @@ -1,21 +1,21 @@ DESCRIPTION = "Bluedevil" HOMEPAGE = "" LICENSE = "GPL-2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0-only.txt;md5=93e64b4a83c7e441e48bbdeeea05c977" PR = "r0" DEPENDS = " \ - qtdeclarative \ - kcoreaddons \ - kwidgetsaddons \ - kdbusaddons \ - knotifications \ - kwindowsystem \ - kiconthemes \ - plasma-framework \ - kio \ bluez-qt \ + kcoreaddons \ + kdbusaddons \ kded \ + kiconthemes \ + kio \ + knotifications \ + kwidgetsaddons \ + kwindowsystem \ + plasma-framework \ + qtdeclarative \ shared-mime-info \ shared-mime-info-native \ " @@ -26,9 +26,10 @@ S = "${WORKDIR}/git" inherit cmake_plasma FILES_${PN} += " \ - ${libdir}/qml \ - ${datadir}/plasma \ - ${datadir}/mime/packages \ ${datadir}/bluedevilwizard \ + ${datadir}/kpackage/kcms/ \ + ${datadir}/mime/packages \ + ${datadir}/plasma \ ${datadir}/remoteview \ + ${libdir}/qml \ " diff --git a/recipes-plasma/breeze.inc b/recipes-plasma/breeze.inc index 8ea829a..0d4ed35 100644 --- a/recipes-plasma/breeze.inc +++ b/recipes-plasma/breeze.inc @@ -1,7 +1,7 @@ DESCRIPTION = "Breeze Style" HOMEPAGE = "" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24" +LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0-only.txt;md5=93e64b4a83c7e441e48bbdeeea05c977" PR = "r0" DEPENDS = " \ diff --git a/recipes-plasma/discover.inc b/recipes-plasma/discover.inc index 6cb399d..054b1af 100644 --- a/recipes-plasma/discover.inc +++ b/recipes-plasma/discover.inc @@ -1,7 +1,7 @@ DESCRIPTION = "Discover" HOMEPAGE = "" LICENSE = "GPL-3" -LIC_FILES_CHKSUM = "file://COPYING;md5=6679dc9ea294d0d265902ab8c9936a9c" +LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0-only.txt;md5=93e64b4a83c7e441e48bbdeeea05c977" PR = "r0" DEPENDS = " \ diff --git a/recipes-plasma/kdecoration.inc b/recipes-plasma/kdecoration.inc index 393cf7f..ae277b0 100644 --- a/recipes-plasma/kdecoration.inc +++ b/recipes-plasma/kdecoration.inc @@ -1,7 +1,7 @@ DESCRIPTION = "Plugin based library to create window decorations" HOMEPAGE = "" LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" +LIC_FILES_CHKSUM = "file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f" PR = "r0" SRC_URI = "git://invent.kde.org/plasma/${BPN};nobranch=1;protocol=https" diff --git a/recipes-plasma/kscreenlocker.inc b/recipes-plasma/kscreenlocker.inc index 82cce33..cccb1ef 100644 --- a/recipes-plasma/kscreenlocker.inc +++ b/recipes-plasma/kscreenlocker.inc @@ -32,12 +32,13 @@ S = "${WORKDIR}/git" inherit cmake_plasma do_install_append() { - mkdir -p ${D}${sysconfdir}/pam.d - cp ${WORKDIR}/kde.pam ${D}${sysconfdir}/pam.d/kde + install -d ${D}${sysconfdir}/pam.d + install -m 0644 ${WORKDIR}/kde.pam ${D}${sysconfdir}/pam.d/kde } FILES_${PN} += " \ - ${datadir}/ksmserver/screenlocker/org.kde.passworddialog/*.desktop \ + ${datadir}/ksmserver/screenlocker/org.kde.passworddialog/*.desktop \ + ${datadir}/kpackage/kcms/kcm_screenlocker \ " RDEPENDS_${PN} += "perl" diff --git a/recipes-plasma/kwin.inc b/recipes-plasma/kwin.inc index d2fde1d..f302655 100644 --- a/recipes-plasma/kwin.inc +++ b/recipes-plasma/kwin.inc @@ -1,7 +1,7 @@ DESCRIPTION = "KWin" HOMEPAGE = "" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24" +LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0-only.txt;md5=93e64b4a83c7e441e48bbdeeea05c977" PR = "r0" DEPENDS = " \ @@ -70,6 +70,7 @@ FILES_${PN} += " \ ${libdir}/qml/org/kde/kwin/decoration/* \ ${libdir}/qml/org/kde/kwin/decorations/plastik/* \ ${libdir}/qml/org/kde/kwin/private/kdecoration/* \ + ${libdir}/systemd/user/*.service \ ${datadir}/kservices5/*.desktop \ ${datadir}/kservices5/kwin/*.desktop \ ${datadir}/knotifications5/*.notifyrc \ diff --git a/recipes-plasma/plasma-workspace.inc b/recipes-plasma/plasma-workspace.inc index 4c383a5..780ec16 100644 --- a/recipes-plasma/plasma-workspace.inc +++ b/recipes-plasma/plasma-workspace.inc @@ -6,6 +6,7 @@ PR = "r0" DEPENDS = " \ qtdeclarative \ + qtwayland-native \ baloo \ kcoreaddons \ kcrash \ @@ -23,6 +24,7 @@ DEPENDS = " \ knotifications \ knotifyconfig \ kpackage \ + kholidays \ krunner \ kscreenlocker \ ktexteditor \ @@ -37,6 +39,7 @@ DEPENDS = " \ kpeople \ kactivitiesstats \ libkscreen \ + libxft \ " SRC_URI = "git://invent.kde.org/plasma/${BPN};nobranch=1;protocol=https" @@ -49,28 +52,37 @@ EXTRA_OECMAKE += " -DBUILD_xembed-sni-proxy=OFF" FILES_SOLIBSDEV = "" FILES_${PN} += " \ - ${libdir}/qml/org/kde \ + ${datadir}/desktop-directories/*.directory \ + ${datadir}/kcontrol \ + ${datadir}/kdisplay \ + ${datadir}/kfontinst \ ${datadir}/kglobalaccel \ - ${datadir}/kstyle/themes/*.themerc \ + ${datadir}/kio_desktop \ + ${datadir}/konqsidebartng \ + ${datadir}/kpackage \ + ${datadir}/krunner \ + ${datadir}/kservices5 \ ${datadir}/ksmserver/themes \ ${datadir}/ksplash/Themes \ - ${datadir}/kio_desktop \ - ${datadir}/plasma/plasmoids \ + ${datadir}/kstyle/themes/*.themerc \ ${datadir}/plasma/look-and-feel \ + ${datadir}/plasma/plasmoids \ + ${datadir}/plasma/services/*.operations \ ${datadir}/plasma/shareprovider \ ${datadir}/plasma/wallpapers \ - ${datadir}/plasma/services/*.operations \ - ${datadir}/solid/actions/*.desktop \ ${datadir}/sddm/themes \ - ${datadir}/desktop-directories/*.directory \ + ${datadir}/solid/actions/*.desktop \ ${datadir}/wayland-sessions/*.desktop \ ${datadir}/xsessions/*.desktop \ - ${datadir}/kpackage \ + ${libdir}/plugins/plasmacalendarplugins \ + ${libdir}/qml/org/kde \ " FILES_${PN}-dev += " \ ${libdir}/libcolorcorrect.so \ ${libdir}/libnotificationmanager.so \ + ${libdir}/libkfontinst.so \ + ${libdir}/libkfontinstui.so \ ${libdir}/libtaskmanager.so \ ${libdir}/libkworkspace5.so \ ${libdir}/libplasma-geolocation-interface.so \ @@ -79,6 +91,7 @@ FILES_${PN}-dev += " \ RDEPENDS_${PN} += " \ kinit \ + kquickcharts \ milou \ xprop \ xset \ diff --git a/recipes-plasma/xdg-desktop-portal-kde.inc b/recipes-plasma/xdg-desktop-portal-kde.inc index a49031a..0a718b5 100644 --- a/recipes-plasma/xdg-desktop-portal-kde.inc +++ b/recipes-plasma/xdg-desktop-portal-kde.inc @@ -14,6 +14,7 @@ DEPENDS += " \ kdeclarative \ plasma-framework \ pipewire \ + qtwayland-native \ " SRC_URI = "git://invent.kde.org/plasma/${BPN};nobranch=1;protocol=https" diff --git a/recipes-support/sddm/sddm.inc b/recipes-support/sddm/sddm.inc index 1959812..142c866 100644 --- a/recipes-support/sddm/sddm.inc +++ b/recipes-support/sddm/sddm.inc @@ -27,7 +27,10 @@ SRC_URI = " \ " S = "${WORKDIR}/git" -inherit cmake_qt5 pkgconfig systemd useradd +inherit cmake_qt5 +inherit pkgconfig +inherit systemd +inherit useradd EXTRA_OECMAKE += " \ -DLOGIN_DEFS_PATH=${STAGING_DIR_HOST}${sysconfdir}/login.defs \