kde-plasma: upgrade 5.12.5 -> 5.13.2

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2018-07-04 23:39:27 +02:00
parent 1d5f83ab50
commit 50bde82860
44 changed files with 214 additions and 229 deletions

View File

@@ -1,6 +1,6 @@
inherit kde-base
PLASMA_VERSION = "5.12.5"
PLASMA_VERSION = "5.13.2"
SRC_URI = "${KDE_MIRROR}/stable/plasma/${PV}/${BPN}-${PV}.tar.xz"

View File

@@ -2,8 +2,12 @@ SUMMARY = "Plugin based library to create window decorations"
LICENSE = "LGPLv2"
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
inherit kde-plasma
inherit kde-plasma gettext
DEPENDS += " \
ki18n \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "7a6426a12788a1dc5fceb3ed0cf15818"
SRC_URI[sha256sum] = "6db0aef51293d60a3a543e88725b85cdbc1d3fbdc2e79a88af8c073d2abea561"
SRC_URI[md5sum] = "4dcab3dcedbcaf08556d23df10103a14"
SRC_URI[sha256sum] = "60e5f0c1d423710b93728ec0c4c5a754725ef933a1cf11fc9c7d8206540d57be"

View File

@@ -24,8 +24,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "d28812344e8e0f47b1121f56d3e13750"
SRC_URI[sha256sum] = "418a69f9530750d40a4beb9c21b39b77c8c13d19474a1e524b954e77886ff4d6"
SRC_URI[md5sum] = "50e0838cc9e3ea23efb2ec4afc647585"
SRC_URI[sha256sum] = "ae5dafc0aa3d750fd73afb0939ce243f4c14be78e9e94d66a060d64f2db3d6fc"
SRC_URI += "file://0001-replace-try_run-by-try_compile-in-compiler-feature-c.patch"
# Workaround

View File

@@ -1,15 +1,14 @@
From 81fbb6d0d806f7934e24145fcd329a6a67b04952 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Thu, 11 Dec 2014 17:07:06 +0100
Subject: [PATCH 08/12] fix build for QT_NO_SESSIONMANAGER
From 5b89ba2442a8829a8a5f5af5247d838d1a2750e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Wed, 4 Jul 2018 23:32:58 +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@googlemail.com>
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
klipper/main.cpp | 4 ++++
krunner/main.cpp | 4 ++++
@@ -18,7 +17,7 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
4 files changed, 16 insertions(+)
diff --git a/klipper/main.cpp b/klipper/main.cpp
index 58a0778..a1d1312 100644
index 36539b63..522608a4 100644
--- a/klipper/main.cpp
+++ b/klipper/main.cpp
@@ -27,7 +27,9 @@
@@ -39,16 +38,16 @@ index 58a0778..a1d1312 100644
QGuiApplication::setFallbackSessionManagementEnabled(false);
auto disableSessionManagement = [](QSessionManager &sm) {
@@ -80,6 +83,7 @@ extern "C" int Q_DECL_EXPORT kdemain(int argc, char *argv[])
};
@@ -81,6 +84,7 @@ extern "C" int Q_DECL_EXPORT kdemain(int argc, char *argv[])
QObject::connect(&app, &QGuiApplication::commitDataRequest, disableSessionManagement);
QObject::connect(&app, &QGuiApplication::saveStateRequest, disableSessionManagement);
+#endif
app.setQuitOnLastWindowClosed( false );
+#endif
QCommandLineParser parser;
parser.addHelpOption();
diff --git a/krunner/main.cpp b/krunner/main.cpp
index b63156d..4edc1a8 100644
index cf228f86..6785a928 100644
--- a/krunner/main.cpp
+++ b/krunner/main.cpp
@@ -24,7 +24,9 @@
@@ -61,15 +60,15 @@ index b63156d..4edc1a8 100644
#include <KAuthorized>
#include <KAboutData>
@@ -76,6 +78,7 @@ int main(int argc, char **argv)
@@ -81,6 +83,7 @@ int main(int argc, char **argv)
KAboutData::setApplicationData(aboutData);
KDBusService service(KDBusService::Unique);
+#ifndef QT_NO_SESSIONMANAGER
QGuiApplication::setFallbackSessionManagementEnabled(false);
auto disableSessionManagement = [](QSessionManager &sm) {
@@ -83,6 +86,7 @@ int main(int argc, char **argv)
@@ -88,6 +91,7 @@ int main(int argc, char **argv)
};
QObject::connect(&app, &QGuiApplication::commitDataRequest, disableSessionManagement);
QObject::connect(&app, &QGuiApplication::saveStateRequest, disableSessionManagement);
@@ -78,7 +77,7 @@ index b63156d..4edc1a8 100644
View view;
view.setVisible(false);
diff --git a/shell/main.cpp b/shell/main.cpp
index ec117f3..93791b2 100644
index 6e241360..97908501 100644
--- a/shell/main.cpp
+++ b/shell/main.cpp
@@ -21,7 +21,9 @@
@@ -89,9 +88,9 @@ index ec117f3..93791b2 100644
#include <QSessionManager>
+#endif
#include <QDebug>
#include <QProcess>
#include <QMessageBox>
@@ -108,6 +110,7 @@ int main(int argc, char *argv[])
@@ -123,6 +125,7 @@ int main(int argc, char *argv[])
cliOptions.process(app);
aboutData.processCommandLine(&cliOptions);
@@ -99,7 +98,7 @@ index ec117f3..93791b2 100644
QGuiApplication::setFallbackSessionManagementEnabled(false);
auto disableSessionManagement = [](QSessionManager &sm) {
@@ -115,6 +118,7 @@ int main(int argc, char *argv[])
@@ -130,6 +133,7 @@ int main(int argc, char *argv[])
};
QObject::connect(&app, &QGuiApplication::commitDataRequest, disableSessionManagement);
QObject::connect(&app, &QGuiApplication::saveStateRequest, disableSessionManagement);
@@ -108,7 +107,7 @@ index ec117f3..93791b2 100644
ShellManager::s_fixedShell = cliOptions.value(shellPluginOption);
diff --git a/xembed-sni-proxy/main.cpp b/xembed-sni-proxy/main.cpp
index 1ae9b91..8a3bc39 100644
index 8b007823..a41b795e 100644
--- a/xembed-sni-proxy/main.cpp
+++ b/xembed-sni-proxy/main.cpp
@@ -19,7 +19,9 @@
@@ -136,5 +135,5 @@ index 1ae9b91..8a3bc39 100644
app.setQuitOnLastWindowClosed(false);
--
2.9.3
2.14.3

