From fff8a4ca506f7b5c9bacab005bf88e171bdacb0e Mon Sep 17 00:00:00 2001 From: Volker Krause Date: Mon, 8 Jan 2018 22:08:14 +0100 Subject: [PATCH] Add recipes for plasma-pa and plasma-nm --- classes/cmake_plasma.bbclass | 7 +++ recipes-plasma/kscreenlocker.inc | 5 -- recipes-plasma/kwin.inc | 5 -- recipes-plasma/packagegroups/plasma-mobile.bb | 2 + recipes-plasma/plasma-nm.inc | 52 +++++++++++++++++++ recipes-plasma/plasma-nm_5.11.3.bb | 2 + recipes-plasma/plasma-pa.inc | 33 ++++++++++++ recipes-plasma/plasma-pa_5.11.3.bb | 2 + recipes-plasma/plasma-workspace.inc | 7 --- recipes-plasma/powerdevil.inc | 7 --- recipes-plasma/systemsettings.inc | 7 --- recipes-support/qca_2.1.3.bb | 32 ++++++++++++ 12 files changed, 130 insertions(+), 31 deletions(-) create mode 100644 recipes-plasma/plasma-nm.inc create mode 100644 recipes-plasma/plasma-nm_5.11.3.bb create mode 100644 recipes-plasma/plasma-pa.inc create mode 100644 recipes-plasma/plasma-pa_5.11.3.bb create mode 100644 recipes-support/qca_2.1.3.bb diff --git a/classes/cmake_plasma.bbclass b/classes/cmake_plasma.bbclass index d4597e3..35f15fe 100644 --- a/classes/cmake_plasma.bbclass +++ b/classes/cmake_plasma.bbclass @@ -11,6 +11,13 @@ DEPENDS += " \ qtbase \ " +do_compile_prepend() { + # desktoptojson needs to find installed service type files + export XDG_DATA_DIRS=${STAGING_DATADIR}:$XDG_DATA_DIRS + # meinproc5 needs to find its libraries + export LD_LIBRARY_PATH=${STAGING_LIBDIR_NATIVE}:$LD_LIBRARY_PATH +} + FILES_${PN} += " \ ${libdir}/kconf_update_bin/* \ ${libdir}/plugins/*.so \ diff --git a/recipes-plasma/kscreenlocker.inc b/recipes-plasma/kscreenlocker.inc index f4907ed..062ed6b 100644 --- a/recipes-plasma/kscreenlocker.inc +++ b/recipes-plasma/kscreenlocker.inc @@ -31,11 +31,6 @@ S = "${WORKDIR}/git" inherit cmake_plasma -do_compile_prepend() { - # desktoptojson needs to find installed service type files - export XDG_DATA_DIRS=${STAGING_DATADIR}:$XDG_DATA_DIRS -} - FILES_${PN} += " \ ${datadir}/ksmserver/screenlocker/org.kde.passworddialog/*.desktop \ " diff --git a/recipes-plasma/kwin.inc b/recipes-plasma/kwin.inc index 5e99b42..b40a1e2 100644 --- a/recipes-plasma/kwin.inc +++ b/recipes-plasma/kwin.inc @@ -47,11 +47,6 @@ S = "${WORKDIR}/git" inherit cmake_plasma -do_compile_prepend() { - # desktoptojson needs to find installed service type files - export XDG_DATA_DIRS=${STAGING_DATADIR}:$XDG_DATA_DIRS -} - FILES_${PN} += " \ ${libdir}/libkdeinit5_kwin*.so \ ${libdir}/kconf_update_bin/kwin5_update_default_rules \ diff --git a/recipes-plasma/packagegroups/plasma-mobile.bb b/recipes-plasma/packagegroups/plasma-mobile.bb index f463523..62391e2 100644 --- a/recipes-plasma/packagegroups/plasma-mobile.bb +++ b/recipes-plasma/packagegroups/plasma-mobile.bb @@ -15,6 +15,8 @@ RDEPENDS_${PN} = " \ libksysguard \ milou \ plasma-integration \ + plasma-nm \ + plasma-pa \ plasma-phone-components \ plasma-workspace \ polkit-kde-agent-1 \ diff --git a/recipes-plasma/plasma-nm.inc b/recipes-plasma/plasma-nm.inc new file mode 100644 index 0000000..52b727f --- /dev/null +++ b/recipes-plasma/plasma-nm.inc @@ -0,0 +1,52 @@ +DESCRIPTION = "Plasma NM" +HOMEPAGE = "" +LICENSE = "GPL-2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +PR = "r0" + +DEPENDS = " \ + qtdeclarative \ + qttools \ + networkmanager-qt \ + modemmanager-qt \ + ki18n \ + kwindowsystem \ + kservice \ + kcompletion \ + kwidgetsaddons \ + kio \ + kcoreaddons \ + kwallet \ + kitemviews \ + kxmlgui \ + kconfigwidgets \ + kiconthemes \ + solid \ + kdbusaddons \ + knotifications \ + plasma-framework \ + kdeclarative \ + kinit \ + kdelibs4support \ + kitemmodels \ + qca \ +" + +SRC_URI = " \ + git://anongit.kde.org/${BPN};nobranch=1 \ +" +S = "${WORKDIR}/git" + +inherit cmake_plasma + +EXTRA_OECMAKE += " \ + -DOE_QCA_PATH_HOST_ROOT=${STAGING_DIR_HOST} \ +" + +FILES_SOLIBSDEV = "" +FILES_${PN} += " \ + ${libdir}/*.so \ + ${libdir}/qml/org/kde/plasma/networkmanagement \ + ${datadir}/plasma/plasmoids/org.kde.plasma.networkmanagement \ + ${datadir}/kcm_networkmanagement/qml/*.qml \ +" diff --git a/recipes-plasma/plasma-nm_5.11.3.bb b/recipes-plasma/plasma-nm_5.11.3.bb new file mode 100644 index 0000000..56169bb --- /dev/null +++ b/recipes-plasma/plasma-nm_5.11.3.bb @@ -0,0 +1,2 @@ +require ${PN}.inc +SRCREV = "v${PV}" diff --git a/recipes-plasma/plasma-pa.inc b/recipes-plasma/plasma-pa.inc new file mode 100644 index 0000000..7d5631c --- /dev/null +++ b/recipes-plasma/plasma-pa.inc @@ -0,0 +1,33 @@ +DESCRIPTION = "Plasma PA" +HOMEPAGE = "" +LICENSE = "GPL-2" +LIC_FILES_CHKSUM = "file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24" +PR = "r0" + +DEPENDS = " \ + qtdeclarative \ + kcoreaddons \ + kdeclarative \ + kdoctools \ + kglobalaccel \ + ki18n \ + plasma-framework \ + pulseaudio \ + libcanberra \ +" + +SRC_URI = " \ + git://anongit.kde.org/${BPN};nobranch=1 \ +" +S = "${WORKDIR}/git" + +inherit cmake_plasma + +FILES_${PN} += " \ + ${libdir}/qml/org/kde/plasma/private/volume/* \ + ${datadir}/kpackage/kcms/kcm_pulseaudio \ + ${datadir}/plasma/plasmoids/org.kde.plasma.volume \ + ${datadir}/kde4/apps/kconf_update/* \ +" + +RDEPENDS_${PN} += "perl" diff --git a/recipes-plasma/plasma-pa_5.11.3.bb b/recipes-plasma/plasma-pa_5.11.3.bb new file mode 100644 index 0000000..56169bb --- /dev/null +++ b/recipes-plasma/plasma-pa_5.11.3.bb @@ -0,0 +1,2 @@ +require ${PN}.inc +SRCREV = "v${PV}" diff --git a/recipes-plasma/plasma-workspace.inc b/recipes-plasma/plasma-workspace.inc index 0f2e312..fc01e56 100644 --- a/recipes-plasma/plasma-workspace.inc +++ b/recipes-plasma/plasma-workspace.inc @@ -47,13 +47,6 @@ inherit cmake_plasma EXTRA_OECMAKE += " -DBUILD_xembed-sni-proxy=OFF" -do_compile_prepend() { - # desktoptojson needs to find installed service type files - export XDG_DATA_DIRS=${STAGING_DATADIR}:$XDG_DATA_DIRS - # meinproc5 needs to find its libraries - export LD_LIBRARY_PATH=${STAGING_LIBDIR_NATIVE}:$LD_LIBRARY_PATH -} - FILES_${PN} += " \ ${libdir}/libkdeinit5_*.so \ ${libdir}/qml/org/kde/taskmanager/* \ diff --git a/recipes-plasma/powerdevil.inc b/recipes-plasma/powerdevil.inc index 878b328..6712da2 100644 --- a/recipes-plasma/powerdevil.inc +++ b/recipes-plasma/powerdevil.inc @@ -32,10 +32,3 @@ SRC_URI = " \ S = "${WORKDIR}/git" inherit cmake_plasma - -do_compile_prepend() { - # desktoptojson needs to find installed service type files - export XDG_DATA_DIRS=${STAGING_DATADIR}:$XDG_DATA_DIRS - # meinproc5 needs to find its libraries - export LD_LIBRARY_PATH=${STAGING_LIBDIR_NATIVE}:$LD_LIBRARY_PATH -} diff --git a/recipes-plasma/systemsettings.inc b/recipes-plasma/systemsettings.inc index 5c2c8b6..c59f36b 100644 --- a/recipes-plasma/systemsettings.inc +++ b/recipes-plasma/systemsettings.inc @@ -31,13 +31,6 @@ S = "${WORKDIR}/git" inherit cmake_plasma -do_compile_prepend() { - # desktoptojson needs to find installed service type files - export XDG_DATA_DIRS=${STAGING_DATADIR}:$XDG_DATA_DIRS - # meinproc5 needs to find its libraries - export LD_LIBRARY_PATH=${STAGING_LIBDIR_NATIVE}:$LD_LIBRARY_PATH -} - FILES_${PN} += " \ ${datadir}/kpackage/genericqml/org.kde.systemsettings.sidebar \ ${datadir}/kxmlgui5/systemsettings/systemsettingsui.rc \ diff --git a/recipes-support/qca_2.1.3.bb b/recipes-support/qca_2.1.3.bb new file mode 100644 index 0000000..6363228 --- /dev/null +++ b/recipes-support/qca_2.1.3.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "QCA" +HOMEPAGE = "" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" +PR = "r0" + +DEPENDS = "qtbase" + +SRC_URI = " \ + git://anongit.kde.org/${BPN};nobranch=1 \ +" +SRCREV = "v${PV}" +S = "${WORKDIR}/git" + +inherit cmake_qt5 + +do_install_prepend() { + if [ "0" -ne $(find . -name \*.cmake | grep _usr | wc -l) ]; then + sed -i 's/\"\/usr\//\"\$\{OE_QCA_PATH_HOST_ROOT\}\/usr\//g' $(find . -name "*.cmake" | grep _usr) + sed -i 's/\;\/usr\//\;\$\{OE_QCA_PATH_HOST_ROOT\}\/usr\//g' $(find . -name "*.cmake" | grep _usr) + fi +} + +FILES_${PN} += " \ + ${libdir}/qca-qt5/crypto/libqca-*.so \ +" + +FILES_${PN}-dev += " \ + ${prefix}/mkspecs/features/* \ + ${libdir}/cmake/Qca-qt5/*.cmake \ +" +