diff --git a/classes/kde-plasma.bbclass b/classes/kde-plasma.bbclass index 072bd3e3..443bf459 100644 --- a/classes/kde-plasma.bbclass +++ b/classes/kde-plasma.bbclass @@ -1,8 +1,9 @@ inherit kde-base -PLASMA_VERSION = "5.15.2" +PLASMA_VERSION = "5.15.3" +PLASMA_FIXUP_VERSION = "5.15.3.2" -SRC_URI = "${KDE_MIRROR}/stable/plasma/${PV}/${BPN}-${PV}.tar.xz" +SRC_URI = "${KDE_MIRROR}/stable/plasma/${PLASMA_VERSION}/${BPN}-${PV}.tar.xz" DEPENDS += " \ kwayland \ diff --git a/recipes-kde/plasma/tier1/kdecoration/kdecoration.bb b/recipes-kde/plasma/tier1/kdecoration/kdecoration.bb index d3411e32..65718a51 100644 --- a/recipes-kde/plasma/tier1/kdecoration/kdecoration.bb +++ b/recipes-kde/plasma/tier1/kdecoration/kdecoration.bb @@ -9,5 +9,5 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "cb64f7350eb4d082087ddc43d8d1ffd8" -SRC_URI[sha256sum] = "79b089269ce2fb830f3c3814b952dde3b64b90f092238ce96b2ae8056429debf" +SRC_URI[md5sum] = "b0cbc29002c38525f06e25926e41ce46" +SRC_URI[sha256sum] = "b04d9e2b454ee61f44e5557764782f3a7c73ace2c1a2076ddbce5e78bf36b7fa" diff --git a/recipes-kde/plasma/tier3/kactivitymanagerd/kactivitymanagerd.bb b/recipes-kde/plasma/tier3/kactivitymanagerd/kactivitymanagerd.bb index d9a3db6e..e7c82d84 100644 --- a/recipes-kde/plasma/tier3/kactivitymanagerd/kactivitymanagerd.bb +++ b/recipes-kde/plasma/tier3/kactivitymanagerd/kactivitymanagerd.bb @@ -24,8 +24,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "431ea0151d883dda6161d9ddc4c3d0af" -SRC_URI[sha256sum] = "7e4645f87882858d0707215b5b8d2182ab4b0ccd6d1d04400d9c3f43bcba8dae" +SRC_URI[md5sum] = "242dbc1fc363e90dad8350c9138918c3" +SRC_URI[sha256sum] = "d5e7afeb00b81fe79b7730b5a13765a47e8c8fd606d89179475c44ba40ade3d3" SRC_URI += "file://0001-replace-try_run-by-try_compile-in-compiler-feature-c.patch" # Workaround diff --git a/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb b/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb index 6039d4e6..c45bdf55 100644 --- a/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb +++ b/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb @@ -48,8 +48,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "d649215c622886a3dfc6bfaa82e6844c" -SRC_URI[sha256sum] = "5f0dd03c3e2aa845634e6199f3fbc18cb14a0f580367982aca43223f58058dd9" +SRC_URI[md5sum] = "582ef2fb97a9020c09d86118c04f3b0a" +SRC_URI[sha256sum] = "a9b8e2af593929695c3b2f9d3c709d4a0a4d760dcbe439ca2f24efd8d06b3922" SRC_URI += " \ file://0001-fix-build-for-QT_NO_SESSIONMANAGER.patch \ diff --git a/recipes-kde/plasma/untier/bluedevil/bluedevil.bb b/recipes-kde/plasma/untier/bluedevil/bluedevil.bb index 46f0037a..85d48f51 100644 --- a/recipes-kde/plasma/untier/bluedevil/bluedevil.bb +++ b/recipes-kde/plasma/untier/bluedevil/bluedevil.bb @@ -26,8 +26,8 @@ DEPENDS += " \ PV = "${PLASMA_VERSION}" SRC_URI += "file://0001-Hack-build-with-gcc8.patch" -SRC_URI[md5sum] = "92200668cad4bea55ebb3bedd22da8ba" -SRC_URI[sha256sum] = "fc4bda560ff743cd5db70071811418beb5e19c5814bbc68a8427dafee6c1cdb4" +SRC_URI[md5sum] = "7bb9a0a7cb5c751d1a94fcf9cb260bd4" +SRC_URI[sha256sum] = "40edc97e2236655114ef0fe77fa357c70fcf07c555fbe1b40d45f2dc7c90b1ed" FILES_${PN} += " \ ${datadir}/bluedevilwizard \ diff --git a/recipes-kde/plasma/untier/breeze-gtk/breeze-gtk.bb b/recipes-kde/plasma/untier/breeze-gtk/breeze-gtk.bb index 3163da58..4526a881 100644 --- a/recipes-kde/plasma/untier/breeze-gtk/breeze-gtk.bb +++ b/recipes-kde/plasma/untier/breeze-gtk/breeze-gtk.bb @@ -9,8 +9,8 @@ inherit kde-plasma python3native DEPENDS += "sassc-native cairo breeze python3-pycairo-native" PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "df7ca71b9acca5a06762d9f4c7e6c536" -SRC_URI[sha256sum] = "5cba7b4b0db8cc36cff4390bae197163cab2474fbcfc2833d469caeea5767d39" +SRC_URI[md5sum] = "b369b343d6dd4ef3af6d18340a83f308" +SRC_URI[sha256sum] = "4426839fb30cc088a1cedad4c542fc7c0d07a266c3c40ec03c0003ecdd10e3e5" FILES_${PN} += " \ ${datadir}/kconf_update \ diff --git a/recipes-kde/plasma/untier/breeze-plymouth/breeze-plymouth.bb b/recipes-kde/plasma/untier/breeze-plymouth/breeze-plymouth.bb index d8704a7d..2f3963da 100644 --- a/recipes-kde/plasma/untier/breeze-plymouth/breeze-plymouth.bb +++ b/recipes-kde/plasma/untier/breeze-plymouth/breeze-plymouth.bb @@ -9,8 +9,8 @@ inherit kde-plasma DEPENDS += "plymouth" PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "c1f4e6f89d9d01ab3b4337ffc9441fd7" -SRC_URI[sha256sum] = "f093566ae51218b4461d1dbebb7a8ee402077bda2e67d840dc71309926c9d758" +SRC_URI[md5sum] = "2f48a4f199780cc8fe3d31eda54034e7" +SRC_URI[sha256sum] = "674090b5776aca915b58cfbeada45895fc51bac0e2d31509628277a2fd24c538" FILES_${PN} += " \ ${datadir}/plymouth \ diff --git a/recipes-kde/plasma/untier/breeze/breeze.bb b/recipes-kde/plasma/untier/breeze/breeze.bb index b98a8641..29e10e04 100644 --- a/recipes-kde/plasma/untier/breeze/breeze.bb +++ b/recipes-kde/plasma/untier/breeze/breeze.bb @@ -27,8 +27,8 @@ DEPENDS += "\ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "8313d1af342832a1ff5db2f2c9203afc" -SRC_URI[sha256sum] = "682bc6c7669f5440b64157e57b2b1a157234dca1c7e721874a52bb1117bb4e54" +SRC_URI[md5sum] = "9c11d520682160d4704cddb8386d3de8" +SRC_URI[sha256sum] = "4be0b50deb6a3b42e3c09461ebef76f0af758c400c998b627bc72931d8b3fe50" FILES_${PN} += " \ ${datadir}/color-schemes \ diff --git a/recipes-kde/plasma/untier/discover/discover.bb b/recipes-kde/plasma/untier/discover/discover.bb index 736fbcaa..8fbc6ba7 100644 --- a/recipes-kde/plasma/untier/discover/discover.bb +++ b/recipes-kde/plasma/untier/discover/discover.bb @@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = " \ inherit kde-plasma gtk-icon-cache PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "6a8905b63f4501095f79cbf794356b2f" -SRC_URI[sha256sum] = "c2f8e10208ddc90edcdc82d0aba0eaba216e2129f53eddde5e9ba88e9fb63c6d" +SRC_URI[md5sum] = "1ffd8fe39532ef5093e42d4b330de5dd" +SRC_URI[sha256sum] = "2b38184677542fabfe6e45217d838570487126aab2242e57129493dc0362d5ac" DEPENDS += " \ qtdeclarative \ diff --git a/recipes-kde/plasma/untier/kde-cli-tools/kde-cli-tools.bb b/recipes-kde/plasma/untier/kde-cli-tools/kde-cli-tools.bb index ce783157..75006958 100644 --- a/recipes-kde/plasma/untier/kde-cli-tools/kde-cli-tools.bb +++ b/recipes-kde/plasma/untier/kde-cli-tools/kde-cli-tools.bb @@ -27,8 +27,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "6ccf067a99c2b81ea3fbe828d1622f94" -SRC_URI[sha256sum] = "62304fd27b9e78fce90507bd2d92de4ec6c018fe39c899756ada2ad0bf4627ac" +SRC_URI[md5sum] = "882890f64e5143e67e061f6267feea5f" +SRC_URI[sha256sum] = "ef7ac31b6499739779b2c4e1ecbde3500346ca805875e2f93ca6928494f62adf" # do not move so-libs to -dev package FILES_SOLIBSDEV = "" diff --git a/recipes-kde/plasma/untier/kde-gtk-config/kde-gtk-config.bb b/recipes-kde/plasma/untier/kde-gtk-config/kde-gtk-config.bb index 5c8f5c6a..5c12845a 100644 --- a/recipes-kde/plasma/untier/kde-gtk-config/kde-gtk-config.bb +++ b/recipes-kde/plasma/untier/kde-gtk-config/kde-gtk-config.bb @@ -24,8 +24,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "a62af8b85540c1da48026ef3881b8de5" -SRC_URI[sha256sum] = "449528ef124835386f12db86dd349e582369652796aba5f51fc2ba6abd3dcf1e" +SRC_URI[md5sum] = "fc76a4f8bdb2a031fdadff946514ae3d" +SRC_URI[sha256sum] = "488f678d65352f74b96149371f49098be8f22adbdbceb9d2699e8beeb4115cfb" FILES_${PN} += " \ ${datadir}/kservices5 \ diff --git a/recipes-kde/plasma/untier/kdeplasma-addons/kdeplasma-addons.bb b/recipes-kde/plasma/untier/kdeplasma-addons/kdeplasma-addons.bb index 4955d506..1231bf9b 100644 --- a/recipes-kde/plasma/untier/kdeplasma-addons/kdeplasma-addons.bb +++ b/recipes-kde/plasma/untier/kdeplasma-addons/kdeplasma-addons.bb @@ -34,8 +34,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "6cb82e2c6a41d08dcd87cdb113c636c4" -SRC_URI[sha256sum] = "9e360c532f3a386959a93f4d46ea87d0bffa609f9252e6abc47e170b064a3230" +SRC_URI[md5sum] = "a1b032662fd6267b7bf0e8a0ff627db0" +SRC_URI[sha256sum] = "364faceba87e8ae4d9d515615a022316cc1115d75e56fe305ee671ff3ab73c1c" FILES_${PN} += " \ ${datadir}/icons \ diff --git a/recipes-kde/plasma/untier/kgamma5/kgamma5.bb b/recipes-kde/plasma/untier/kgamma5/kgamma5.bb index 41a95516..a8868840 100644 --- a/recipes-kde/plasma/untier/kgamma5/kgamma5.bb +++ b/recipes-kde/plasma/untier/kgamma5/kgamma5.bb @@ -19,8 +19,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "dc31cef8140fbd991fcb2b752457edf8" -SRC_URI[sha256sum] = "5ea3d42ede065b71de0e015d76c42fe8fbb930e390c7041c5be0e16d1b10171b" +SRC_URI[md5sum] = "cb4e1b8f8d4b4f3bf53a35b7bb02fe48" +SRC_URI[sha256sum] = "be0a76bf328dedeb9911d9d560e625a10850ea438374f39c22e17291abcd9689" FILES_${PN} += " \ ${datadir}/kgamma \ diff --git a/recipes-kde/plasma/untier/khotkeys/khotkeys.bb b/recipes-kde/plasma/untier/khotkeys/khotkeys.bb index 29e1acc3..603f69b9 100644 --- a/recipes-kde/plasma/untier/khotkeys/khotkeys.bb +++ b/recipes-kde/plasma/untier/khotkeys/khotkeys.bb @@ -31,8 +31,8 @@ DEPENDS += "\ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "f08734d40b805d06e930bf2c8091402a" -SRC_URI[sha256sum] = "71527e48d3dbd7e4f7d2a5e7d7506f51534adf2ca1647bcf91a645bbf6a612a2" +SRC_URI[md5sum] = "9eebf70f99a2eb0d0a62285d47a8542e" +SRC_URI[sha256sum] = "85d6705dec38e38d259bc9a721a75a9bd4abde636a1d7406bc1dc5390d6dd33e" FILES_${PN} += " \ ${datadir}/kservices5 \ diff --git a/recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb b/recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb index f288e8f2..caa28ad1 100644 --- a/recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb +++ b/recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb @@ -39,8 +39,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "85fa5b3537f996e1e32f9e9ed798424e" -SRC_URI[sha256sum] = "fc967e7a16e2e305037e56bb148f8eacd6a85fc465147d12fa7637215a054f71" +SRC_URI[md5sum] = "8064140c272452f7610e35b714930ca4" +SRC_URI[sha256sum] = "996788d374e53d1d50093a88641c7cde791b3ba1c890ed72d5ee5507aece1066" SRC_URI += "file://0001-fix-build-in-x11-less-environments.patch" FILES_${PN} += " \ diff --git a/recipes-kde/plasma/untier/kmenuedit/kmenuedit.bb b/recipes-kde/plasma/untier/kmenuedit/kmenuedit.bb index bdd012f9..5d1e1613 100644 --- a/recipes-kde/plasma/untier/kmenuedit/kmenuedit.bb +++ b/recipes-kde/plasma/untier/kmenuedit/kmenuedit.bb @@ -29,8 +29,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "8e5024a5021a4281378315166e624e10" -SRC_URI[sha256sum] = "d3ef0d95ea9863654386f6a577e7cdb8da4a2a90abd49e94f54d1b54019156f6" +SRC_URI[md5sum] = "50e642a3d5949443e161ea0d4eeaadea" +SRC_URI[sha256sum] = "4b5d390e8f5f8af4f2120dfa22b43b64889858a573f8e14c22bd5e15fb85ebe8" # do not move so-libs to -dev package FILES_SOLIBSDEV = "" diff --git a/recipes-kde/plasma/untier/kscreen/kscreen.bb b/recipes-kde/plasma/untier/kscreen/kscreen.bb index b2c1d3be..90ed5863 100644 --- a/recipes-kde/plasma/untier/kscreen/kscreen.bb +++ b/recipes-kde/plasma/untier/kscreen/kscreen.bb @@ -28,8 +28,8 @@ DEPENDS += "\ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "018255eeaad8872b24f82c83fedac261" -SRC_URI[sha256sum] = "5b676ea66b623d60a50402fc5c9f822447cf6e683128978b29775d28194af7ef" +SRC_URI[md5sum] = "0efcace3965f868e4b474f501c4c3130" +SRC_URI[sha256sum] = "0e9945afce9d616ab34da5a985410aac8fd3d9f15630db74d53e6540ad0af8c7" FILES_${PN} += " \ ${datadir}/k*_kscreen \ diff --git a/recipes-kde/plasma/untier/kscreenlocker/kscreenlocker.bb b/recipes-kde/plasma/untier/kscreenlocker/kscreenlocker.bb index 0763ecb8..1a8382ac 100644 --- a/recipes-kde/plasma/untier/kscreenlocker/kscreenlocker.bb +++ b/recipes-kde/plasma/untier/kscreenlocker/kscreenlocker.bb @@ -29,8 +29,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "63fea4423221fa8bf67fec3623e79014" -SRC_URI[sha256sum] = "baf2d72a9594e837ce78fa9f84695be7516a78d6d8321a1e7fe3e95bd2fa6325" +SRC_URI[md5sum] = "d7ae9eaa8ff3208df01935fc0cd0c28a" +SRC_URI[sha256sum] = "cafe0b7b2ce65e1cf86e6b87f8281380d531949c445e22a23714b1bce2bbf42d" SRC_URI += "file://kde.pam" diff --git a/recipes-kde/plasma/untier/ksshaskpass/ksshaskpass.bb b/recipes-kde/plasma/untier/ksshaskpass/ksshaskpass.bb index 769d3056..7b99b514 100644 --- a/recipes-kde/plasma/untier/ksshaskpass/ksshaskpass.bb +++ b/recipes-kde/plasma/untier/ksshaskpass/ksshaskpass.bb @@ -21,5 +21,5 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "21e93dd73a9b5cac4490ccd8c1aca4ae" -SRC_URI[sha256sum] = "f728d22d161f3a21b877dd4b19b085c15fc95c1f85bba4bd4653add736d2c8d9" +SRC_URI[md5sum] = "86f4c45eac9db936b22b84cb75c35598" +SRC_URI[sha256sum] = "3a39bb7d0f2eba303d28ed0cb0df76ae7b12c58c205ec335ba92acacc96132ff" diff --git a/recipes-kde/plasma/untier/ksysguard/ksysguard.bb b/recipes-kde/plasma/untier/ksysguard/ksysguard.bb index 3753ca4c..ce8cf381 100644 --- a/recipes-kde/plasma/untier/ksysguard/ksysguard.bb +++ b/recipes-kde/plasma/untier/ksysguard/ksysguard.bb @@ -28,8 +28,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "886f8727527562b1713ce3230c731b33" -SRC_URI[sha256sum] = "b6f107d7bbe050fd41228326b331b84a0af47f720e530073af71ca53139b68d8" +SRC_URI[md5sum] = "39a526781799088e251305f17945e784" +SRC_URI[sha256sum] = "38219e61ce3e1bac0463b8d8f538f582e55976750f01cd44b2be105c7d53afdb" # do not move so-libs to -dev package FILES_SOLIBSDEV = "" diff --git a/recipes-kde/plasma/untier/kwallet-pam/kwallet-pam.bb b/recipes-kde/plasma/untier/kwallet-pam/kwallet-pam.bb index c58975d5..99ddd24f 100644 --- a/recipes-kde/plasma/untier/kwallet-pam/kwallet-pam.bb +++ b/recipes-kde/plasma/untier/kwallet-pam/kwallet-pam.bb @@ -14,8 +14,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "4193b900988f2c33221686dd98d09b50" -SRC_URI[sha256sum] = "df606bea17d96d6d2114dac4f30d34dadc14d96d7570ef604190c0c79979128a" +SRC_URI[md5sum] = "6ebd5b3e62be468b4a5841bcce624093" +SRC_URI[sha256sum] = "239de5e3472366aa4247f109f3f026ec3313b6e28e6cea184140cc3145727bf0" SRC_URI += " \ file://0001-use-pkgconfig-to-find-libgcrypt.patch \ " diff --git a/recipes-kde/plasma/untier/kwayland-integration/kwayland-integration.bb b/recipes-kde/plasma/untier/kwayland-integration/kwayland-integration.bb index 3fb2656a..7d0ca484 100644 --- a/recipes-kde/plasma/untier/kwayland-integration/kwayland-integration.bb +++ b/recipes-kde/plasma/untier/kwayland-integration/kwayland-integration.bb @@ -13,8 +13,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "5785b3916a0aa9b4f6dac91288fb72a4" -SRC_URI[sha256sum] = "5b55f8e8acf18998d3fa2cbf27c2c6686a82fd81bfce9bab0f35d4372b3507c8" +SRC_URI[md5sum] = "f5ceb5dbfcf2d3f590b9115c446b35df" +SRC_URI[sha256sum] = "7000f3fc7802e8dc9cb0825fd2cc4c5e2619e80fa12536e4e7cfdd33ad4b2b3f" FILES_${PN} += " \ ${OE_QMAKE_PATH_PLUGINS} \ diff --git a/recipes-kde/plasma/untier/kwin/files/0002-Make-building-of-QPA-wayland-plugin-an-option.patch b/recipes-kde/plasma/untier/kwin/files/0001-Make-building-of-QPA-wayland-plugin-an-option.patch similarity index 100% rename from recipes-kde/plasma/untier/kwin/files/0002-Make-building-of-QPA-wayland-plugin-an-option.patch rename to recipes-kde/plasma/untier/kwin/files/0001-Make-building-of-QPA-wayland-plugin-an-option.patch diff --git a/recipes-kde/plasma/untier/kwin/files/0001-fix-build-for-qtbase-without-session-management.patch b/recipes-kde/plasma/untier/kwin/files/0001-fix-build-for-qtbase-without-session-management.patch deleted file mode 100644 index fbe791a4..00000000 --- a/recipes-kde/plasma/untier/kwin/files/0001-fix-build-for-qtbase-without-session-management.patch +++ /dev/null @@ -1,134 +0,0 @@ -From 3e8eab8c8350333d5d86fb52b3a1c89002632ecd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Fri, 11 Dec 2015 22:33:39 +0100 -Subject: [PATCH] fix build for qtbase without session management -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 ---- - main_x11.cpp | 2 ++ - sm.cpp | 4 ++++ - workspace.cpp | 12 ++++++++++-- - workspace.h | 2 ++ - 4 files changed, 18 insertions(+), 2 deletions(-) - -diff --git a/main_x11.cpp b/main_x11.cpp -index 2c13743..742a5af 100644 ---- a/main_x11.cpp -+++ b/main_x11.cpp -@@ -148,10 +148,12 @@ void ApplicationX11::performStartup() - Application::setX11ScreenNumber(QX11Info::appScreen()); - } - -+#ifndef QT_NO_SESSIONMANAGER - // QSessionManager for some reason triggers a very early commitDataRequest - // and updates the key - before we create the workspace and load the session - // data -> store and pass to the workspace constructor - m_originalSessionKey = sessionKey(); -+#endif - - owner.reset(new KWinSelectionOwner(Application::x11ScreenNumber())); - connect(owner.data(), &KSelectionOwner::failedToClaimOwnership, []{ -diff --git a/sm.cpp b/sm.cpp -index 6852390..efa2e82 100644 ---- a/sm.cpp -+++ b/sm.cpp -@@ -56,6 +56,7 @@ static KConfig *sessionConfig(QString id, QString key) - return config; - } - -+#ifndef QT_NO_SESSIONMANAGER - void Workspace::saveState(QSessionManager &sm) - { - // If the session manager is ksmserver, save stacking -@@ -92,6 +93,7 @@ void Workspace::commitData(QSessionManager &sm) - if (!sm.isPhase2()) - sessionSaveStarted(); - } -+#endif - - // Workspace - -@@ -215,8 +217,10 @@ void Workspace::loadSessionInfo(const QString &key) - // NOTICE: qApp->sessionKey() is outdated when this gets invoked - // the key parameter is cached from the application constructor. - session.clear(); -+#ifndef QT_NO_SESSIONMANAGER - KConfigGroup cg(sessionConfig(qApp->sessionId(), key), "Session"); - addSessionInfo(cg); -+#endif - } - - void Workspace::addSessionInfo(KConfigGroup &cg) -diff --git a/workspace.cpp b/workspace.cpp -index 02ccf5a..3c83ec1 100644 ---- a/workspace.cpp -+++ b/workspace.cpp -@@ -152,10 +152,12 @@ Workspace::Workspace(const QString &sessionKey) - - delayFocusTimer = 0; - -+#ifndef QT_NO_SESSIONMANAGER - if (!sessionKey.isEmpty()) - loadSessionInfo(sessionKey); - connect(qApp, &QGuiApplication::commitDataRequest, this, &Workspace::commitData); - connect(qApp, &QGuiApplication::saveStateRequest, this, &Workspace::saveState); -+#endif - - RuleBook::create(this)->load(); - -@@ -397,7 +399,9 @@ void Workspace::initWithX11() - // TODO: only in X11 mode - // Extra NETRootInfo instance in Client mode is needed to get the values of the properties - NETRootInfo client_info(connection(), NET::ActiveWindow | NET::CurrentDesktop); -+#ifndef QT_NO_SESSIONMANAGER - if (!qApp->isSessionRestored()) -+#endif - m_initialDesktop = client_info.currentDesktop(); - if (!VirtualDesktopManager::self()->setCurrent(m_initialDesktop)) - VirtualDesktopManager::self()->setCurrent(1); -@@ -406,7 +410,9 @@ void Workspace::initWithX11() - rootInfo->setActiveWindow(None); - focusToNull(); - -+#ifndef QT_NO_SESSIONMANAGER - if (!qApp->isSessionRestored()) -+#endif - ++block_focus; // Because it will be set below - - { -@@ -472,7 +478,10 @@ void Workspace::initWithX11() - - // TODO: only on X11? - AbstractClient* new_active_client = nullptr; -- if (!qApp->isSessionRestored()) { -+#ifndef QT_NO_SESSIONMANAGER -+ if (!qApp->isSessionRestored()) -+#endif -+ { - --block_focus; - new_active_client = findClient(Predicate::WindowMatch, client_info.activeWindow()); - } -diff --git a/workspace.h b/workspace.h -index 0653064..c3c0a02 100644 ---- a/workspace.h -+++ b/workspace.h -@@ -441,9 +441,11 @@ private Q_SLOTS: - void slotDesktopCountChanged(uint previousCount, uint newCount); - void slotCurrentDesktopChanged(uint oldDesktop, uint newDesktop); - -+#ifndef QT_NO_SESSIONMANAGER - // session management - void saveState(QSessionManager &sm); - void commitData(QSessionManager &sm); -+#endif - - Q_SIGNALS: - /** --- -2.5.0 - diff --git a/recipes-kde/plasma/untier/kwin/kwin.bb b/recipes-kde/plasma/untier/kwin/kwin.bb index 96da2ab2..7003fb21 100644 --- a/recipes-kde/plasma/untier/kwin/kwin.bb +++ b/recipes-kde/plasma/untier/kwin/kwin.bb @@ -56,13 +56,12 @@ DEPENDS += " \ kdoctools-native \ " -PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "de8fe09420b0dc01b78c7df8dcd39267" -SRC_URI[sha256sum] = "de4997170d11adb175e0c9499e03c06b4d83aa572a5f71040a873bf7b0f65d84" +PV = "${PLASMA_FIXUP_VERSION}" +SRC_URI[md5sum] = "d297109766835e43cea21af920b88b3c" +SRC_URI[sha256sum] = "3c7b5ced440cf9ecd23b5905727cea4730188fbfe6388b4fcdb5eb3f52323147" SRC_URI += " \ - file://0001-fix-build-for-qtbase-without-session-management.patch \ - file://0002-Make-building-of-QPA-wayland-plugin-an-option.patch \ + file://0001-Make-building-of-QPA-wayland-plugin-an-option.patch \ " # pure X11 environments fail to build wayland plugin diff --git a/recipes-kde/plasma/untier/kwrited/kwrited.bb b/recipes-kde/plasma/untier/kwrited/kwrited.bb index 09849630..ccdecdbd 100644 --- a/recipes-kde/plasma/untier/kwrited/kwrited.bb +++ b/recipes-kde/plasma/untier/kwrited/kwrited.bb @@ -16,8 +16,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "7ae32126cc4c36e19799b4563c9b6996" -SRC_URI[sha256sum] = "1e16904abea59c663fea97d97866ce914334392b774cd0d48e435c617c0ed546" +SRC_URI[md5sum] = "c568256c56e2a2fa22e642a8bd43bfa5" +SRC_URI[sha256sum] = "fb3cd2b588f23ecd71d3ac476457cd1e0881172bda9879f4d465e43b9dad0d76" SRC_URI += " \ file://0001-fix-build-for-qtbase-without-session-management.patch \ diff --git a/recipes-kde/plasma/untier/libkscreen/libkscreen.bb b/recipes-kde/plasma/untier/libkscreen/libkscreen.bb index 5ea27de6..20a23f4d 100644 --- a/recipes-kde/plasma/untier/libkscreen/libkscreen.bb +++ b/recipes-kde/plasma/untier/libkscreen/libkscreen.bb @@ -10,8 +10,8 @@ inherit kde-plasma DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 qtx11extras", "", d)}" PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "d8dcb6eb3f4db13af6f156b4def793d2" -SRC_URI[sha256sum] = "a46e0aeab9ccf98a212b37c906e0c7f54b290928d1b4cd8ab0032e3d6f562c14" +SRC_URI[md5sum] = "705f767f74d225a7d3e54863c28e8774" +SRC_URI[sha256sum] = "728f3c0f3bed38e75b8319a2452da9f864911c4b8206f354d536e2a21e9aee3b" SRC_URI += " \ file://0001-fix-configuration-build-on-x-less-systems.patch \ diff --git a/recipes-kde/plasma/untier/libksysguard/libksysguard.bb b/recipes-kde/plasma/untier/libksysguard/libksysguard.bb index dd0f4ce9..59a4c82b 100644 --- a/recipes-kde/plasma/untier/libksysguard/libksysguard.bb +++ b/recipes-kde/plasma/untier/libksysguard/libksysguard.bb @@ -27,8 +27,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "eab82fa0b0f994e28b5ea63bb0be72c5" -SRC_URI[sha256sum] = "8cbc587a32fdd7c6f0f56b569376aeaa7821ebeadeedb4fdfea71d25a3541e15" +SRC_URI[md5sum] = "94d5a8505d3ecc69726aa9deb592bf97" +SRC_URI[sha256sum] = "d2e22a6ed3cb04c1b398f4609faa8eea10a97d89c29230c544ab57d643598e15" FILES_${PN} += " \ ${datadir}/dbus-1 \ diff --git a/recipes-kde/plasma/untier/milou/milou.bb b/recipes-kde/plasma/untier/milou/milou.bb index d4b6b9e2..43796a33 100644 --- a/recipes-kde/plasma/untier/milou/milou.bb +++ b/recipes-kde/plasma/untier/milou/milou.bb @@ -22,8 +22,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "8251992080b68cb38e860f2e304ec06e" -SRC_URI[sha256sum] = "282349371d55994ac101a9fbc81d14408d386e6b5958ddafb4efccc5a15ced78" +SRC_URI[md5sum] = "95d1078a08dcf21266a9cce51bac9dc6" +SRC_URI[sha256sum] = "017c8e26583926eb15936227236d19e120868775521b7bdc64e86b9f5b4d38df" FILES_${PN} += " \ ${datadir}/k*5 \ diff --git a/recipes-kde/plasma/untier/oxygen/oxygen.bb b/recipes-kde/plasma/untier/oxygen/oxygen.bb index f6fe9e16..b3026985 100644 --- a/recipes-kde/plasma/untier/oxygen/oxygen.bb +++ b/recipes-kde/plasma/untier/oxygen/oxygen.bb @@ -25,8 +25,8 @@ DEPENDS += " \ PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "e329883d5dcd51b7a0d4f476dfe0a367" -SRC_URI[sha256sum] = "72471ec234d71985ceea722ffdd1dba4a05d19737ac98eb90e69c4188c6c2cef" +SRC_URI[md5sum] = "b0224262aaea0611a5304e9586d9ddbf" +SRC_URI[sha256sum] = "6bb7e108291f1b82881de71a1df99429e90922e8fb2318d99a7002be6b4c0628" SRC_URI += "file://0001-kstyle-add-an-option-BUILD_OXYGEN_SETTINGS-disabled-.patch" PACKAGECONFIG ??= "" diff --git a/recipes-kde/plasma/untier/plasma-browser-integration/plasma-browser-integration.bb b/recipes-kde/plasma/untier/plasma-browser-integration/plasma-browser-integration.bb index f3062556..a4df8dc5 100644 --- a/recipes-kde/plasma/untier/plasma-browser-integration/plasma-browser-integration.bb +++ b/recipes-kde/plasma/untier/plasma-browser-integration/plasma-browser-integration.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING-GPL3;md5=d32239bcb673463ab874e80d47fae504" inherit kde-plasma gettext PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "f93c351576cea67b11e95b9db64db8e2" -SRC_URI[sha256sum] = "e9d8d14455cd6f7851e1e3e6cba46fa4705d152ad8971867e6e74b30393fb702" +SRC_URI[md5sum] = "dcede75af2b44e7dba52164f52a8a37a" +SRC_URI[sha256sum] = "59c984d174ab484899b9b1d7d4600f5be3152d8bbed2fb8f44cdbf617e510ad6" DEPENDS += " \ kauth-native \ diff --git a/recipes-kde/plasma/untier/plasma-desktop/plasma-desktop.bb b/recipes-kde/plasma/untier/plasma-desktop/plasma-desktop.bb index d4c51749..c55c43d3 100644 --- a/recipes-kde/plasma/untier/plasma-desktop/plasma-desktop.bb +++ b/recipes-kde/plasma/untier/plasma-desktop/plasma-desktop.bb @@ -48,9 +48,9 @@ DEPENDS += " \ fontconfig \ " -PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "b8688f8ec970f21b481d050e3efe58cc" -SRC_URI[sha256sum] = "40576c38428c96903bf085e06729521bcce8ea0e498e40797a900df7aa9cb4ab" +PV = "${PLASMA_FIXUP_VERSION}" +SRC_URI[md5sum] = "0aedba1ccd551bf3137cbadedf140c3c" +SRC_URI[sha256sum] = "21e54d489817751173049122410737db641a8e58955b84264a4ec861e302ff8a" SRC_URI += "file://0001-Ensure-xkb_base-is-not-empty-instead-of-checking-if-.patch" diff --git a/recipes-kde/plasma/untier/plasma-integration/plasma-integration.bb b/recipes-kde/plasma/untier/plasma-integration/plasma-integration.bb index 8ee0b360..779750fc 100644 --- a/recipes-kde/plasma/untier/plasma-integration/plasma-integration.bb +++ b/recipes-kde/plasma/untier/plasma-integration/plasma-integration.bb @@ -26,8 +26,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "28d52a6e18d34e40b77b6619fdf9fd9b" -SRC_URI[sha256sum] = "7d7a38cc0763e5cacd8472dfdd0a801ec876ec7512cbd8d85bdd24a8f433923e" +SRC_URI[md5sum] = "509f18cd766b6a63de42eaf3d8d91946" +SRC_URI[sha256sum] = "659c4a8c5b890cdf41b788e0609f680b00d6f609610d46af8656484057141c23" FILES_${PN} += " \ ${datadir}/kconf_update \ diff --git a/recipes-kde/plasma/untier/plasma-nm/plasma-nm.bb b/recipes-kde/plasma/untier/plasma-nm/plasma-nm.bb index 98f868e5..7ef01cbd 100644 --- a/recipes-kde/plasma/untier/plasma-nm/plasma-nm.bb +++ b/recipes-kde/plasma/untier/plasma-nm/plasma-nm.bb @@ -46,8 +46,8 @@ DEPENDS += " \ # MobileBroadbandProviderInfo PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "320ab9bfb4a8cefd19c87ffe0a0edec2" -SRC_URI[sha256sum] = "5d495058730df7156c8f6df5017d7db5d280d5d6f1df985e596892a2b186ca89" +SRC_URI[md5sum] = "46492d319950a48f3a192f1d883a4020" +SRC_URI[sha256sum] = "7fe3d72bd81f57cf2df0fcb33e957355110efe31f4b1a71a4c0b6ca121813cd1" # do not move so-libs to -dev package FILES_SOLIBSDEV = "" diff --git a/recipes-kde/plasma/untier/plasma-pa/plasma-pa.bb b/recipes-kde/plasma/untier/plasma-pa/plasma-pa.bb index 94e46cb0..c03768e6 100644 --- a/recipes-kde/plasma/untier/plasma-pa/plasma-pa.bb +++ b/recipes-kde/plasma/untier/plasma-pa/plasma-pa.bb @@ -25,8 +25,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "85057f73813298cf56201e979428d6e2" -SRC_URI[sha256sum] = "03871b5e54b18bfc4b2f493da690f8c0c843bb41c95670bf335ed0ab096283b3" +SRC_URI[md5sum] = "97752f6f9a57d39eaa1b68b99f5880af" +SRC_URI[sha256sum] = "450476c3eb8175e339615b93e0cf5cbc1dd7abdbe2b25e87b0b292555a8b70d2" FILES_SOLIBSDEV = "" diff --git a/recipes-kde/plasma/untier/plasma-vault/plasma-vault.bb b/recipes-kde/plasma/untier/plasma-vault/plasma-vault.bb index 13faf536..483f9ebd 100644 --- a/recipes-kde/plasma/untier/plasma-vault/plasma-vault.bb +++ b/recipes-kde/plasma/untier/plasma-vault/plasma-vault.bb @@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = " \ inherit kde-plasma gtk-icon-cache PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "9bda7fe4c2d4cb6c9f8032e665622dad" -SRC_URI[sha256sum] = "97e668c756831e7ce94b625ed054e3cdf40a45eb502f30fbc2e2f89d3480ac3e" +SRC_URI[md5sum] = "f2c1e4e95bf01106c2f9b434366258c3" +SRC_URI[sha256sum] = "5e26547c97cfba5f209df239298869c24d2ba2bb0594e90eb0d985f0b16dc9d7" DEPENDS += " \ kauth-native \ diff --git a/recipes-kde/plasma/untier/plasma-workspace-wallpapers/plasma-workspace-wallpapers.bb b/recipes-kde/plasma/untier/plasma-workspace-wallpapers/plasma-workspace-wallpapers.bb index df18812b..ad6b3b12 100644 --- a/recipes-kde/plasma/untier/plasma-workspace-wallpapers/plasma-workspace-wallpapers.bb +++ b/recipes-kde/plasma/untier/plasma-workspace-wallpapers/plasma-workspace-wallpapers.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \ inherit kde-plasma PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "0aea8f581916dfeff0063f3cf3837a66" -SRC_URI[sha256sum] = "5aefa25cb27d3052b2540aabcb774398fd395b158bc7ead466923dcac64a8101" +SRC_URI[md5sum] = "7006c1d844dd8d23fa6c4e18af645860" +SRC_URI[sha256sum] = "043b459e801d33caad8743f1133eb27edebb42171b08393bda92ea69ccd6fa75" FILES_${PN} += "${datadir}/wallpapers" diff --git a/recipes-kde/plasma/untier/polkit-kde-agent-1/polkit-kde-agent-1.bb b/recipes-kde/plasma/untier/polkit-kde-agent-1/polkit-kde-agent-1.bb index 90902c34..35e011e4 100644 --- a/recipes-kde/plasma/untier/polkit-kde-agent-1/polkit-kde-agent-1.bb +++ b/recipes-kde/plasma/untier/polkit-kde-agent-1/polkit-kde-agent-1.bb @@ -23,8 +23,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "79adfde4782977d8a0e452e81422ed06" -SRC_URI[sha256sum] = "0ac68a30fa4e7939e0743cae125e6485562bc566d2554632c163025dcf7110c4" +SRC_URI[md5sum] = "4b364062f59fb9599ef7c60fbcc1d9e2" +SRC_URI[sha256sum] = "5e7b4db91293b00c0267b73a1d5186cd65bcd8d2d369b10f5f4fd59fe029f41d" SRC_URI += "file://0001-fix-build-for-QT_NO_SESSIONMANAGER.patch" diff --git a/recipes-kde/plasma/untier/powerdevil/powerdevil.bb b/recipes-kde/plasma/untier/powerdevil/powerdevil.bb index b7c2a2ef..d9c18135 100644 --- a/recipes-kde/plasma/untier/powerdevil/powerdevil.bb +++ b/recipes-kde/plasma/untier/powerdevil/powerdevil.bb @@ -29,8 +29,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "32e98536daad097bf832428e1c8b10c5" -SRC_URI[sha256sum] = "a9cd03c3e236d85297cd3437d5ea3d68c70df140f0beb457beb2aea311e4853e" +SRC_URI[md5sum] = "72da38b000b84ebb350b2842c22438bb" +SRC_URI[sha256sum] = "24acaef3e78b8cea665ca12ade119d8e589de74cc5bf0bdcc7398201e998f1b8" FILES_${PN} += " \ ${datadir}/k*5 \ diff --git a/recipes-kde/plasma/untier/sddm-kcm/sddm-kcm.bb b/recipes-kde/plasma/untier/sddm-kcm/sddm-kcm.bb index acef564a..5c734507 100644 --- a/recipes-kde/plasma/untier/sddm-kcm/sddm-kcm.bb +++ b/recipes-kde/plasma/untier/sddm-kcm/sddm-kcm.bb @@ -22,8 +22,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "08a522a71937c71219202a4579bf41db" -SRC_URI[sha256sum] = "3ae1ff30f41a604fb80231da88b008ac8dc10f61a2b6a6c863f0607c275015d1" +SRC_URI[md5sum] = "b2a458ec19d39cdecc969b1e5ad226dd" +SRC_URI[sha256sum] = "026a2ab9746d0705c5069b48d3bc6b641119a44f62fa68a0b155b334c34577d7" RDEPENDS_${PN} = "sddm" diff --git a/recipes-kde/plasma/untier/systemsettings/systemsettings.bb b/recipes-kde/plasma/untier/systemsettings/systemsettings.bb index 8502c110..cc47087e 100644 --- a/recipes-kde/plasma/untier/systemsettings/systemsettings.bb +++ b/recipes-kde/plasma/untier/systemsettings/systemsettings.bb @@ -32,9 +32,9 @@ DEPENDS += " \ plasma-workspace \ " -PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "703c8483054d5fb2d27ff3bde7087efe" -SRC_URI[sha256sum] = "d450b06fc4a75fdba42380cb26719f7def1c2a0dae78847c288500bfc256a367" +PV = "${PLASMA_FIXUP_VERSION}" +SRC_URI[md5sum] = "4f27f409f8660e5656cfae2c7fe2c4a3" +SRC_URI[sha256sum] = "42095b95a7866aa667e30c15a7ebc9b00225fdb4f06668510fdf63a18573102f" FILES_${PN} += " \ ${datadir}/k*5 \ diff --git a/recipes-kde/plasma/untier/user-manager/user-manager.bb b/recipes-kde/plasma/untier/user-manager/user-manager.bb index 649cb786..35bcd8d9 100644 --- a/recipes-kde/plasma/untier/user-manager/user-manager.bb +++ b/recipes-kde/plasma/untier/user-manager/user-manager.bb @@ -16,8 +16,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "9ef8ea06cbffbf911e0b0cc3958b334b" -SRC_URI[sha256sum] = "809a9f6dce41d47884b648d1098df9685f8041a448d71f744997a4a9dbb7b427" +SRC_URI[md5sum] = "c1b015e2c94995c1e336204900d77929" +SRC_URI[sha256sum] = "444b9a69f3347caa81ab1c1baaabb135a9cae783c1e91cc7e40c3626fb784ca1" FILES_${PN} += " \ ${datadir}/kservices5 \