View File

@@ -48,8 +48,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "28906f048a968798f7311c1068aebb8b"
SRC_URI[sha256sum] = "93b70f559818d685dedf3c3f33d53eb4d9dc9892379c9040859349e385b8c5ef"
SRC_URI[md5sum] = "94a36b4a79b70c7e2f6aa9e90bff6721"
SRC_URI[sha256sum] = "174cb5e973421fd3de61e18d9a84657f9d30e967b0c54267b426e638a3814de6"
SRC_URI += " \
file://0001-fix-build-for-QT_NO_SESSIONMANAGER.patch \

View File

@@ -25,8 +25,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "60e92f4d444cba7e31041bf9c426d1aa"
SRC_URI[sha256sum] = "4a5cdcc3461cb36b82b95224e8646c2f8653ea73093812b355973c62dede5d66"
SRC_URI[md5sum] = "271ae58dcaf88e8de29a7ae2ff66f982"
SRC_URI[sha256sum] = "0731823bae6620a1211e43d78b8c615508bc360313e41ba50fad68807d15379a"
FILES_${PN} += " \
${datadir}/bluedevilwizard \

View File

@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = " \
inherit kde-plasma
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "4df4338cb8781e068e8b53987430cbda"
SRC_URI[sha256sum] = "0db73bfc28a07574f549808b7f6a2f832bf87b4773ee0a124573269307f98000"
SRC_URI[md5sum] = "faab643a995df7ec1e99b097e3cfd37f"
SRC_URI[sha256sum] = "dd4ecf8f45309fd59c73383e20041d032bc478c3c42c858265130827b11d1a8a"
FILES_${PN} += " \
${datadir}/kconf_update \

View File

@@ -9,8 +9,8 @@ inherit kde-plasma
DEPENDS += "plymouth"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "dbba7538a93056a57f52ecfe31eaf8cb"
SRC_URI[sha256sum] = "097f069d9c8c0ef2d987cd9c57f15bcb46abc48eeacb0370ab3c0734f1274094"
SRC_URI[md5sum] = "425841a2e4696c29ec33741617ca20ba"
SRC_URI[sha256sum] = "06c2c3a6d698eebf37551c295baaf928512670d51dd49a1be631157e6f0602a0"
FILES_${PN} += " \
${datadir}/plymouth \

View File

@@ -27,8 +27,8 @@ DEPENDS += "\
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "45cc26a47b5c742e93ba17e59d72d91a"
SRC_URI[sha256sum] = "764c1d174f5a2844a7144995b05b179a2d161d65f74d45ca353b524807f6aff7"
SRC_URI[md5sum] = "5b280fc28ee9319087ab90f039956b5d"
SRC_URI[sha256sum] = "78ca03ccf2178399cf9d0d71ad0a37d6695e0b4215a66ebca5b76201650e84fa"
FILES_${PN} += " \
${datadir}/color-schemes \

View File

