kde-plasma: upgrade 5.20.5 -> 5.21.2
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
inherit kde-base
|
||||
|
||||
PLASMA_VERSION = "5.20.5"
|
||||
PLASMA_VERSION = "5.21.2"
|
||||
|
||||
SRC_URI = "${KDE_MIRROR}/stable/plasma/${PLASMA_VERSION}/${BPN}-${PV}.tar.xz"
|
||||
|
||||
|
||||
@@ -12,4 +12,4 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[sha256sum] = "6e973a9b18da376ce797be85fc60b3a1d53ae69868fabeadbefae1279c3181cd"
|
||||
SRC_URI[sha256sum] = "31b07c0c53ce84370e3c74eaa92caffc7148bc17864f1a9d8ac5b8c32cfa795e"
|
||||
|
||||
@@ -24,7 +24,7 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[sha256sum] = "c800c2782884cdbb906c99709f8bbce4a45c5b9abde73cf4fa5222acf8d0facb"
|
||||
SRC_URI[sha256sum] = "92aa23f36751bb24b00ef0e818783f997437b15c7589074adc6bb962e3559a15"
|
||||
|
||||
FILES_SOLIBSDEV = ""
|
||||
|
||||
@@ -33,4 +33,5 @@ FILES_${PN} += " \
|
||||
${datadir}/dbus-1 \
|
||||
${libdir}/libkactivitymanagerd_plugin.so \
|
||||
${OE_QMAKE_PATH_PLUGINS} \
|
||||
${systemd_user_unitdir} \
|
||||
"
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
From 508b26cd817083058aeaadb2d173e93545c5a938 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Tue, 16 Dec 2014 22:40:40 +0100
|
||||
Subject: [PATCH 10/12] align phonon path
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
phonon/platform_kde/kiomediastream.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/phonon/platform_kde/kiomediastream.h b/phonon/platform_kde/kiomediastream.h
|
||||
index ebc2700..1d17727 100644
|
||||
--- a/phonon/platform_kde/kiomediastream.h
|
||||
+++ b/phonon/platform_kde/kiomediastream.h
|
||||
@@ -20,7 +20,7 @@
|
||||
#ifndef PHONON_KIOMEDIASTREAM_H
|
||||
#define PHONON_KIOMEDIASTREAM_H
|
||||
|
||||
-#include <Phonon/AbstractMediaStream>
|
||||
+#include <phonon/AbstractMediaStream>
|
||||
#include <KIO/Job>
|
||||
|
||||
class QUrl;
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
@@ -50,8 +50,7 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[sha256sum] = "357ef43092efb4d45f7c6ae9249a538be3484c855d0e35ae3b0b1e8d3db6c624"
|
||||
SRC_URI += "file://0001-align-phonon-path.patch"
|
||||
SRC_URI[sha256sum] = "f3c30b3c51dd9d127ba4086252eebef22a7fe5dd34c7fa19498559ccab73d4cc"
|
||||
|
||||
# REVISIT
|
||||
FILES_${PN} += " \
|
||||
@@ -70,6 +69,7 @@ FILES_${PN} += " \
|
||||
${libdir}/kconf_update_bin \
|
||||
${OE_QMAKE_PATH_PLUGINS} \
|
||||
${OE_QMAKE_PATH_QML} \
|
||||
${systemd_user_unitdir} \
|
||||
"
|
||||
|
||||
FILES_SOLIBSDEV = " \
|
||||
|
||||
@@ -25,7 +25,7 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[sha256sum] = "b3de4e903c5669a63688940513ab7035b90d5950635c824857ad8d6a9adbeb2e"
|
||||
SRC_URI[sha256sum] = "8f0fc7cb133f1d9b5ea4cbb21d7f2e029e5b5184574e46ba5b43c85aae5006a1"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/bluedevilwizard \
|
||||
|
||||
@@ -10,7 +10,7 @@ inherit kde-plasma python3native
|
||||
DEPENDS += "sassc-native cairo breeze python3-pycairo-native"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[sha256sum] = "b4b4ce599bd23bf54101bdac7417daa4921b297b232622dc5a8a3426b97676ca"
|
||||
SRC_URI[sha256sum] = "23c6de40348762e2d3c38d72537675891e3d937210341acfad7ae3a034b29d57"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/kconf_update \
|
||||
|
||||
@@ -31,7 +31,7 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[sha256sum] = "d43845a34e08d393bac182d9ede863950d33e207c7f2841a8cd419aa182cf507"
|
||||
SRC_URI[sha256sum] = "641cf3613d939b37437bac0e3caa1f25171ed2b4adf8e4037a0fd0dbb1b1146d"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/color-schemes \
|
||||
|
||||
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \
|
||||
inherit kde-plasma gtk-icon-cache mime-xdg
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[sha256sum] = "c5bad44f28f85782b011b775992a66b823920c44a8b898a6ff21bab53362b521"
|
||||
SRC_URI[sha256sum] = "7ae56514adca76276dba0bd185389e12ea05dbd0e4d297684e4ed67bfddfd291"
|
||||
|
||||
DEPENDS += " \
|
||||
qtdeclarative \
|
||||
@@ -29,6 +29,7 @@ DEPENDS += " \
|
||||
knotifications \
|
||||
kirigami2 \
|
||||
plasma-framework \
|
||||
kidletime \
|
||||
"
|
||||
|
||||
FILES_${PN} += " \
|
||||
@@ -36,6 +37,7 @@ FILES_${PN} += " \
|
||||
${datadir}/k*5 \
|
||||
${datadir}/knsrcfiles \
|
||||
${datadir}/plasma \
|
||||
${datadir}/kpackage \
|
||||
\
|
||||
${libdir}/plasma-discover \
|
||||
${OE_QMAKE_PATH_PLUGINS} \
|
||||
|
||||
@@ -27,7 +27,7 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[sha256sum] = "0440b2d0359bca871134bfdbcc71b72c22af8c88601f1abceb83219a1877627c"
|
||||
SRC_URI[sha256sum] = "07bc872cf78f8f3e45e22b8bd1413a5d37a8c9ab9b4d255c1a3ebb46618dfc10"
|
||||
|
||||
# do not move so-libs to -dev package
|
||||
FILES_SOLIBSDEV = ""
|
||||
|
||||
@@ -29,7 +29,7 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[sha256sum] = "39a8dd1c143d741846017dc351ccd9161e1dfd710e3d18609327f30044de6eb8"
|
||||
SRC_URI[sha256sum] = "c1721bde6a160a196a53475d5c193d02c0a928a5ec47a04d7333907a74e6470f"
|
||||
|
||||
CFLAGS += "-isystem ${STAGING_INCDIR}/harfbuzz"
|
||||
CXXFLAGS += "-isystem ${STAGING_INCDIR}/harfbuzz"
|
||||
|
||||
@@ -34,7 +34,7 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[sha256sum] = "56c4bba1fa743d675b340014bfd31c546421ff8e09dfd1ef29d45c278eadd7eb"
|
||||
SRC_URI[sha256sum] = "237ebfce30f84ff5612d5b42bc6d8229032f81c0e392cbd8a4f1f31260c79938"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/icons \
|
||||
|
||||
@@ -19,7 +19,7 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[sha256sum] = "8d765e8f13e7195b0fbd41feee8a1f5a2a605c64141d887c1221f631f5bbc0bf"
|
||||
SRC_URI[sha256sum] = "d1c5fdf27408f43faa2ab6e18cda373860c4fce8e13dd213d9b4fb7aaf32d832"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/kgamma \
|
||||
|
||||
@@ -31,7 +31,7 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[sha256sum] = "081a132b699b0ce9fa0c05b2e7f2ec7efeea270db5e16a359685e0445bcf88c7"
|
||||
SRC_URI[sha256sum] = "8ea1394e3c2cee173420b7d7e14dbf92bce2a780504b4f60b91be33728279f41"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/kservices5 \
|
||||
|
||||
@@ -39,7 +39,7 @@ DEPENDS += " \
|
||||
DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11", "", d)}"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[sha256sum] = "55eba3e9f3b64a9508db6a2b4106b243d62d29be2ea08b388bb57297b9db7b4c"
|
||||
SRC_URI[sha256sum] = "353a1c960cd01a17378de19796879e910c223b1f2b07611962ac34118a35d09c"
|
||||
SRC_URI += "file://0001-fix-build-in-x11-less-environments.patch"
|
||||
|
||||
FILES_${PN} += " \
|
||||
|
||||
@@ -30,7 +30,7 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[sha256sum] = "eebd0a906538c64b25920a194753102b051f75935743278abef792c3e983f52a"
|
||||
SRC_URI[sha256sum] = "5aa28e095ae2cca278f27c5d9931d758f6857fa6462dafb0f27ef507d417b53f"
|
||||
|
||||
# do not move so-libs to -dev package
|
||||
FILES_SOLIBSDEV = ""
|
||||
|
||||
@@ -29,7 +29,7 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[sha256sum] = "de08a3ac81e88befd8d62752f8e46a9fbc244f7369c6e3b642cfb4f65a9e52da"
|
||||
SRC_URI[sha256sum] = "beeba77f91183e460c7d9d58d2b3769951681dae4d096571577aa5cc8b362104"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/k*_kscreen \
|
||||
|
||||
@@ -29,7 +29,7 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[sha256sum] = "802fef234420251eb3f0b50db84f52fe8c5d8859d897ec9ace855d0239a4c01f"
|
||||
SRC_URI[sha256sum] = "f9a63a2dcc3d540fd45484618424366ded4568ccadad93b80b6c42740af171f0"
|
||||
SRC_URI += "file://kde.pam"
|
||||
|
||||
do_install_append() {
|
||||
|
||||
@@ -21,4 +21,4 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[sha256sum] = "3e135f8e8092bfe9f19dbd6bc12dc052330c4ac8a6a671e835e5e775ab2a65f6"
|
||||
SRC_URI[sha256sum] = "85527240fe0a2dd7da5e89740678b473b36f14959b201cddd50ef3c0890dd2fd"
|
||||
|
||||
@@ -20,13 +20,18 @@ DEPENDS += " \
|
||||
kiconthemes \
|
||||
kdelibs4support \
|
||||
libksysguard \
|
||||
libnl \
|
||||
"
|
||||
|
||||
# REVISIT optionals
|
||||
DEPENDS += "lmsensors"
|
||||
# TODO libcap
|
||||
DEPENDS += " \
|
||||
lmsensors \
|
||||
networkmanager-qt \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[sha256sum] = "32f5227b2c1f91cd64fcee6b401209582cfffb16e2b015c6d6513e9f4d1dab35"
|
||||
SRC_URI[sha256sum] = "547e32d87c32f6c883ebb08a54486d49ad9d87185bae8f82c82fef95b4e028d2"
|
||||
|
||||
# do not move so-libs to -dev package
|
||||
FILES_SOLIBSDEV = ""
|
||||
|
||||
@@ -15,7 +15,7 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[sha256sum] = "53e611baeb02e66ff739045ffb4b913f4e963630baad4cfa96ba77b750fdc1f2"
|
||||
SRC_URI[sha256sum] = "864717b9082e83bf93f0d9fbf8c31adf31c64af2fc4729cbaf67982fba93ff8b"
|
||||
SRC_URI += "file://0001-use-pkgconfig-to-find-libgcrypt.patch"
|
||||
|
||||
EXTRA_OECMAKE += "-DCMAKE_INSTALL_LIBDIR=${base_libdir}"
|
||||
|
||||
@@ -14,7 +14,7 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[sha256sum] = "33f364670a1c19b84fe1bda40e543ebcc9e7593e932a7d18b9815f150ac21f67"
|
||||
SRC_URI[sha256sum] = "6046514b84c4a1905a43fb7c3482c8fdbd1eb0f55efdd79a2a827073639086bb"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${OE_QMAKE_PATH_PLUGINS} \
|
||||
|
||||
@@ -12,7 +12,7 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[sha256sum] = "e0f36407ba32721936b0b14894480279f60effc088e4e1f3cde6e5c584945d2a"
|
||||
SRC_URI[sha256sum] = "0ea9ba09575ef5fb8368284b327eef2ee77d17c20511a3b7219f9b4e465f6aa3"
|
||||
|
||||
do_configure_append() {
|
||||
# adjust path to protocol sources in sysroot
|
||||
|
||||
@@ -61,7 +61,7 @@ DEPENDS += " \
|
||||
DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 qtx11extras libepoxy xcb-util-cursor", "",d)}"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[sha256sum] = "ec142543935a1c9fe9b8e7e73db1bdf58669990d7c1611424062bbdd9e21384e"
|
||||
SRC_URI[sha256sum] = "14896e98e5600eba7c3aa7f18168bec697ba1670c012a560b33302075bb0465a"
|
||||
SRC_URI += "file://0001-Make-building-of-QPA-wayland-plugin-an-option.patch"
|
||||
|
||||
# pure X11 environments fail to build wayland plugin
|
||||
|
||||
@@ -16,7 +16,7 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[sha256sum] = "bfb2bb88e6b4e49a69b5c90b4688f3aba3b8e6771221e7c9332293bfc05a1bc0"
|
||||
SRC_URI[sha256sum] = "afed5c80700cfae4db18b22ddfdefeaaf72fe21f85188b2003b691dc94a211d0"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/knotifications5 \
|
||||
|
||||
@@ -10,7 +10,7 @@ inherit kde-plasma
|
||||
DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 qtx11extras", "", d)}"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[sha256sum] = "1ba79cdf4505159108a71f279eac3f746972b395bf1b9b49f2c577a2cf9c8118"
|
||||
SRC_URI[sha256sum] = "21393c76b1646303d4b550538e9b3b7b044e9c1a605cfabde780e931bbe4a70d"
|
||||
SRC_URI += "file://0001-fix-configuration-build-on-x-less-systems.patch"
|
||||
|
||||
FILES_${PN} += " \
|
||||
|
||||
@@ -28,7 +28,7 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[sha256sum] = "a8a5635c88559567342eba77c707269ab23bc0ce1775ce424c0abd57a83e5d6c"
|
||||
SRC_URI[sha256sum] = "0306e2556d94e3366b015d8bb5d7430c1fb66269ad7c0fbce1fecb8970649982"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/dbus-1 \
|
||||
|
||||
@@ -23,7 +23,7 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[sha256sum] = "704c41b4470e4cd84484406c187bf218c9f89f9c46a1024c6dd19af8856cb7c2"
|
||||
SRC_URI[sha256sum] = "460acbef68f29335c6938fae9c37fff68ecd634beab4bcdaea6b2cacf05808da"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/k*5 \
|
||||
|
||||
@@ -25,7 +25,7 @@ DEPENDS += " \
|
||||
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[sha256sum] = "19a74245a6a58f015813b9a7a72cc26622c016975d55bfb548db36d0239ad298"
|
||||
SRC_URI[sha256sum] = "386be06089400f8aa42902a05542faff5e6d9e7e9a7e5f712f180c96272ea57a"
|
||||
|
||||
PACKAGECONFIG ??= ""
|
||||
PACKAGECONFIG[settings] = "-DBUILD_OXYGEN_SETTINGS=ON,-DBUILD_OXYGEN_SETTINGS=OFF,kcmutils"
|
||||
|
||||
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING-GPL3;md5=d32239bcb673463ab874e80d47fae504"
|
||||
inherit kde-plasma gettext
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[sha256sum] = "c2a665733e09887782ab4235e9e6b3aab2418f3666fd687ab6431546dbafff0f"
|
||||
SRC_URI[sha256sum] = "e52eef2933eeaadbec405c9bf2ca16cd03008e517c13ee3705bc31f711085d30"
|
||||
|
||||
DEPENDS += " \
|
||||
kauth-native \
|
||||
@@ -20,11 +20,13 @@ DEPENDS += " \
|
||||
kactivities \
|
||||
kfilemetadata \
|
||||
purpose \
|
||||
plasma-workspace \
|
||||
"
|
||||
|
||||
# TBD split chrome/chromium/mozilla
|
||||
FILES_${PN} += " \
|
||||
${datadir}/k*5 \
|
||||
${datadir}/krunner \
|
||||
${libdir}/mozilla \
|
||||
${OE_QMAKE_PATH_PLUGINS} \
|
||||
"
|
||||
|
||||
@@ -50,7 +50,7 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[sha256sum] = "bd656e93f44fd528bcd2e0e4c79cbc1adb837369f9a27291bcc5dcd9df2787b9"
|
||||
SRC_URI[sha256sum] = "7dfadd6b711d277ebbc40ea8a49c84b39f27b77afe3273f153f8afbecd74782d"
|
||||
SRC_URI += "file://0001-Ensure-xkb_base-is-not-empty-instead-of-checking-if-.patch"
|
||||
|
||||
FILES_SOLIBSDEV = "${libdir}/libkfont*${SOLIBSDEV}"
|
||||
|
||||
@@ -26,7 +26,7 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[sha256sum] = "a8271e6e61b2e96807ce388c923163352a5e94533355f39edb53389fab95cdf3"
|
||||
SRC_URI[sha256sum] = "34a2745f20cbde4723f87fca2c6640dc1fd2aec6625fbeba12c14986e24a78ed"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/kconf_update \
|
||||
|
||||
@@ -45,7 +45,7 @@ DEPENDS += " \
|
||||
# MobileBroadbandProviderInfo
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[sha256sum] = "468df2bf99907382125a4822322d23c71e1a59f792eba497d89483dc94180e18"
|
||||
SRC_URI[sha256sum] = "cae80db9fc8d1d050c78210929ff120b3371028f6af79a77d083ddac0fd274e0"
|
||||
|
||||
# do not move so-libs to -dev package
|
||||
FILES_SOLIBSDEV = ""
|
||||
|
||||
@@ -25,7 +25,7 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[sha256sum] = "4d84422753aa362383945e8a8a9e6d6fc853f8d918e7b0b7eb1d24317e5e7377"
|
||||
SRC_URI[sha256sum] = "dda139d825ef2b45546e23e78a734f95d48fbba7cd5ec00a9ddd5d647475a181"
|
||||
|
||||
FILES_SOLIBSDEV = ""
|
||||
|
||||
|
||||
@@ -21,10 +21,10 @@ DEPENDS += " \
|
||||
inherit kde-plasma gettext
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[sha256sum] = "ba4afbaa6e8ecf5461252f8124a0dad48e0d44c5bc8dbda990423b2916480792"
|
||||
SRC_URI[sha256sum] = "172c7073948f140d088fe203391cf1e7d91f80eaa60382ef667d4880755e25aa"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/kservices5 \
|
||||
${datadir}/k*5 \
|
||||
${datadir}/kwin \
|
||||
${datadir}/metainfo \
|
||||
${datadir}/plasma \
|
||||
|
||||
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = " \
|
||||
inherit kde-plasma gtk-icon-cache
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[sha256sum] = "a25ab6348e0f5efc28c3bba2a91d5e5553db75305f7eabf17f1a1050fab7322d"
|
||||
SRC_URI[sha256sum] = "ba1bf86ee7c708a3887ae04ab20e5ef766d71104ebf1e50cac99c5b521dded25"
|
||||
|
||||
DEPENDS += " \
|
||||
kauth-native \
|
||||
|
||||
@@ -7,6 +7,6 @@ LIC_FILES_CHKSUM = " \
|
||||
inherit kde-plasma
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[sha256sum] = "e39bda4d2807c83063b980008e8d9f14add71bc5fa1ddbc059754ea416bbe70f"
|
||||
SRC_URI[sha256sum] = "8f83fa295e92ad438d33380d784d19f79ef7c223ab26b0105623562fccf5142e"
|
||||
|
||||
FILES_${PN} += "${datadir}/wallpapers"
|
||||
|
||||
@@ -1,48 +0,0 @@
|
||||
From ec4d92577256080e668869fc0ee343bf1a0dc62d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Wed, 4 Jul 2018 23:21:01 +0200
|
||||
Subject: [PATCH] fix build for QT_NO_SESSIONMANAGER
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
main.cpp | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/main.cpp b/main.cpp
|
||||
index a30eeca..c53bb4e 100644
|
||||
--- a/main.cpp
|
||||
+++ b/main.cpp
|
||||
@@ -29,7 +29,9 @@
|
||||
#include <PolkitQt1/Subject>
|
||||
// Qt
|
||||
#include <QApplication>
|
||||
+#ifndef QT_NO_SESSIONMANAGER
|
||||
#include <QSessionManager>
|
||||
+#endif
|
||||
#include <QDebug>
|
||||
// std
|
||||
#if HAVE_SYS_PRCTL_H
|
||||
@@ -73,6 +75,7 @@ int main(int argc, char *argv[])
|
||||
// ensure singleton run
|
||||
KDBusService service(KDBusService::Unique);
|
||||
|
||||
+#ifndef QT_NO_SESSIONMANAGER
|
||||
// disable session management
|
||||
auto disableSessionManagement = [](QSessionManager &sm) {
|
||||
sm.setRestartHint(QSessionManager::RestartNever);
|
||||
@@ -80,6 +83,7 @@ int main(int argc, char *argv[])
|
||||
|
||||
QObject::connect(&app, &QGuiApplication::commitDataRequest, disableSessionManagement);
|
||||
QObject::connect(&app, &QGuiApplication::saveStateRequest, disableSessionManagement);
|
||||
+#endif
|
||||
|
||||
// register agent
|
||||
PolicyKitListener *listener = new PolicyKitListener(&app);
|
||||
--
|
||||
2.14.3
|
||||
|
||||
@@ -23,7 +23,9 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[sha256sum] = "5ba485c5db38815961ba8737ece74908d9b9a35229f1cd8c7a7df79122b37be6"
|
||||
SRC_URI += "file://0001-fix-build-for-QT_NO_SESSIONMANAGER.patch"
|
||||
SRC_URI[sha256sum] = "4f3b40a866b1b3994cf3b464b7bdad4da10e8c391312dafb1fd5e1c72a7a29fc"
|
||||
|
||||
FILES_${PN} += "${datadir}/knotifications5"
|
||||
FILES_${PN} += " \
|
||||
${datadir}/knotifications5 \
|
||||
${systemd_user_unitdir} \
|
||||
"
|
||||
|
||||
@@ -30,7 +30,7 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[sha256sum] = "32fb5ca72bed38d9bffc47f24a6c4dcee03b1da52b200d0f5bb976f9d48b6ef0"
|
||||
SRC_URI[sha256sum] = "55aacf9183171bf9accdf71158940e76ff6cbc71c00eca5a3917cb69efaa371b"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/k*5 \
|
||||
@@ -38,6 +38,7 @@ FILES_${PN} += " \
|
||||
${datadir}/dbus-1 \
|
||||
${datadir}/polkit-1 \
|
||||
${OE_QMAKE_PATH_PLUGINS} \
|
||||
${systemd_user_unitdir} \
|
||||
"
|
||||
|
||||
RDEPENDS_${PN} += "upower"
|
||||
|
||||
@@ -9,20 +9,22 @@ REQUIRED_DISTRO_FEATURES = "x11"
|
||||
inherit kde-plasma features_check gettext
|
||||
|
||||
DEPENDS += " \
|
||||
kcoreaddons \
|
||||
kcoreaddons-native \
|
||||
kauth-native \
|
||||
kconfig-native \
|
||||
kcoreaddons-native \
|
||||
kpackage-native \
|
||||
kcoreaddons \
|
||||
ki18n \
|
||||
kxmlgui \
|
||||
kauth-native \
|
||||
kconfigwidgets \
|
||||
kio \
|
||||
knewstuff \
|
||||
kcmutils \
|
||||
${@bb.utils.contains("DISTRO_FEATURES", "x11", "libxcursor libxcb virtual/libx11", "", d)} \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[sha256sum] = "5f850e3e3e7dc85f5b13444c6669caf47690bf8e85d4248a4304f56ca7f189ff"
|
||||
SRC_URI[sha256sum] = "08a1337fee005d26f29d405d543c6693d28e108e269ec10bb8705da5354abbef"
|
||||
|
||||
RDEPENDS_${PN} = "sddm"
|
||||
|
||||
@@ -31,5 +33,6 @@ FILES_${PN} += " \
|
||||
${datadir}/knsrcfiles \
|
||||
${datadir}/kservices5 \
|
||||
${datadir}/polkit-1 \
|
||||
${datadir}/kpackage \
|
||||
${OE_QMAKE_PATH_PLUGINS} \
|
||||
"
|
||||
|
||||
@@ -33,7 +33,7 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[sha256sum] = "b2e03bc39a1c7f4e298c8c196a22e22291a5b71ecd972234c6a47d9b284c32ac"
|
||||
SRC_URI[sha256sum] = "cd355f1c9438cb5d177e7d8bf228342c6e0b6a3080b0ee479897d55431b788fe"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/k*5 \
|
||||
|
||||
Reference in New Issue
Block a user