@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = " \
inherit kde-plasma gtk-icon-cache
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "9101bdf4a6664dddc0e15b8fda4681e9"
SRC_URI[sha256sum] = "f5889b89a69ad2ed7db488631d59d13e7511235d759cc05e19b4086402d0d209"
SRC_URI[md5sum] = "033b40f8bfe672052e96af6d788094b5"
SRC_URI[sha256sum] = "2b533a1a4e73fcbc7840be7036ea31a4351009868144e43413d589335f6a024a"
DEPENDS += " \
qtdeclarative \

View File

@@ -23,11 +23,12 @@ DEPENDS += " \
kdesu \
kdelibs4support \
kwindowsystem \
plasma-workspace \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "15e8b3abd34c7bed89247dcd89677da9"
SRC_URI[sha256sum] = "905e5ad02a68743674f89bf705ffc32e0772704fee5023e5be068f2e6e6a403f"
SRC_URI[md5sum] = "ba79b133e21e40968eb95f3c7710d721"
SRC_URI[sha256sum] = "fa869ce5582553f2ce5a7027984ce5a65474675f19c17235cff12124f2821e12"
# do not move so-libs to -dev package
FILES_SOLIBSDEV = ""

View File

@@ -24,8 +24,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "26706a36cb19c270281a0b69f8ab2609"
SRC_URI[sha256sum] = "d0b62218b50de53018165616d7aba245b8a3fa394ed2834e9d0d945dd0bcbbdc"
SRC_URI[md5sum] = "58cad971b555b6b18dbe1380e4dcf915"
SRC_URI[sha256sum] = "44157672234486026d9b7495d596594377996644597b47120a313e1805c8e75a"
FILES_${PN} += " \
${datadir}/kservices5 \

View File

@@ -11,51 +11,39 @@ DEPENDS += " \
qtdeclarative \
\
kauth-native \
kconfig \
kconfig-native \
kconfigwidgets \
kcoreaddons \
kcoreaddons-native \
kpackage-native \
karchive \
kdeclarative \
kholidays \
ki18n \
kiconthemes \
kio \
kcmutils \
kross \
knotifications \
plasma-framework \
krunner \
kservice \
kpackage-native \
sonnet \
kunitconversion \
kdelibs4support \
kdelibs4support-native \
kdesignerplugin-native \
kross \
kwindowsystem \
knewstuff \
sonnet-native \
plasma-workspace \
\
${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 qtx11extras", "", d)} \
purpose \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "d16a91ea15fc12e7c18d420370ad0bd6"
SRC_URI[sha256sum] = "5af0b5e5e47a18abbb8c8e563598d3e9b99db57617faa6d7bf668188afd2698c"
FILES_SOLIBSDEV = " \
${libdir}/libplasma*core${SOLIBSDEV} \
"
SRC_URI[md5sum] = "c20bdbf3c6d814bcea7970be4e1a825e"
SRC_URI[sha256sum] = "fdd800ffd137ffa69febe8c945973bb85d5a8627916308bf1853c51adfe0400d"
FILES_${PN} += " \
${datadir}/kwin \
${datadir}/k*5 \
${datadir}/plasma \
${datadir}/icons \
${libdir}/libplasma*private.so \
${datadir}/kdevappwizard \
${datadir}/k*5 \
${datadir}/kwin \
${datadir}/plasma \
\
${OE_QMAKE_PATH_PLUGINS} \
${OE_QMAKE_PATH_QML} \
"
FILES_${PN}-dbg += " \
${OE_QMAKE_PATH_PLUGINS}/.debug \
${OE_QMAKE_PATH_PLUGINS}/*/*/.debug \
${OE_QMAKE_PATH_QML}/org/kde/plasma/private/*/.debug \
"

View File

@@ -19,8 +19,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "0ce29fe24ed752a36ce7fb6ff1be9fb1"
SRC_URI[sha256sum] = "2c9cc29257ef3b9b6f0b411c0070b643e84f13e238c66d6def873f2bff469d5c"
SRC_URI[md5sum] = "a05244976942d0b5f916e11067fcbb05"
SRC_URI[sha256sum] = "d2d87daf4cf35857e263e953adcc04d8d5165adb5d3795bcfdbe3ce51f877e34"
FILES_${PN} += " \
${datadir}/kgamma \

View File

@@ -31,8 +31,8 @@ DEPENDS += "\
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "af8bda38832760df6bc0f07aa784f8f3"
SRC_URI[sha256sum] = "ef4f0a7081441e58993cacde1593e3e8dd6c440cbddba56c6d091af340803bfa"
SRC_URI[md5sum] = "42ef7602b3b47440f0bc5ef34699c60b"
SRC_URI[sha256sum] = "08490a7fd56c3176f233b2a13f18da355c114f357c9a411627b5b53a8e72ce8d"
FILES_${PN} += " \
${datadir}/kservices5 \

View File

@@ -39,8 +39,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "5d0f3d5844ac31f2665ed0d5966d7751"
SRC_URI[sha256sum] = "65190f1ca25960c08367c4be52608b43d98a26d4f016bfdfcee44997c88482bc"
SRC_URI[md5sum] = "c29bff371c9fa9be859e842eb0a70282"
SRC_URI[sha256sum] = "d635ea36d231ec98738052b725417e7627936e4f31aebc2c3914bed5e2609b01"
SRC_URI += "file://0001-fix-build-in-x11-less-environments.patch"
FILES_${PN} += " \

View File

@@ -29,8 +29,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "450833cf1ccd244c40102cd249e73d2b"
SRC_URI[sha256sum] = "7cd2336639d734fece7c8e617238bf8a608e495441102e6d0acae2158316786d"
SRC_URI[md5sum] = "8194fde9078df9d231f5109ec8ba7fdd"
SRC_URI[sha256sum] = "6de372d7e3b4c1d2a35d364818650a7d0658a50ed7c79234c8d169ac2c6f426b"
# do not move so-libs to -dev package
FILES_SOLIBSDEV = ""

View File

@@ -13,22 +13,26 @@ DEPENDS += "\
kauth-native \
kconfig-native \
kcoreaddons-native \
libkscreen \
kpackage-native \
kdbusaddons \
kconfig \
kconfigwidgets \
ki18n \
kxmlgui \
kglobalaccel \
\
${@bb.utils.contains("DISTRO_FEATURES", "x11", "qtx11extras", "", d)} \
kwidgetsaddons \
kdeclarative \
kiconthemes \
plasma-framework \
libkscreen \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "bdd7f9036220e39f23b1c57cb373174d"
SRC_URI[sha256sum] = "1468c4bf0e781122eb0087c3b6fcee9c75da310fa1838c93f0dcfe1af7f14cb3"
SRC_URI[md5sum] = "b03a2382f80aea7018bcc6d48373d21c"
SRC_URI[sha256sum] = "20dcd03adf8a1cd5971e718ef56a55b3c72331207f3fb14216ad7710e30c1520"
FILES_${PN} += " \
${datadir}/kcm_kscreen \
${datadir}/k*_kscreen \
${datadir}/kservices5 \
${datadir}/icons \
${OE_QMAKE_PATH_PLUGINS} \

View File

@@ -29,8 +29,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "30afafc98d6d3eecec15c1bad3ce0362"
SRC_URI[sha256sum] = "b86d1d725212b5250dada0f7d69a34e52d0170940177703e82a365b89d9d8822"
SRC_URI[md5sum] = "c05f1470678220e645bbc7499f2418ec"
SRC_URI[sha256sum] = "29e6abdc682352fd163ee746fda2aa81164be63df26687913759c401fa6b9f41"
SRC_URI += "file://kde.pam"

View File

@@ -21,5 +21,5 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "805ba1b34c292e43f7791796d552a48c"
SRC_URI[sha256sum] = "c41b3c18fd093a885deed90fe9d67e19920876fbed82d8bb108e36c712b8f86d"
SRC_URI[md5sum] = "7cd52d602f99e9d320910afc1637750d"
SRC_URI[sha256sum] = "f6ff9b467527fc7f42d325dd20763d95fb7535e0260c7d490d65bc8fb7088bb8"

View File

@@ -28,8 +28,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "25bfe4cb9bbb782c938f92963ca1cd59"
SRC_URI[sha256sum] = "1b5b81c9818881edcd4b366801a67583ebdd6444aa20a55ccb52eed1a7269087"
SRC_URI[md5sum] = "4a7a6c0e8c32c46eede0ca3670c27bf2"
SRC_URI[sha256sum] = "c782746e0b77bd3ff25d8d2fe2cd53445a6511d0a9ad225c3d69ed561e648a2c"
# do not move so-libs to -dev package
FILES_SOLIBSDEV = ""

View File

@@ -14,8 +14,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "667a9ef9a5f5fa4664e337d405cdfdb6"
SRC_URI[sha256sum] = "6374132fe2d142c9eb999e90c636b973fe9715335de3cfa86f0b5f4258d5eba2"
SRC_URI[md5sum] = "af1400bff929647fda6611ba37c1074c"
SRC_URI[sha256sum] = "e89cc426ee89ff8123d65dbf98ef6e42383ed623ca86fd686a593ae61f3dedb6"
SRC_URI += " \
file://0001-use-pkgconfig-to-find-libgcrypt.patch \
"

View File

@@ -13,8 +13,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "dffa9e29a181d6d70bcf20a5d9de0781"
SRC_URI[sha256sum] = "e363bdcc70ff0a93b1350980ac6f638fcf73224a6f4b1c75bb3058c13dd60c17"
SRC_URI[md5sum] = "990c00585eff77185c6fb3e597dcd204"
SRC_URI[sha256sum] = "3ab8d8bbfbbb7d210dccea4d1b6b21b019293b43d940da72ed3508878e291d2e"
FILES_${PN} += " \
${OE_QMAKE_PATH_PLUGINS} \

View File

@@ -56,8 +56,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "39cc7321fe28c2b4a76426da8a830d7c"
SRC_URI[sha256sum] = "433a40e8565d260d8ec4259d7ce4ec28ef4e4d37f4273bd60aff127a418275d6"
SRC_URI[md5sum] = "c7ade0e9ac073572d2d40ca63f6ddd70"
SRC_URI[sha256sum] = "ce44bbdcfbdc5a170f75593175f9fb85475bdd93d4c8656e2fe24cff0795d00d"
SRC_URI += " \
file://0001-fix-build-for-qtbase-without-session-management.patch \

View File

@@ -1,25 +1,28 @@
From 0803702f8cae2734df58e82a19905de4cbd22484 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Wed, 25 Feb 2015 11:47:44 +0100
From a5d00be3accdbc1cecd4174c74c9876293b83e3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Wed, 4 Jul 2018 22:01:37 +0200
Subject: [PATCH] fix build for qtbase without session management
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
kwrited.cpp | 3 +++
1 file changed, 3 insertions(+)
kwrited.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/kwrited.cpp b/kwrited.cpp
index 2b73e36..de0a49a 100644
index 1df1f2c..b77cd25 100644
--- a/kwrited.cpp
+++ b/kwrited.cpp
@@ -76,11 +76,13 @@ int main(int argc, char **argv)
#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
QGuiApplication::setFallbackSessionManagementEnabled(false);
#endif
@@ -73,12 +73,14 @@ int main(int argc, char **argv)
QApplication::setDesktopSettingsAware(false);
QApplication a(argc, argv);
KAboutData::setApplicationData(aboutData());
+#ifndef QT_NO_SESSIONMANAGER
QGuiApplication::setFallbackSessionManagementEnabled(false);
auto disableSessionManagement = [](QSessionManager &sm) {
sm.setRestartHint(QSessionManager::RestartNever);
};
@@ -30,5 +33,5 @@ index 2b73e36..de0a49a 100644
KWrited w;
return a.exec();
--
1.9.3
2.14.3

View File

@@ -1,4 +1,4 @@
SUMMARY = " KWriteD: Listen to traditional system notifications"
SUMMARY = "KWriteD: Listen to traditional system notifications"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = " \
file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
@@ -16,8 +16,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "bc51d2068b1f442214059059761db068"
SRC_URI[sha256sum] = "bf2ee7d7938c675bd485953bfe2ded9a824b391b26d2a8139d8f6fc2499e746f"
SRC_URI[md5sum] = "808eb369ef588da07d272379ebc145c3"
SRC_URI[sha256sum] = "d9879553de8cd40dc42670cbd1ad63e59f89d38df4bb4d0b6dd7799b28d0d354"
SRC_URI += " \
file://0001-fix-build-for-qtbase-without-session-management.patch \

View File

@@ -1,55 +1,51 @@
From eaa5ced7a2a2b67160c2408d9a5f90086779b0dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Wed, 14 Feb 2018 23:51:38 +0100
From f7d25d036e02d9db3806818bf358c59ab4efdf38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Wed, 4 Jul 2018 21:09:11 +0200
Subject: [PATCH] fix configuration/build on x-less systems
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
CMakeLists.txt | 7 +++++--
CMakeLists.txt | 8 ++++++--
backends/qscreen/CMakeLists.txt | 5 ++++-
src/CMakeLists.txt | 5 ++++-
src/backendlauncher/CMakeLists.txt | 7 +++++--
src/backendlauncher/backendloader.cpp | 1 -
5 files changed, 18 insertions(+), 7 deletions(-)
src/backendlauncher/backendloader.cpp | 3 +++
src/backendmanager.cpp | 5 ++++-
6 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d119c25..bf05910 100644
index 536948f..33ac124 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,8 +19,6 @@ include(ECMQtDeclareLoggingCategory)
include(FeatureSummary)
include(CheckCXXCompilerFlag)
@@ -21,8 +21,6 @@ include(CheckCXXCompilerFlag)
include(CMakePackageConfigHelpers)
include(GenerateExportHeader)
-find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core DBus Gui Test X11Extras)
-
# Wayland backend
find_package(KF5Wayland ${KF5_MIN_VERSION} CONFIG REQUIRED)
add_feature_info("KF5Wayland" KF5Wayland_FOUND "Required for building libkscreen's KWayland backend")
@@ -33,6 +31,11 @@ set_package_properties(XCB PROPERTIES
@@ -35,6 +33,12 @@ set_package_properties(XCB PROPERTIES
PURPOSE "Required for building XRandR backends"
)
+find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core DBus Gui Test)
+if (XCB_FOUND)
+if (XCB_RANDR_FOUND)
+ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras)
+ add_definitions(-DWITH_XCB_RANDR=1)
+endif()
+
# library setup
option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF)
add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)")
set(KF5_VERSION ${PROJECT_VERSION}) #When we are happy with the api, we can sync with frameworks
diff --git a/backends/qscreen/CMakeLists.txt b/backends/qscreen/CMakeLists.txt
index 1342d4f..1a07544 100644
index a79f5e4..f0b6dd4 100644
--- a/backends/qscreen/CMakeLists.txt
+++ b/backends/qscreen/CMakeLists.txt
@@ -14,8 +14,11 @@ add_library(KSC_QScreen MODULE ${qscreen_SRCS})
@@ -60,16 +56,16 @@ index 1342d4f..1a07544 100644
KF5::Screen
)
+if (XCB_FOUND)
+if (XCB_RANDR_FOUND)
+ target_link_libraries(KSC_QScreen Qt5::X11Extras)
+endif()
+
install(TARGETS KSC_QScreen DESTINATION ${PLUGIN_INSTALL_DIR}/kf5/kscreen/)
install(TARGETS KSC_QScreen DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/kscreen/)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2961300..695352b 100644
index 5718cf1..3094814 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -29,9 +29,12 @@ target_link_libraries(KF5Screen
@@ -30,9 +30,12 @@ target_link_libraries(KF5Screen
Qt5::Gui
PRIVATE
Qt5::DBus
@@ -110,17 +106,38 @@ index f26ad0e..c933f10 100644
\ No newline at end of file
+)
diff --git a/src/backendlauncher/backendloader.cpp b/src/backendlauncher/backendloader.cpp
index 853f3d7..aed6246 100644
index 40f854d..5fc1350 100644
--- a/src/backendlauncher/backendloader.cpp
+++ b/src/backendlauncher/backendloader.cpp
@@ -28,7 +28,6 @@
@@ -28,7 +28,10 @@
#include <QDBusConnectionInterface>
#include <QDir>
#include <QPluginLoader>
-#include <QX11Info>
+
+#ifdef WITH_XCB_RANDR
#include <QX11Info>
+#endif
#include <memory>
diff --git a/src/backendmanager.cpp b/src/backendmanager.cpp
index a895198..1cecba3 100644
--- a/src/backendmanager.cpp
+++ b/src/backendmanager.cpp
@@ -152,9 +152,12 @@ QFileInfo BackendManager::preferredBackend(const QString &backend)
} else if (!env_kscreen_backend.isEmpty()) {
backendFilter = env_kscreen_backend;
} else {
+#ifdef WITH_XCB_RANDR
if (QX11Info::isPlatformX11()) {
backendFilter = QStringLiteral("XRandR");
- } else if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"))) {
+ } else
+#endif
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"))) {
backendFilter = QStringLiteral("KWayland");
} else {
backendFilter = QStringLiteral("QScreen");
--
2.5.0
2.14.3

View File

@@ -1,29 +0,0 @@
From 1c862f12c3370aee33d92ff06cbf4afccfd730a2 Mon Sep 17 00:00:00 2001
From: "Luis Gustavo S. Barreto" <gustavo@ossystems.com.br>
Date: Fri, 1 Apr 2016 19:39:32 +0000
Subject: [PATCH] avoid tests
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Luis Gustavo S. Barreto <gustavo@ossystems.com.br>
---
CMakeLists.txt | 2 --
1 file changed, 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bf05910..f81a81d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,8 +56,6 @@ endif (_HAVE_VISIBILITY AND NOT WIN32)
add_subdirectory(src)
add_subdirectory(backends)
-add_subdirectory(autotests)
-add_subdirectory(tests)
set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5Screen")
ecm_configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/KF5ScreenConfig.cmake.in"
--
2.1.4

View File

@@ -7,20 +7,16 @@ LIC_FILES_CHKSUM = " \
inherit kde-plasma
DEPENDS += " \
${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 qtx11extras", "", d)} \
"
DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 qtx11extras", "", d)}"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "1e3b3aa0026bf51121fa36f4380db6e5"
SRC_URI[sha256sum] = "64490d5cc666251b78d2aa42db9f4160d8494807f2777afa1fb46cda2764ed43"
SRC_URI[md5sum] = "5cef0c575c51acafa81d8fc954a07d4e"
SRC_URI[sha256sum] = "a5629c371a79b7872f72cc212e42d408823fba0f1eb2bd46fb036f657d372517"
SRC_URI += " \
file://0001-fix-configuration-build-on-x-less-systems.patch \
file://0002-avoid-autotests.patch \
"
FILES_${PN} += " \
${datadir}/dbus-1 \
${OE_QMAKE_PATH_PLUGINS} \

View File

@@ -28,8 +28,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "2ffb11f91a451f90c034b5b657d38563"
SRC_URI[sha256sum] = "a9cf21eb3a47ca8cd4d3152bb016c383d1f081cab22ebfbbfa1e77517a1f6e35"
SRC_URI[md5sum] = "ae4f817340348233ba10632276954b53"
SRC_URI[sha256sum] = "f11eff31113bb59d43c3eaeeff5225713cdc30799adee4ef0fc4ae53295972f5"
FILES_${PN} += " \
${datadir}/dbus-1 \

View File

@@ -22,8 +22,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "a6297963718e9315e72e1711e4f71e5c"
SRC_URI[sha256sum] = "cc852ca431edfe6f66a60983a722eac3bed1160a1f5f1ff85bf8e7032b9f1f6c"
SRC_URI[md5sum] = "499a5f91a949b929c58645b2ef275658"
SRC_URI[sha256sum] = "ed16c644b21aa04901af13181ada7c4546791bc92d3336938f2a6a828d7cf0d7"
FILES_${PN} += " \
${datadir}/k*5 \

View File

@@ -25,8 +25,8 @@ DEPENDS += " \
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "7622748eafe631e46574e44ba53bdaea"
SRC_URI[sha256sum] = "94c4b5a5a975605c38dceeba8c584af1f0310f54073d68b95e195764f75c660c"
SRC_URI[md5sum] = "0fc7a22e86b6ddf3027058c9b9480d03"
SRC_URI[sha256sum] = "454987b631a625575caa421f17bef2605f000f87676f87413b129deec6b1bd25"
SRC_URI += "file://0001-kstyle-add-an-option-BUILD_OXYGEN_SETTINGS-disabled-.patch"
PACKAGECONFIG ??= ""

View File

@@ -50,8 +50,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "bfcf9e48662c34d732b5f498b4627819"
SRC_URI[sha256sum] = "a655cbb76df219a05d56013df7abcd591506f3d3b2ee78b9a19f3a3f2c92a766"
SRC_URI[md5sum] = "407ae7c60459f87dca39e4f6448f9fe0"
SRC_URI[sha256sum] = "116a9a149b7a43de7e6ffc3930d2de386a9cbc3d313d5224aae5c89297dcac9f"
SRC_URI += "file://0001-Ensure-xkb_base-is-not-empty-instead-of-checking-if-.patch"

View File

@@ -26,8 +26,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "df9ade96432e4f5eb968e12ed7a7a72c"
SRC_URI[sha256sum] = "552391c878bfd14f1fd21bbf9e704f24e52259280a5f88ca8b3b77f9cd8f2c92"
SRC_URI[md5sum] = "06a0ee74eed95b92152bde850bb2f687"
SRC_URI[sha256sum] = "bd42d79d5a4aab4618aa113d9f577654473624a46d04de375bf330d94028e308"
FILES_${PN} += " \
${datadir}/kconf_update \

View File

@@ -48,8 +48,8 @@ DEPENDS += " \
# MobileBroadbandProviderInfo
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "2f52d77ade3582ce05bc58c4d2ea2677"
SRC_URI[sha256sum] = "46bbc3a63b1b1480325eada1ca115f16fee8d03930e92ea8e79947d65e6a96ab"
SRC_URI[md5sum] = "9563cc73015399678d1683784c22c46d"
SRC_URI[sha256sum] = "00a731eba2d7c9cd1481936119df30d058a569d2ab937765cc2c05406a7b0bea"
# do not move so-libs to -dev package
FILES_SOLIBSDEV = ""

View File

@@ -25,8 +25,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "0104e49c0e6332fdec3a61ddc9732c44"
SRC_URI[sha256sum] = "adc966437d6ccf93051ebb037a9d39b06e26f31a8e221e3c7e72e56b29d4e98f"
SRC_URI[md5sum] = "e3dad54cfb7aad38ad274bb6471acb4c"
SRC_URI[sha256sum] = "09efe416a0271dc1bc653d496b3ddfe6a6b6931e209a1e48ede7afc1874bc56a"
FILES_SOLIBSDEV = ""

View File

@@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = " \
inherit kde-plasma gtk-icon-cache
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "550e6df7522a10e5262136a54b88a254"
SRC_URI[sha256sum] = "2d4027ee1e21a2c0698a56e17aacdf871a2ea6f0e4bd2e3c7459eb7919d63c7f"
SRC_URI[md5sum] = "205472598c7d246fdc6f9c3dfb46374d"
SRC_URI[sha256sum] = "cbf59234eb2a114bf5095b202d855930491e5d470ad8b205184b45b2a4c78297"
DEPENDS += " \
kauth-native \
@@ -25,6 +25,7 @@ DEPENDS += " \
plasma-framework \
kwidgetsaddons \
ksysguard \
networkmanager-qt \
"
FILES_${PN} += " \
@@ -32,6 +33,3 @@ FILES_${PN} += " \
${datadir}/plasma \
${OE_QMAKE_PATH_PLUGINS} \
"
FILES_${PN}-dbg += " \
"

View File

@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \
inherit kde-plasma
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "30c03aeab0d69d87d08a5b1e57468f8c"
SRC_URI[sha256sum] = "47195c111ab7d1b3f769d1929192341929b8d00e1036d7b8bc4000dea662d3dc"
SRC_URI[md5sum] = "6fa4f5a3dce42de9dcd457d24abe7ff7"
SRC_URI[sha256sum] = "197157eb6101d1d5ee86b3c8e6fd4f793564665e59d00441ac314cf47bc8a72f"
FILES_${PN} += "${datadir}/wallpapers"

View File

@@ -1,45 +1,48 @@
From 099c0a4f82aaea70d751ad33fc35dfaea0c80a1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Mon, 9 Feb 2015 20:00:24 +0100
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
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
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 c770e25..8b93157 100644
index a30eeca..c53bb4e 100644
--- a/main.cpp
+++ b/main.cpp
@@ -25,7 +25,9 @@
#include <KCrash>
#include <KDBusService>
@@ -29,7 +29,9 @@
#include <PolkitQt1/Subject>
// Qt
#include <QApplication>
+#ifndef QT_NO_SESSIONMANAGER
#include <QSessionManager>
+#endif
#include "policykitkde.h"
@@ -48,12 +50,14 @@ int main(int argc, char *argv[])
PolicyKitKDE agent(argc, argv);
#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(&agent, &QGuiApplication::commitDataRequest, disableSessionManagement);
QObject::connect(&agent, &QGuiApplication::saveStateRequest, disableSessionManagement);
QObject::connect(&app, &QGuiApplication::commitDataRequest, disableSessionManagement);
QObject::connect(&app, &QGuiApplication::saveStateRequest, disableSessionManagement);
+#endif
agent.exec();
}
// register agent
PolicyKitListener *listener = new PolicyKitListener(&app);
--
1.9.3
2.14.3

View File

@@ -21,8 +21,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "b42ed1b4dfbc7f594529b12b4659a8e1"
SRC_URI[sha256sum] = "2ea6ed52ddab7678a8ee3a40c1eb782df9e8ebd4e52c2ce188823921e1bff406"
SRC_URI[md5sum] = "3fba972df6286f26f628a68e6c7c0e34"
SRC_URI[sha256sum] = "4a30ae2b756bf413f15b2b4b017ebc8e91c77afea6f1ce8323104224a02d85fc"
SRC_URI += "file://0001-fix-build-for-QT_NO_SESSIONMANAGER.patch"

View File

@@ -30,8 +30,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "5546090caa4cf11656091ae229351551"
SRC_URI[sha256sum] = "53b61cbeca71f959cb65b4593241a4d4c3f04bf6bca1e940f9173fec369ec31d"
SRC_URI[md5sum] = "dda59312c2046f82b9f2bde84d15a72c"
SRC_URI[sha256sum] = "e0caf30dadd6c601791132b057ca487233b90531b7aefd54c1e4c69b7c7a2a3d"
FILES_${PN} += " \
${datadir}/k*5 \

View File

@@ -23,8 +23,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "ba33b3187ddee122be32ffe0445564fb"
SRC_URI[sha256sum] = "70fcc9ef64649457645ce4f6acc60147ca9e058d0f2b996731f0cc7cf0f6188f"
SRC_URI[md5sum] = "2b40b8f5daf6b6c4e44b2d58e450f241"
SRC_URI[sha256sum] = "1d4f486fe0223fb77ad8b9c721cfb4629231f40d5e336dd94f13d2118ba14979"
RDEPENDS_${PN} = "sddm"

View File

@@ -29,11 +29,12 @@ DEPENDS += " \
kconfig \
khtml \
kdoctools \
plasma-workspace \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "08b5ebd84ee25d2306d30e1afe33f924"
SRC_URI[sha256sum] = "08128bfe1d946b8857ecb106fcc730132eb32d6256e596203558ebea7cfb9329"
SRC_URI[md5sum] = "625d73b83cb2fc483f962c09daef681f"
SRC_URI[sha256sum] = "a408cf2a35b95e547b3acaf1cbefcc01055a14e1d75c93584a79d5fd1881ed3f"
FILES_${PN} += " \
${datadir}/k*5 \

View File

@@ -16,8 +16,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "f4268471d391b2fb7f51818b7b96c9f6"
SRC_URI[sha256sum] = "200008fb88bef2b9555073fc290d86c7adc5ba9953b0c6a77e0238c317d3c694"
SRC_URI[md5sum] = "db32dff09d6ee37aff346976d8ee2498"
SRC_URI[sha256sum] = "501eb8247646e9251be6d531002debf0bad359e8be7aa2df7bab27dd9d9f7dcc"
FILES_${PN} += " \
${datadir}/kservices5 \