From 8d1391004641a54d5d7ae22dc1a8fc56b1541716 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sat, 26 Mar 2016 22:58:13 +0100 Subject: [PATCH] kde-plasma: update to 5.6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- classes/kde-plasma.bbclass | 2 +- .../plasma/tier1/kdecoration/kdecoration.bb | 4 +- ...1-fix-build-for-QT_NO_SESSIONMANAGER.patch | 64 +++--- ...QGuiApplication-setFallbackSessionMa.patch | 63 ++++++ .../plasma-workspace/plasma-workspace.bb | 5 +- .../plasma/untier/bluedevil/bluedevil.bb | 4 +- .../plasma/untier/breeze-gtk/breeze-gtk.bb | 4 +- recipes-kde/plasma/untier/breeze/breeze.bb | 4 +- .../plasma/untier/discover/discover.bb | 13 +- ...ication-backend-requires-AppstreamQt.patch | 45 +++++ .../untier/kde-cli-tools/kde-cli-tools.bb | 4 +- ...gtk2-only-and-gtk3-only-environments.patch | 12 +- .../untier/kde-gtk-config/kde-gtk-config.bb | 4 +- .../kdeplasma-addons/kdeplasma-addons.bb | 5 +- recipes-kde/plasma/untier/kgamma5/kgamma5.bb | 4 +- .../plasma/untier/khelpcenter/khelpcenter.bb | 4 +- .../plasma/untier/khotkeys/khotkeys.bb | 4 +- .../plasma/untier/kinfocenter/kinfocenter.bb | 4 +- .../plasma/untier/kmenuedit/kmenuedit.bb | 4 +- recipes-kde/plasma/untier/kscreen/kscreen.bb | 4 +- .../untier/kscreenlocker/kscreenlocker.bb | 4 +- .../plasma/untier/ksshaskpass/ksshaskpass.bb | 4 +- .../plasma/untier/ksysguard/ksysguard.bb | 4 +- ...0001-use-pkgconfig-to-find-libgcrypt.patch | 12 +- .../plasma/untier/kwallet-pam/kwallet-pam.bb | 4 +- .../kwayland-integration.bb | 4 +- .../plasma/untier/kwayland/kwayland.bb | 4 +- ...ing-of-QPA-wayland-plugin-an-option.patch} | 0 .../0002-eglonxbackend-add-debug-output.patch | 65 ------- recipes-kde/plasma/untier/kwin/kwin.bb | 7 +- ...or-qtbase-without-session-management.patch | 9 +- ...QGuiApplication-setFallbackSessionMa.patch | 33 ++++ recipes-kde/plasma/untier/kwrited/kwrited.bb | 9 +- .../0001-make-kwayland-support-optional.patch | 48 +++++ ...nfiguration-build-on-x-less-systems.patch} | 82 ++------ .../plasma/untier/libkscreen/libkscreen.bb | 7 +- ...r-Use-std-namespaced-isnan-and-isinf.patch | 182 ------------------ .../untier/libksysguard/libksysguard.bb | 6 +- recipes-kde/plasma/untier/milou/milou.bb | 4 +- recipes-kde/plasma/untier/oxygen/oxygen.bb | 4 +- .../untier/plasma-desktop/plasma-desktop.bb | 4 +- .../plasma-mediacenter/plasma-mediacenter.bb | 4 +- .../plasma/untier/plasma-nm/plasma-nm.bb | 4 +- .../plasma/untier/plasma-pa/plasma-pa.bb | 4 +- .../plasma-workspace-wallpapers.bb | 4 +- .../polkit-kde-agent-1/polkit-kde-agent-1.bb | 4 +- .../plasma/untier/powerdevil/powerdevil.bb | 4 +- .../plasma/untier/sddm-kcm/sddm-kcm.bb | 4 +- .../untier/systemsettings/systemsettings.bb | 4 +- .../untier/user-manager/user-manager.bb | 4 +- 50 files changed, 344 insertions(+), 445 deletions(-) create mode 100644 recipes-kde/plasma/tier3/plasma-workspace/files/0007-remove-usage-of-QGuiApplication-setFallbackSessionMa.patch create mode 100644 recipes-kde/plasma/untier/discover/files/0001-application-backend-requires-AppstreamQt.patch rename recipes-kde/plasma/untier/kwin/files/{0003-Make-building-of-QPA-wayland-plugin-an-option.patch => 0002-Make-building-of-QPA-wayland-plugin-an-option.patch} (100%) delete mode 100644 recipes-kde/plasma/untier/kwin/files/0002-eglonxbackend-add-debug-output.patch create mode 100644 recipes-kde/plasma/untier/kwrited/files/0002-remove-usage-of-QGuiApplication-setFallbackSessionMa.patch create mode 100644 recipes-kde/plasma/untier/libkscreen/files/0001-make-kwayland-support-optional.patch rename recipes-kde/plasma/untier/libkscreen/files/{0001-fix-configuration-build-on-x-less-systems.patch => 0002-fix-configuration-build-on-x-less-systems.patch} (57%) delete mode 100644 recipes-kde/plasma/untier/libksysguard/files/0001-signalplotter-Use-std-namespaced-isnan-and-isinf.patch diff --git a/classes/kde-plasma.bbclass b/classes/kde-plasma.bbclass index 35f8e360..a0688fc1 100644 --- a/classes/kde-plasma.bbclass +++ b/classes/kde-plasma.bbclass @@ -1,5 +1,5 @@ inherit kde-base -PLASMA_VERSION = "5.5.5" +PLASMA_VERSION = "5.6.0" SRC_URI = "${KDE_MIRROR}/stable/plasma/${PV}/${BPN}-${PV}.tar.xz" diff --git a/recipes-kde/plasma/tier1/kdecoration/kdecoration.bb b/recipes-kde/plasma/tier1/kdecoration/kdecoration.bb index 6d9238a0..7a201249 100644 --- a/recipes-kde/plasma/tier1/kdecoration/kdecoration.bb +++ b/recipes-kde/plasma/tier1/kdecoration/kdecoration.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" inherit kde-plasma cmake-lib PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "24a08b87d6fe95b12f1222667191affa" -SRC_URI[sha256sum] = "6c63fd16a4b3c887a0694cc161a2109a45ad780d1265931f6ceeca52b195a447" +SRC_URI[md5sum] = "c21c5d17d3acf80568950daf6bcdd1fe" +SRC_URI[sha256sum] = "36bbe524f5edd3b6c0549fd37b796c37e2a4d7fe7e819a0a40ce663f7e510956" # cross libs / headers CMAKE_ALIGN_SYSROOT[1] = "KDecoration2, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib" diff --git a/recipes-kde/plasma/tier3/plasma-workspace/files/0001-fix-build-for-QT_NO_SESSIONMANAGER.patch b/recipes-kde/plasma/tier3/plasma-workspace/files/0001-fix-build-for-QT_NO_SESSIONMANAGER.patch index 3d942960..eac8c804 100644 --- a/recipes-kde/plasma/tier3/plasma-workspace/files/0001-fix-build-for-QT_NO_SESSIONMANAGER.patch +++ b/recipes-kde/plasma/tier3/plasma-workspace/files/0001-fix-build-for-QT_NO_SESSIONMANAGER.patch @@ -10,19 +10,19 @@ Upstream-Status: pending Signed-off-by: Andreas Müller --- - klipper/klipper.cpp | 2 ++ - klipper/main.cpp | 4 ++++ - krunner/main.cpp | 4 ++++ - shell/main.cpp | 5 ++++- - 5 files changed, 18 insertions(+), 1 deletion(-) + klipper/klipper.cpp | 2 ++ + klipper/main.cpp | 4 ++++ + krunner/main.cpp | 4 ++++ + shell/main.cpp | 5 +++++ + 4 files changed, 15 insertions(+) diff --git a/klipper/klipper.cpp b/klipper/klipper.cpp -index 46321ac..752bd77 100644 +index c80d2c7..89de369 100644 --- a/klipper/klipper.cpp +++ b/klipper/klipper.cpp -@@ -225,10 +225,12 @@ Klipper::Klipper(QObject* parent, const KSharedConfigPtr& config, KlipperMode mo - #endif - m_popup->plugAction( m_quitAction ); +@@ -223,10 +223,12 @@ Klipper::Klipper(QObject* parent, const KSharedConfigPtr& config, KlipperMode mo + m_popup->plugAction( m_quitAction ); + } +#ifndef QT_NO_SESSIONMANAGER // session manager interaction @@ -34,7 +34,7 @@ index 46321ac..752bd77 100644 Klipper::~Klipper() diff --git a/klipper/main.cpp b/klipper/main.cpp -index 50c0f24..a8478ad 100644 +index fe7863f..f63e557 100644 --- a/klipper/main.cpp +++ b/klipper/main.cpp @@ -27,7 +27,9 @@ @@ -47,10 +47,10 @@ index 50c0f24..a8478ad 100644 #include "tray.h" #include "klipper.h" -@@ -70,11 +72,13 @@ extern "C" int Q_DECL_EXPORT kdemain(int argc, char *argv[]) - "mgraesslin@kde.org"); - KAboutData::setApplicationData(aboutData); - +@@ -76,11 +78,13 @@ extern "C" int Q_DECL_EXPORT kdemain(int argc, char *argv[]) + #if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) + QGuiApplication::setFallbackSessionManagementEnabled(false); + #endif +#ifndef QT_NO_SESSIONMANAGER auto disableSessionManagement = [](QSessionManager &sm) { sm.setRestartHint(QSessionManager::RestartNever); @@ -62,7 +62,7 @@ index 50c0f24..a8478ad 100644 QCommandLineParser parser; diff --git a/krunner/main.cpp b/krunner/main.cpp -index fd851c0..90c9233 100644 +index e902583..67226d2 100644 --- a/krunner/main.cpp +++ b/krunner/main.cpp @@ -25,7 +25,9 @@ @@ -74,11 +74,11 @@ index fd851c0..90c9233 100644 +#endif #include - #include -@@ -57,11 +59,13 @@ int main(int argc, char **argv) - parser.addVersionOption(); - parser.process(app); - + #include +@@ -69,11 +71,13 @@ int main(int argc, char **argv) + #if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) + QGuiApplication::setFallbackSessionManagementEnabled(false); + #endif +#ifndef QT_NO_SESSIONMANAGER auto disableSessionManagement = [](QSessionManager &sm) { sm.setRestartHint(QSessionManager::RestartNever); @@ -90,10 +90,10 @@ index fd851c0..90c9233 100644 View view; view.setVisible(false); diff --git a/shell/main.cpp b/shell/main.cpp -index 005f908..6b5e57c 100644 +index 89c8c54..c55c0bf 100644 --- a/shell/main.cpp +++ b/shell/main.cpp -@@ -20,7 +20,9 @@ +@@ -21,7 +21,9 @@ #include #include #include @@ -101,23 +101,23 @@ index 005f908..6b5e57c 100644 #include +#endif #include + #include - #include -@@ -97,12 +99,13 @@ int main(int argc, char *argv[]) - qInstallMsgHandler(noMessageOutput); - } - +@@ -104,11 +106,14 @@ int main(int argc, char *argv[]) + #if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) + QGuiApplication::setFallbackSessionManagementEnabled(false); + #endif +#ifndef QT_NO_SESSIONMANAGER auto disableSessionManagement = [](QSessionManager &sm) { sm.setRestartHint(QSessionManager::RestartNever); }; QObject::connect(&app, &QGuiApplication::commitDataRequest, disableSessionManagement); QObject::connect(&app, &QGuiApplication::saveStateRequest, disableSessionManagement); -- +#endif - ShellManager::s_crashes = cliOptions.value(crashOption).toInt(); - ShellManager::s_forceWindowed = cliOptions.isSet(winOption); - ShellManager::s_noRespawn = cliOptions.isSet(respawnOption); ++ + + ShellManager::s_fixedShell = cliOptions.value(shellPluginOption); + -- -1.8.3.1 +2.5.0 diff --git a/recipes-kde/plasma/tier3/plasma-workspace/files/0007-remove-usage-of-QGuiApplication-setFallbackSessionMa.patch b/recipes-kde/plasma/tier3/plasma-workspace/files/0007-remove-usage-of-QGuiApplication-setFallbackSessionMa.patch new file mode 100644 index 00000000..383b652c --- /dev/null +++ b/recipes-kde/plasma/tier3/plasma-workspace/files/0007-remove-usage-of-QGuiApplication-setFallbackSessionMa.patch @@ -0,0 +1,63 @@ +From 298d648da66d9115d8ff15de165788f5efda1fbf Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Fri, 25 Mar 2016 19:18:48 +0100 +Subject: [PATCH] remove usage of + QGuiApplication::setFallbackSessionManagementEnabled +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +meta-qt5 does not yet have a qtbase supporting this + +Signed-off-by: Andreas Müller +--- + klipper/main.cpp | 3 --- + krunner/main.cpp | 3 --- + shell/main.cpp | 3 --- + 3 files changed, 9 deletions(-) + +diff --git a/klipper/main.cpp b/klipper/main.cpp +index f63e557..598c0a8 100644 +--- a/klipper/main.cpp ++++ b/klipper/main.cpp +@@ -75,9 +75,6 @@ extern "C" int Q_DECL_EXPORT kdemain(int argc, char *argv[]) + + KAboutData::setApplicationData(aboutData); + +-#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) +- QGuiApplication::setFallbackSessionManagementEnabled(false); +-#endif + #ifndef QT_NO_SESSIONMANAGER + auto disableSessionManagement = [](QSessionManager &sm) { + sm.setRestartHint(QSessionManager::RestartNever); +diff --git a/krunner/main.cpp b/krunner/main.cpp +index 67226d2..924a980 100644 +--- a/krunner/main.cpp ++++ b/krunner/main.cpp +@@ -68,9 +68,6 @@ int main(int argc, char **argv) + + KAboutData::setApplicationData(aboutData); + +-#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) +- QGuiApplication::setFallbackSessionManagementEnabled(false); +-#endif + #ifndef QT_NO_SESSIONMANAGER + auto disableSessionManagement = [](QSessionManager &sm) { + sm.setRestartHint(QSessionManager::RestartNever); +diff --git a/shell/main.cpp b/shell/main.cpp +index c55c0bf..24c562a 100644 +--- a/shell/main.cpp ++++ b/shell/main.cpp +@@ -103,9 +103,6 @@ int main(int argc, char *argv[]) + cliOptions.process(app); + aboutData.processCommandLine(&cliOptions); + +-#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) +- QGuiApplication::setFallbackSessionManagementEnabled(false); +-#endif + #ifndef QT_NO_SESSIONMANAGER + auto disableSessionManagement = [](QSessionManager &sm) { + sm.setRestartHint(QSessionManager::RestartNever); +-- +2.5.0 + diff --git a/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb b/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb index e96b8df6..b2147c18 100644 --- a/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb +++ b/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb @@ -41,8 +41,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "545d25677c194f9dec4b17dcab8d48c8" -SRC_URI[sha256sum] = "bed1e65d878b963dbbb85129c206dc70db71461de29c19e95b6053c9c4fe7b26" +SRC_URI[md5sum] = "59a5f026b88158c3a1675fff52846cbf" +SRC_URI[sha256sum] = "3bb49dfb59b48d88097685acf303b0cef1a45ee8bc43d34b6785cc04d7b6529d" SRC_URI += " \ file://0001-fix-build-for-QT_NO_SESSIONMANAGER.patch \ @@ -52,6 +52,7 @@ SRC_URI += " \ file://0004-startkde-create-kde-s-home.patch \ file://0005-startkde-enable-starting-X.patch \ file://0006-startkde-remove-CMAKE_INSTALL_PREFIX-in-XDG_DATA_DIR.patch \ + file://0007-remove-usage-of-QGuiApplication-setFallbackSessionMa.patch \ " # cross libs / headers diff --git a/recipes-kde/plasma/untier/bluedevil/bluedevil.bb b/recipes-kde/plasma/untier/bluedevil/bluedevil.bb index 28f8f87c..9272a24b 100644 --- a/recipes-kde/plasma/untier/bluedevil/bluedevil.bb +++ b/recipes-kde/plasma/untier/bluedevil/bluedevil.bb @@ -22,8 +22,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "37ef3af402c693fd20a4d29b4911aa9f" -SRC_URI[sha256sum] = "34f95e384aff73a8a4284d6de0baf900582305f21c7d248ce7903024dc1bd581" +SRC_URI[md5sum] = "76886f822f4866b5e6cd09ad0b294b5a" +SRC_URI[sha256sum] = "6249326a9e772488fd5c58496375ae1ae7c9fdea82892295e476e2d56a8ef7cc" 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 7e38d48f..c338e08e 100644 --- a/recipes-kde/plasma/untier/breeze-gtk/breeze-gtk.bb +++ b/recipes-kde/plasma/untier/breeze-gtk/breeze-gtk.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = " \ inherit kde-plasma PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "df9e1e3af2e658942ea1209ec1edde6f" -SRC_URI[sha256sum] = "c54879a55194dd9e63a3aa07f8b6fb7282ab8b14fdf6ac430f4dccbb722feb10" +SRC_URI[md5sum] = "e46e9d3b90cf19b20afb4ec6789131e0" +SRC_URI[sha256sum] = "c64ca25c3a06d7f0303b58a3b9482f0af4fa8a98c0682919d57bdb3abe487062" FILES_${PN} += " \ ${datadir}/kconf_update \ diff --git a/recipes-kde/plasma/untier/breeze/breeze.bb b/recipes-kde/plasma/untier/breeze/breeze.bb index f8ea6244..1ab923a4 100644 --- a/recipes-kde/plasma/untier/breeze/breeze.bb +++ b/recipes-kde/plasma/untier/breeze/breeze.bb @@ -23,8 +23,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "6137c089c9b9a840458751777ebbddc3" -SRC_URI[sha256sum] = "b490398e75779ab0261222adbba26b9b85943236735689962c26eb17def4ae77" +SRC_URI[md5sum] = "2617b12844e97ad41d67fa238b725d90" +SRC_URI[sha256sum] = "3e8b6f2366f760224b64078f1dc781a26f3e2dcc753416369eb2e7371b0e828a" FILES_${PN} += " \ ${datadir}/color-schemes \ diff --git a/recipes-kde/plasma/untier/discover/discover.bb b/recipes-kde/plasma/untier/discover/discover.bb index a8e73102..f3cef1c2 100644 --- a/recipes-kde/plasma/untier/discover/discover.bb +++ b/recipes-kde/plasma/untier/discover/discover.bb @@ -21,22 +21,19 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "24d8a45d50c83c6e4367acc6544a427c" -SRC_URI[sha256sum] = "4a088917a6bc64a40204326a8582b43045d811b72b11c1bd04f9293293b14b2b" - -FILES_SOLIBSDEV = "${libdir}/libmuonprivate${SOLIBSDEV}" +SRC_URI[md5sum] = "afad2be536e324dfbea25af96c2fe9b4" +SRC_URI[sha256sum] = "73dbff5178f3157501b698f1f77c57129d81ebac87e86c04b6b50f182ee2c4ba" +SRC_URI += "file://0001-application-backend-requires-AppstreamQt.patch" FILES_${PN} += " \ ${datadir}/dbus-1 \ ${datadir}/icons \ ${datadir}/k*5 \ ${datadir}/libdiscover \ - ${datadir}/muondiscover \ ${datadir}/plasma \ - ${datadir}/polkit-1 \ + ${datadir}/plasmadiscover \ \ - ${libdir}/libDiscoverCommon.so \ - ${libdir}/libDiscoverNotifiers.so \ + ${libdir}/plasma-discover \ ${OE_QMAKE_PATH_PLUGINS} \ ${OE_QMAKE_PATH_QML} \ " diff --git a/recipes-kde/plasma/untier/discover/files/0001-application-backend-requires-AppstreamQt.patch b/recipes-kde/plasma/untier/discover/files/0001-application-backend-requires-AppstreamQt.patch new file mode 100644 index 00000000..509c48d4 --- /dev/null +++ b/recipes-kde/plasma/untier/discover/files/0001-application-backend-requires-AppstreamQt.patch @@ -0,0 +1,45 @@ +From fff2d8abcb807097265e4edc11bd1d1ac45aaabb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sat, 26 Mar 2016 22:37:43 +0100 +Subject: [PATCH] application backend requires AppstreamQt +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller +--- + CMakeLists.txt | 2 +- + libdiscover/backends/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e0fbca9..dec206e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -73,7 +73,7 @@ set_package_properties(AkabeiClient PROPERTIES + set_package_properties(packagekitqt5 PROPERTIES + DESCRIPTION "Library that exposes PackageKit resources" + URL "http://www.packagekit.org" +- PURPOSE "Required to build the PackageKit backend" ++ PURPOSE "Required to build the PackageKit/Application backends" + TYPE OPTIONAL) + set_package_properties(AppstreamQt PROPERTIES + DESCRIPTION "Library that lists Appstream resources" +diff --git a/libdiscover/backends/CMakeLists.txt b/libdiscover/backends/CMakeLists.txt +index 24a85b1..d310f78 100644 +--- a/libdiscover/backends/CMakeLists.txt ++++ b/libdiscover/backends/CMakeLists.txt +@@ -16,7 +16,7 @@ if(KF5Attica_FOUND AND KF5NewStuff_FOUND) + add_subdirectory(KNSBackend) + endif() + +-if(QApt_FOUND) ++if(QApt_FOUND AND AppstreamQt_FOUND) + add_subdirectory(ApplicationBackend) + endif() + +-- +2.5.5 + 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 16c31cd0..453b367b 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 @@ -21,8 +21,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "61eb314a8979d5ad0025fb21eb68412e" -SRC_URI[sha256sum] = "50d7c9e2f8423a0e26844e7a9758f4e190e0383f57d0d4bb90e1776a957d2fa6" +SRC_URI[md5sum] = "9939aaabbe048c82a0d371b93356bb1b" +SRC_URI[sha256sum] = "582594e38874a2daef5e4090df70431863ff13d2ed9c3bccb73cbc99dbe9e39b" # do not move so-libs to -dev package FILES_SOLIBSDEV = "" diff --git a/recipes-kde/plasma/untier/kde-gtk-config/files/0001-fix-for-gtk2-only-and-gtk3-only-environments.patch b/recipes-kde/plasma/untier/kde-gtk-config/files/0001-fix-for-gtk2-only-and-gtk3-only-environments.patch index 65b00709..42bb9117 100644 --- a/recipes-kde/plasma/untier/kde-gtk-config/files/0001-fix-for-gtk2-only-and-gtk3-only-environments.patch +++ b/recipes-kde/plasma/untier/kde-gtk-config/files/0001-fix-for-gtk2-only-and-gtk3-only-environments.patch @@ -20,21 +20,22 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 0da858d..f0bb39a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -23,10 +23,11 @@ include(KDEInstallDirs) - include(KDECMakeSettings) - include(KDECompilerSettings) +@@ -26,11 +26,12 @@ include(KDECompilerSettings NO_POLICY_SCOPE) + # Set KI18n translation domain + add_definitions(-DTRANSLATION_DOMAIN=\"kde-gtk-config\") +find_package(GTK2) +find_package(GTK3) + set(kcm_SRCS src/iconthemesmodel.cpp + src/cursorthemesmodel.cpp - src/appearancegtk3.cpp - src/appearancegtk2.cpp src/appearencegtk.cpp src/abstractappearance.cpp src/thread.cpp -@@ -37,6 +38,16 @@ set(kcm_SRCS +@@ -41,6 +42,16 @@ set(kcm_SRCS src/fontshelpers.cpp ) @@ -51,7 +52,7 @@ index 0da858d..f0bb39a 100644 set(GHNS_FILES cgcicon.knsrc cgctheme.knsrc -@@ -58,7 +69,11 @@ install(TARGETS kcm_kdegtkconfig DESTINATION ${PLUGIN_INSTALL_DIR}) +@@ -62,8 +73,12 @@ install(TARGETS kcm_kdegtkconfig DESTINATION ${PLUGIN_INSTALL_DIR}) install(FILES ${GHNS_FILES} DESTINATION ${CONFIG_INSTALL_DIR}) install(FILES kde-gtk-config.desktop DESTINATION ${SERVICES_INSTALL_DIR}) @@ -63,6 +64,7 @@ index 0da858d..f0bb39a 100644 +endif() add_subdirectory(icons) add_subdirectory(tests) + diff --git a/config-gtk.h.cmake b/config-gtk.h.cmake new file mode 100644 index 0000000..1b2389d 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 fd533702..3a77fb3c 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 @@ -19,8 +19,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "b7b3c88976539b54efe77716c19e118a" -SRC_URI[sha256sum] = "183e4faec4cc175f9fabf7eaa8d3343498079f41e10b645fdc4335e2dd9ddd2c" +SRC_URI[md5sum] = "62537a68d222f2a5a114d0f00b6d9664" +SRC_URI[sha256sum] = "1f86f221bce499a704c2964a5504209aa96e4588efac0d5eb5374c0e7ec9ca63" SRC_URI += "file://0001-fix-for-gtk2-only-and-gtk3-only-environments.patch" diff --git a/recipes-kde/plasma/untier/kdeplasma-addons/kdeplasma-addons.bb b/recipes-kde/plasma/untier/kdeplasma-addons/kdeplasma-addons.bb index 44e54582..6cbc522f 100644 --- a/recipes-kde/plasma/untier/kdeplasma-addons/kdeplasma-addons.bb +++ b/recipes-kde/plasma/untier/kdeplasma-addons/kdeplasma-addons.bb @@ -23,13 +23,14 @@ DEPENDS += " \ kdelibs4support \ kross \ knewstuff \ + plasma-workspace \ \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver qtx11extras", "", d)} \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "61c3cd59e56ae1d4af951d24c36123c1" -SRC_URI[sha256sum] = "5d47e27632c11dd69bbe1b58884d983a77eb7d1e210c77e494748f0ea23b62d0" +SRC_URI[md5sum] = "9e1892505d9277a650f5de2a991dfb10" +SRC_URI[sha256sum] = "e773f541dd1832b33e364fb2371d024887e4dfcc63caa37f67d4281974483587" FILES_${PN} += " \ ${datadir}/kwin \ diff --git a/recipes-kde/plasma/untier/kgamma5/kgamma5.bb b/recipes-kde/plasma/untier/kgamma5/kgamma5.bb index 5360b0ae..d75105e6 100644 --- a/recipes-kde/plasma/untier/kgamma5/kgamma5.bb +++ b/recipes-kde/plasma/untier/kgamma5/kgamma5.bb @@ -15,8 +15,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "8c3b340346ab9bccbf32da6eedf36577" -SRC_URI[sha256sum] = "b2f9e3bb5c224d2fea930d5d58f5cbae0f2919ed451440ea9fb5111e51c22795" +SRC_URI[md5sum] = "8ac30fe02721cc355a696e8966de85d1" +SRC_URI[sha256sum] = "11ad1c7e1875b3350e4a69193ed9b2dd8e974533776a0ad56df61a2e662bb9f7" FILES_${PN} += " \ ${datadir}/kgamma \ diff --git a/recipes-kde/plasma/untier/khelpcenter/khelpcenter.bb b/recipes-kde/plasma/untier/khelpcenter/khelpcenter.bb index ff51c876..31d0532f 100644 --- a/recipes-kde/plasma/untier/khelpcenter/khelpcenter.bb +++ b/recipes-kde/plasma/untier/khelpcenter/khelpcenter.bb @@ -17,8 +17,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "bd27c6c41cfd72b98f24458a46ec6cc5" -SRC_URI[sha256sum] = "9790973be800fd52bf441f747cd7e6f19c8e8c3134f6be7ffb5820f48acc0513" +SRC_URI[md5sum] = "1c37b094bd3273912acebae2f52dcbba" +SRC_URI[sha256sum] = "012f0e79382a19bb37d5b973e6c86c6b5e633a8c08b7961f6801d453fbb70805" SRC_URI += " \ file://0001-fix-build-for-qtbase-without-session-management.patch \ diff --git a/recipes-kde/plasma/untier/khotkeys/khotkeys.bb b/recipes-kde/plasma/untier/khotkeys/khotkeys.bb index b7ce4da4..a7f9fd49 100644 --- a/recipes-kde/plasma/untier/khotkeys/khotkeys.bb +++ b/recipes-kde/plasma/untier/khotkeys/khotkeys.bb @@ -24,8 +24,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "125eba6bf6ce9d518fd31f7c0465a055" -SRC_URI[sha256sum] = "d206ea610da7fcfb06f46151a8581018931aa101368ffd54473a2aaa8f7e398b" +SRC_URI[md5sum] = "129f356ddcfd7a4366006e1f5598eda5" +SRC_URI[sha256sum] = "fd3be89d4fda41359d6bdba607226fb747de7827b0c16ffaeb1cb264a2fbe53a" FILES_${PN} += " \ ${datadir}/kservices5 \ diff --git a/recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb b/recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb index da17f47f..e7a5c9c7 100644 --- a/recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb +++ b/recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb @@ -34,8 +34,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "f263c63f674e16a7f96b00585360478d" -SRC_URI[sha256sum] = "8221b06889bcb1626e86e72a8289e2b42a6d4d7520d140ca495e421aaf63e6c8" +SRC_URI[md5sum] = "a9bc4c9ba6bee7873e8f2a2396fcc5c5" +SRC_URI[sha256sum] = "bea3c089e442bae24e23df1ab78034fa24f2ba60f1fb74c4c211749283efbc4f" 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 37797d38..cc3f7db5 100644 --- a/recipes-kde/plasma/untier/kmenuedit/kmenuedit.bb +++ b/recipes-kde/plasma/untier/kmenuedit/kmenuedit.bb @@ -23,8 +23,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "7541b0e0656d648731efc0ebcf1f80a3" -SRC_URI[sha256sum] = "b255e2c32f3f2eaf5c746cfcfe049bfd10a033c1ff7a73de869cab79ae6b0e04" +SRC_URI[md5sum] = "c5a37c45b9a2cd39b287e333910b170d" +SRC_URI[sha256sum] = "40231134a271fa3deb3185e4e3b1586b8a0eed45fa1df318354d9c5371bea2ba" # 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 262f08aa..e39fc966 100644 --- a/recipes-kde/plasma/untier/kscreen/kscreen.bb +++ b/recipes-kde/plasma/untier/kscreen/kscreen.bb @@ -21,8 +21,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "04ce77d6a498dea5fa74d9fcf029c16d" -SRC_URI[sha256sum] = "9f61e87f9128481aaa4718d900ffaab2ad15e377f5514db2c0d95a30bac00ea8" +SRC_URI[md5sum] = "5a43b4ca376cf5321294ae6a02e84416" +SRC_URI[sha256sum] = "39c1aa6b2c6951233e8e57f119e3b55f2b0c91f53e91c7a1ab4bfb1142196945" FILES_${PN} += " \ ${datadir}/kcm_kscreen \ diff --git a/recipes-kde/plasma/untier/kscreenlocker/kscreenlocker.bb b/recipes-kde/plasma/untier/kscreenlocker/kscreenlocker.bb index dc3ab8ed..c4c31e27 100644 --- a/recipes-kde/plasma/untier/kscreenlocker/kscreenlocker.bb +++ b/recipes-kde/plasma/untier/kscreenlocker/kscreenlocker.bb @@ -23,8 +23,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "32ab1df0b8799e11be4df158fdef7162" -SRC_URI[sha256sum] = "7cad8630831094dc1cde7d828df750191eb032c908a6bccc6d5d83b15a235803" +SRC_URI[md5sum] = "958fa3cb8fa156c40bc20cb46767a5fa" +SRC_URI[sha256sum] = "714a3c4692899a1a22d503c1fd136b2489f165221a8a1bf3ea3046722764e7fb" FILES_${PN} += " \ ${datadir}/dbus-1 \ diff --git a/recipes-kde/plasma/untier/ksshaskpass/ksshaskpass.bb b/recipes-kde/plasma/untier/ksshaskpass/ksshaskpass.bb index 2cb0e57c..16191137 100644 --- a/recipes-kde/plasma/untier/ksshaskpass/ksshaskpass.bb +++ b/recipes-kde/plasma/untier/ksshaskpass/ksshaskpass.bb @@ -19,5 +19,5 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "d89eca6bc0ba79f3d17e3e7134e7d111" -SRC_URI[sha256sum] = "8a5c48f50c4449e39dc312ca5d3dc8cec466d2fc6ad4602adf0d41ee3828fc6b" +SRC_URI[md5sum] = "df606fc93c1fa06407d15230dacc67e7" +SRC_URI[sha256sum] = "0cc46e29255c9faf5fede9733fd060ed8ec97c0a1a0e983f182909cff86221bd" diff --git a/recipes-kde/plasma/untier/ksysguard/ksysguard.bb b/recipes-kde/plasma/untier/ksysguard/ksysguard.bb index db36f7fc..d2f7a62d 100644 --- a/recipes-kde/plasma/untier/ksysguard/ksysguard.bb +++ b/recipes-kde/plasma/untier/ksysguard/ksysguard.bb @@ -24,8 +24,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "dfcacb15d7a354d1685db95e9e13feed" -SRC_URI[sha256sum] = "b5747ca71a6a91ae5358e540ffdb03b4978ba1bc7b42cacec36a0d39a72b0b08" +SRC_URI[md5sum] = "690d154abd0458120511e92b1f602bcb" +SRC_URI[sha256sum] = "8a3b14bdcac08b46b2466ef738b7ee8b8752bae57c5346781d9412f0fbc16ea6" # do not move so-libs to -dev package FILES_SOLIBSDEV = "" diff --git a/recipes-kde/plasma/untier/kwallet-pam/files/0001-use-pkgconfig-to-find-libgcrypt.patch b/recipes-kde/plasma/untier/kwallet-pam/files/0001-use-pkgconfig-to-find-libgcrypt.patch index 4d711540..12d7f2f4 100644 --- a/recipes-kde/plasma/untier/kwallet-pam/files/0001-use-pkgconfig-to-find-libgcrypt.patch +++ b/recipes-kde/plasma/untier/kwallet-pam/files/0001-use-pkgconfig-to-find-libgcrypt.patch @@ -14,19 +14,19 @@ Signed-off-by: Andreas Müller 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index f60ac41..e04d6af 100644 +index 15977ae..9f8f072 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -7,7 +7,8 @@ set(PROJECT_VERSION_MAJOR 5) - set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ) +@@ -10,7 +10,8 @@ set (CMAKE_MODULE_PATH ${ECM_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/mod + include(KDEInstallDirs) find_package(PAM REQUIRED) -find_package(LibGcrypt 1.5.0 REQUIRED) +find_package(PkgConfig REQUIRED) +pkg_search_module(LIBGCRYPT REQUIRED libgcrypt) - include(GNUInstallDirs) - include_directories ( + find_program(SOCAT_EXECUTABLE socat) + -- -2.1.0 +2.5.0 diff --git a/recipes-kde/plasma/untier/kwallet-pam/kwallet-pam.bb b/recipes-kde/plasma/untier/kwallet-pam/kwallet-pam.bb index 0dd65f16..23b32627 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] = "4f909539a8e3e3a4bd62deda18fa3d32" -SRC_URI[sha256sum] = "19c153a0593232767b370a1310f16d13673caba13842571bb7cb01535ba89336" +SRC_URI[md5sum] = "4fd13634ba67aca79839cb1940302613" +SRC_URI[sha256sum] = "aa3a0242876ac54c42a06bdb0ec6f11efd66c8298a797f6aba75952c3530ebfd" 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 2937042a..22b5c3c5 100644 --- a/recipes-kde/plasma/untier/kwayland-integration/kwayland-integration.bb +++ b/recipes-kde/plasma/untier/kwayland-integration/kwayland-integration.bb @@ -14,8 +14,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "2a2b4ede7e3e00942d78311af62ebf8f" -SRC_URI[sha256sum] = "482ee3482eca54714327a72e35deab59df15c388cef5b5cc9f4c15df9da554c6" +SRC_URI[md5sum] = "d0a617777fc8793e685e0ea1cba5eda9" +SRC_URI[sha256sum] = "868c5660741fecb54bdab0ea936097c25c1b303f06cf1e7be9b80b0288db0dfb" FILES_${PN} += " \ ${OE_QMAKE_PATH_PLUGINS} \ diff --git a/recipes-kde/plasma/untier/kwayland/kwayland.bb b/recipes-kde/plasma/untier/kwayland/kwayland.bb index 42ec1eeb..436e0223 100644 --- a/recipes-kde/plasma/untier/kwayland/kwayland.bb +++ b/recipes-kde/plasma/untier/kwayland/kwayland.bb @@ -9,8 +9,8 @@ inherit kde-plasma cmake-lib DEPENDS += "wayland wayland-native" PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "74914469e90c2c1439d5caf3a5f246f6" -SRC_URI[sha256sum] = "10c354db34da839bc6696029cfa5c3cb0852ac94362642e8815951fa5caae612" +SRC_URI[md5sum] = "464f49413bc8e0e61eeaad6520c39473" +SRC_URI[sha256sum] = "943c8ffab30790ffcd22c5d86ff8890263b11447505104a8ab9135d68014d570" SRC_URI += "file://0001-do-not-perform-runtime-tests.patch" CMAKE_ALIGN_SYSROOT[1] = "KF5Wayland, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib" diff --git a/recipes-kde/plasma/untier/kwin/files/0003-Make-building-of-QPA-wayland-plugin-an-option.patch b/recipes-kde/plasma/untier/kwin/files/0002-Make-building-of-QPA-wayland-plugin-an-option.patch similarity index 100% rename from recipes-kde/plasma/untier/kwin/files/0003-Make-building-of-QPA-wayland-plugin-an-option.patch rename to recipes-kde/plasma/untier/kwin/files/0002-Make-building-of-QPA-wayland-plugin-an-option.patch diff --git a/recipes-kde/plasma/untier/kwin/files/0002-eglonxbackend-add-debug-output.patch b/recipes-kde/plasma/untier/kwin/files/0002-eglonxbackend-add-debug-output.patch deleted file mode 100644 index ed1d2847..00000000 --- a/recipes-kde/plasma/untier/kwin/files/0002-eglonxbackend-add-debug-output.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 2583a42b1c289bc117779bb4037ed5c90773cbf7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Mon, 1 Jun 2015 13:59:38 +0200 -Subject: [PATCH] eglonxbackend: add debug output -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 ---- - eglonxbackend.cpp | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/eglonxbackend.cpp b/eglonxbackend.cpp -index 1e78f46..c844515 100644 ---- a/eglonxbackend.cpp -+++ b/eglonxbackend.cpp -@@ -175,10 +175,13 @@ bool EglOnXBackend::initRenderingContext() - // Use eglGetPlatformDisplayEXT() to get the display pointer - // if the implementation supports it. - const bool havePlatformBase = hasClientExtension(QByteArrayLiteral("EGL_EXT_platform_base")); -+ qCDebug(KWIN_CORE) << "initRenderingContext: havePlatformBase = " << havePlatformBase; - if (havePlatformBase) { - // Make sure that the X11 platform is supported -- if (!hasClientExtension(QByteArrayLiteral("EGL_EXT_platform_x11"))) -+ if (!hasClientExtension(QByteArrayLiteral("EGL_EXT_platform_x11"))) { -+ qCCritical(KWIN_CORE) << "initRenderingContext: EGL_EXT_platform_x11 not supported"; - return false; -+ } - - const int attribs[] = { - EGL_PLATFORM_X11_SCREEN_EXT, m_x11ScreenNumber, -@@ -190,8 +193,10 @@ bool EglOnXBackend::initRenderingContext() - dpy = eglGetDisplay(m_x11Display); - } - -- if (dpy == EGL_NO_DISPLAY) -+ if (dpy == EGL_NO_DISPLAY) { -+ qCCritical(KWIN_CORE) << "initRenderingContext: no display found"; - return false; -+ } - setEglDisplay(dpy); - initEglAPI(); - -@@ -216,6 +221,7 @@ bool EglOnXBackend::initRenderingContext() - } - #endif - if (window == XCB_WINDOW_NONE) { -+ qCCritical(KWIN_CORE) << "initRenderingContext: no window"; - return false; - } - -@@ -231,6 +237,7 @@ bool EglOnXBackend::initRenderingContext() - } - - if (surface == EGL_NO_SURFACE) { -+ qCCritical(KWIN_CORE) << "initRenderingContext: no surface"; - return false; - } - setSurface(surface); --- -1.9.3 - diff --git a/recipes-kde/plasma/untier/kwin/kwin.bb b/recipes-kde/plasma/untier/kwin/kwin.bb index 0df971cf..3f38ce8d 100644 --- a/recipes-kde/plasma/untier/kwin/kwin.bb +++ b/recipes-kde/plasma/untier/kwin/kwin.bb @@ -50,13 +50,12 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "c753e4cb07fd551f0d7edeb9e69da701" -SRC_URI[sha256sum] = "759772e263c14e853803e2beb9ef9c02da3cb59ca1a62ee533df657013c6e9c4" +SRC_URI[md5sum] = "1add44b5f04bf60eb98dd7432bd45a56" +SRC_URI[sha256sum] = "d0224ad1f567caed19f644558b721bcc3cd995e0be9b6d3a00f6568941cde644" SRC_URI += " \ file://0001-fix-build-for-qtbase-without-session-management.patch \ - file://0002-eglonxbackend-add-debug-output.patch \ - file://0003-Make-building-of-QPA-wayland-plugin-an-option.patch \ + file://0002-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/files/0001-fix-build-for-qtbase-without-session-management.patch b/recipes-kde/plasma/untier/kwrited/files/0001-fix-build-for-qtbase-without-session-management.patch index 83124fd3..04dd0bd5 100644 --- a/recipes-kde/plasma/untier/kwrited/files/0001-fix-build-for-qtbase-without-session-management.patch +++ b/recipes-kde/plasma/untier/kwrited/files/0001-fix-build-for-qtbase-without-session-management.patch @@ -15,11 +15,10 @@ diff --git a/kwrited.cpp b/kwrited.cpp index 2b73e36..de0a49a 100644 --- a/kwrited.cpp +++ b/kwrited.cpp -@@ -73,11 +73,14 @@ int main(int argc, char **argv) - KAboutData::setApplicationData(aboutData()); - QApplication::setDesktopSettingsAware(false); - QApplication a(argc, argv); -+ +@@ -76,11 +76,13 @@ int main(int argc, char **argv) + #if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) + QGuiApplication::setFallbackSessionManagementEnabled(false); + #endif +#ifndef QT_NO_SESSIONMANAGER auto disableSessionManagement = [](QSessionManager &sm) { sm.setRestartHint(QSessionManager::RestartNever); diff --git a/recipes-kde/plasma/untier/kwrited/files/0002-remove-usage-of-QGuiApplication-setFallbackSessionMa.patch b/recipes-kde/plasma/untier/kwrited/files/0002-remove-usage-of-QGuiApplication-setFallbackSessionMa.patch new file mode 100644 index 00000000..2e8ba2cf --- /dev/null +++ b/recipes-kde/plasma/untier/kwrited/files/0002-remove-usage-of-QGuiApplication-setFallbackSessionMa.patch @@ -0,0 +1,33 @@ +From f3f6e591734312578470f9026c31042b97bed3b8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Fri, 25 Mar 2016 23:09:52 +0100 +Subject: [PATCH] remove usage of + QGuiApplication::setFallbackSessionManagementEnabled +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +meta-qt5 does not yet have a qtbase supporting this + +Signed-off-by: Andreas Müller +--- + kwrited.cpp | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/kwrited.cpp b/kwrited.cpp +index 77f7264..6785bc4 100644 +--- a/kwrited.cpp ++++ b/kwrited.cpp +@@ -73,9 +73,6 @@ int main(int argc, char **argv) + KAboutData::setApplicationData(aboutData()); + QApplication::setDesktopSettingsAware(false); + QApplication a(argc, argv); +-#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) +- QGuiApplication::setFallbackSessionManagementEnabled(false); +-#endif + #ifndef QT_NO_SESSIONMANAGER + auto disableSessionManagement = [](QSessionManager &sm) { + sm.setRestartHint(QSessionManager::RestartNever); +-- +2.5.0 + diff --git a/recipes-kde/plasma/untier/kwrited/kwrited.bb b/recipes-kde/plasma/untier/kwrited/kwrited.bb index 86d7445c..ac027ea0 100644 --- a/recipes-kde/plasma/untier/kwrited/kwrited.bb +++ b/recipes-kde/plasma/untier/kwrited/kwrited.bb @@ -15,10 +15,13 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "453e68203c502e0d4708333ffa974282" -SRC_URI[sha256sum] = "236a0979813fad0c57a1afcb217bcdf06ede866b508d1a4e710d2b6ca72c189e" +SRC_URI[md5sum] = "cb7831be19e51c6d4ec2f62024726998" +SRC_URI[sha256sum] = "41bcde691465598fe817aab1306c4761a928c70d8d6092909a50ade961bb754b" -SRC_URI += "file://0001-fix-build-for-qtbase-without-session-management.patch" +SRC_URI += " \ + file://0001-fix-build-for-qtbase-without-session-management.patch \ + file://0002-remove-usage-of-QGuiApplication-setFallbackSessionMa.patch \ +" FILES_${PN} += " \ ${datadir}/knotifications5 \ diff --git a/recipes-kde/plasma/untier/libkscreen/files/0001-make-kwayland-support-optional.patch b/recipes-kde/plasma/untier/libkscreen/files/0001-make-kwayland-support-optional.patch new file mode 100644 index 00000000..eb375c6f --- /dev/null +++ b/recipes-kde/plasma/untier/libkscreen/files/0001-make-kwayland-support-optional.patch @@ -0,0 +1,48 @@ +From c8f9d29e0f63e2973ee1ad2c4b0696e0a2d13882 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Fri, 25 Mar 2016 15:44:08 +0100 +Subject: [PATCH] make kwayland support optional +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 +--- + CMakeLists.txt | 2 +- + backends/CMakeLists.txt | 5 +++++ + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 711f9da..891a4b8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -20,7 +20,7 @@ set(REQUIRED_QT_VERSION 5.2.0) + find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core DBus Gui Test X11Extras) + + # Wayland backend +-find_package(KF5Wayland CONFIG REQUIRED) ++find_package(KF5Wayland CONFIG QUIET) + add_feature_info("KF5Wayland" KF5Wayland_FOUND "Required for building libkscreen's KWayland backend") + + # xrandr backend +diff --git a/backends/CMakeLists.txt b/backends/CMakeLists.txt +index 3563e13..195aaa9 100644 +--- a/backends/CMakeLists.txt ++++ b/backends/CMakeLists.txt +@@ -1,6 +1,11 @@ + add_subdirectory(fake) + add_subdirectory(qscreen) ++ ++if(${KF5Wayland_FOUND}) + add_subdirectory(kwayland) ++else() ++ message(STATUS "Not building kwayland backend, no KF5Wayland_FOUND set.") ++endif() + + if(${XCB_RANDR_FOUND}) + message(STATUS "Will build xrandr backend.") +-- +2.5.0 + diff --git a/recipes-kde/plasma/untier/libkscreen/files/0001-fix-configuration-build-on-x-less-systems.patch b/recipes-kde/plasma/untier/libkscreen/files/0002-fix-configuration-build-on-x-less-systems.patch similarity index 57% rename from recipes-kde/plasma/untier/libkscreen/files/0001-fix-configuration-build-on-x-less-systems.patch rename to recipes-kde/plasma/untier/libkscreen/files/0002-fix-configuration-build-on-x-less-systems.patch index 71e38ad7..dc551898 100644 --- a/recipes-kde/plasma/untier/libkscreen/files/0001-fix-configuration-build-on-x-less-systems.patch +++ b/recipes-kde/plasma/untier/libkscreen/files/0002-fix-configuration-build-on-x-less-systems.patch @@ -1,6 +1,6 @@ -From e25d8d40b9189c0400db694b18d104909ef78fe3 Mon Sep 17 00:00:00 2001 +From eaa5ced7a2a2b67160c2408d9a5f90086779b0dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Fri, 11 Dec 2015 22:03:01 +0100 +Date: Fri, 25 Mar 2016 16:14:43 +0100 Subject: [PATCH] fix configuration/build on x-less systems MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -10,29 +10,28 @@ Upstream-Status: Inappropriate [configuration] Signed-off-by: Andreas Müller --- - CMakeLists.txt | 12 ++++++++---- - backends/CMakeLists.txt | 6 ++++-- - backends/qscreen/CMakeLists.txt | 5 ++++- - src/CMakeLists.txt | 5 ++++- - src/backendlauncher/CMakeLists.txt | 7 +++++-- - src/backendlauncher/backendloader.cpp | 11 +++++++++-- - 6 files changed, 34 insertions(+), 12 deletions(-) + CMakeLists.txt | 9 ++++++--- + backends/qscreen/CMakeLists.txt | 5 ++++- + src/CMakeLists.txt | 5 ++++- + src/backendlauncher/CMakeLists.txt | 7 +++++-- + src/backendlauncher/backendloader.cpp | 1 - + 5 files changed, 19 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5b6a404..c25cdae 100644 +index 891a4b8..8592aa9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -16,15 +16,19 @@ include(ECMQtDeclareLoggingCategory) +@@ -16,9 +16,6 @@ include(ECMQtDeclareLoggingCategory) include(FeatureSummary) include(CheckCXXCompilerFlag) -set(REQUIRED_QT_VERSION 5.2.0) -find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core DBus Gui Test X11Extras) - - find_package(XCB COMPONENTS XCB RANDR) - set_package_properties(XCB PROPERTIES -- TYPE REQUIRED -+ TYPE OPTIONAL + # Wayland backend + find_package(KF5Wayland CONFIG QUIET) + add_feature_info("KF5Wayland" KF5Wayland_FOUND "Required for building libkscreen's KWayland backend") +@@ -31,6 +28,12 @@ set_package_properties(XCB PROPERTIES PURPOSE "Required for building XRandR backends" ) @@ -40,25 +39,11 @@ index 5b6a404..c25cdae 100644 +find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core DBus Gui Test) +if (XCB_FOUND) + find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras) -+ add_definitions(-DHAVE_XCB) +endif() + + # library setup + set(KF5_VERSION ${PROJECT_VERSION}) #When we are happy with the api, we can sync with frameworks - ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KSCREEN - VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kscreen_version.h" -diff --git a/backends/CMakeLists.txt b/backends/CMakeLists.txt -index ff5d751..5140984 100644 ---- a/backends/CMakeLists.txt -+++ b/backends/CMakeLists.txt -@@ -1,4 +1,6 @@ - add_subdirectory(fake) - add_subdirectory(qscreen) --add_subdirectory(xrandr) --add_subdirectory(xrandr1.1) -+if (XCB_FOUND) -+ add_subdirectory(xrandr) -+ add_subdirectory(xrandr1.1) -+endif() diff --git a/backends/qscreen/CMakeLists.txt b/backends/qscreen/CMakeLists.txt index 1342d4f..1a07544 100644 --- a/backends/qscreen/CMakeLists.txt @@ -121,46 +106,17 @@ index f26ad0e..c933f10 100644 \ No newline at end of file +) diff --git a/src/backendlauncher/backendloader.cpp b/src/backendlauncher/backendloader.cpp -index 52051df..a8e53fc 100644 +index 853f3d7..aed6246 100644 --- a/src/backendlauncher/backendloader.cpp +++ b/src/backendlauncher/backendloader.cpp -@@ -27,7 +27,9 @@ +@@ -28,7 +28,6 @@ #include #include #include -+#ifdef HAVE_XCB - #include -+#endif +-#include #include -@@ -130,6 +132,7 @@ KScreen::AbstractBackend *BackendLoader::loadBackend(const QString &name, - continue; - } - -+#ifdef HAVE_XCB - // When on X11, skip the QScreen backend, instead use the XRandR backend, - // if not specified in KSCREEN_BACKEND - if (name.isEmpty() && -@@ -137,12 +140,16 @@ KScreen::AbstractBackend *BackendLoader::loadBackend(const QString &name, - QX11Info::isPlatformX11()) { - continue; - } -+#endif - - // When not on X11, skip the XRandR backend, and fall back to QSCreen - // if not specified in KSCREEN_BACKEND - if (name.isEmpty() && -- finfo.fileName().contains(QLatin1String("KSC_XRandR")) && -- !QX11Info::isPlatformX11()) { -+ finfo.fileName().contains(QLatin1String("KSC_XRandR")) -+#ifdef HAVE_XCB -+ && !QX11Info::isPlatformX11() -+#endif -+ ) { - continue; - } - -- 2.5.0 diff --git a/recipes-kde/plasma/untier/libkscreen/libkscreen.bb b/recipes-kde/plasma/untier/libkscreen/libkscreen.bb index 6367bdd5..78fb873b 100644 --- a/recipes-kde/plasma/untier/libkscreen/libkscreen.bb +++ b/recipes-kde/plasma/untier/libkscreen/libkscreen.bb @@ -13,11 +13,12 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "981b99beb45af1a11a3d13d0e100bc3a" -SRC_URI[sha256sum] = "1b2f7c3e5c6f5807b1a917ea79de929988d8fdc8fd06249a763212be0d045bb6" +SRC_URI[md5sum] = "78424f1562b2aea71ec5b384ef01c3ae" +SRC_URI[sha256sum] = "e9231a4748c32410623e0192ccceafe2caf4924e779fa2a415e7668cf6b6cee4" SRC_URI += " \ - file://0001-fix-configuration-build-on-x-less-systems.patch \ + file://0001-make-kwayland-support-optional.patch \ + file://0002-fix-configuration-build-on-x-less-systems.patch \ " diff --git a/recipes-kde/plasma/untier/libksysguard/files/0001-signalplotter-Use-std-namespaced-isnan-and-isinf.patch b/recipes-kde/plasma/untier/libksysguard/files/0001-signalplotter-Use-std-namespaced-isnan-and-isinf.patch deleted file mode 100644 index 89c3a3d3..00000000 --- a/recipes-kde/plasma/untier/libksysguard/files/0001-signalplotter-Use-std-namespaced-isnan-and-isinf.patch +++ /dev/null @@ -1,182 +0,0 @@ -From b0578798eb3f5bdad0a25ea9b4a52c53ebcfc020 Mon Sep 17 00:00:00 2001 -From: David Rosca -Date: Tue, 23 Feb 2016 17:32:35 +0100 -Subject: [PATCH] signalplotter: Use std namespaced isnan and isinf - -Test Plan: Fixes build for me. - -Reviewers: #plasma, ivan - -Reviewed By: ivan - -Subscribers: ivan, plasma-devel - -Projects: #plasma - -Upstream-Status: Backport - -Differential Revision: https://phabricator.kde.org/D1010 ---- - signalplotter/ksignalplotter.cpp | 34 ++++++++++++++++------------------ - tests/signalplottertest.cpp | 14 +++++++------- - 2 files changed, 23 insertions(+), 25 deletions(-) - -diff --git a/signalplotter/ksignalplotter.cpp b/signalplotter/ksignalplotter.cpp -index 6847f16..3737227 100644 ---- a/signalplotter/ksignalplotter.cpp -+++ b/signalplotter/ksignalplotter.cpp -@@ -32,8 +32,6 @@ - #include "ksignalplotter_p.h" - #include "processcore/processcore_debug.h" - --#include //For floor, ceil, log10 etc for calculating ranges -- - #include - #include - #include -@@ -49,7 +47,7 @@ - - #include - #include --#include -+#include - #include - - #ifdef SVG_SUPPORT -@@ -485,20 +483,20 @@ void KSignalPlotterPrivate::recalculateMaxMinValueForSample(const QList&s - qreal value=0; - for(int i = sampleBuf.count()-1; i>= 0; i--) { - qreal newValue = sampleBuf[i]; -- if( !isinf(newValue) && !isnan(newValue) ) -+ if( !std::isinf(newValue) && !std::isnan(newValue) ) - value += newValue; - } -- if(isnan(mMinValue) || mMinValue > value) mMinValue = value; -- if(isnan(mMaxValue) || mMaxValue < value) mMaxValue = value; -+ if(std::isnan(mMinValue) || mMinValue > value) mMinValue = value; -+ if(std::isnan(mMaxValue) || mMaxValue < value) mMaxValue = value; - if(value > 0.7*mMaxValue) - mRescaleTime = time; - } else { - qreal value; - for(int i = sampleBuf.count()-1; i>= 0; i--) { - value = sampleBuf[i]; -- if( !isinf(value) && !isnan(value) ) { -- if(isnan(mMinValue) || mMinValue > value) mMinValue = value; -- if(isnan(mMaxValue) || mMaxValue < value) mMaxValue = value; -+ if( !std::isinf(value) && !std::isnan(value) ) { -+ if(std::isnan(mMinValue) || mMinValue > value) mMinValue = value; -+ if(std::isnan(mMaxValue) || mMaxValue < value) mMaxValue = value; - if(value > 0.7*mMaxValue) - mRescaleTime = time; - } -@@ -789,9 +787,9 @@ void KSignalPlotterPrivate::calculateNiceRange() - qreal max = mUserMaxValue; - qreal min = mUserMinValue; - if( mUseAutoRange ) { -- if(!isnan(mMaxValue) && mMaxValue * 0.99 > max) //Allow max value to go very slightly over the given max, for rounding reasons -+ if(!std::isnan(mMaxValue) && mMaxValue * 0.99 > max) //Allow max value to go very slightly over the given max, for rounding reasons - max = mMaxValue; -- if(!isnan(mMinValue) && mMinValue * 0.99 < min) { -+ if(!std::isnan(mMinValue) && mMinValue * 0.99 < min) { - min = mMinValue; - } - } -@@ -920,23 +918,23 @@ void KSignalPlotterPrivate::drawBeam(QPainter *p, const QRect &boundingBox, int - bool firstLine = true; - for (int j = 0; j < count; ++j) { - qreal point0 = datapoints[j]; -- if( isnan(point0) ) -+ if( std::isnan(point0) ) - continue; //Just do not draw points with nans. skip them - - qreal point1 = prev_datapoints[j]; - qreal point2 = prev_prev_datapoints[j]; - -- if(isnan(point1)) -+ if(std::isnan(point1)) - point1 = point0; -- else if(mSmoothGraph && !isinf(point1)) { -+ else if(mSmoothGraph && !std::isinf(point1)) { - // Apply a weighted average just to smooth the graph out a bit - // Do not try to smooth infinities or nans - point0 = (2*point0 + point1)/3; -- if(!isnan(point2) && !isinf(point2)) -+ if(!std::isnan(point2) && !std::isinf(point2)) - point1 = (2*point1 + point2)/3; - // We don't bother to average out y2. This will introduce slight inaccuracies in the gradients, but they aren't really noticeable. - } -- if(isnan(point2)) -+ if(std::isnan(point2)) - point2 = point1; - - if (mStackBeams) { -@@ -1046,12 +1044,12 @@ qreal KSignalPlotter::lastValue( int i) const - } - QString KSignalPlotter::lastValueAsString( int i, int precision) const - { -- if(d->mBeamData.isEmpty() || d->mBeamData.first().size() <= i || isnan(d->mBeamData.first().at(i))) return QString(); -+ if(d->mBeamData.isEmpty() || d->mBeamData.first().size() <= i || std::isnan(d->mBeamData.first().at(i))) return QString(); - return valueAsString(d->mBeamData.first().at(i), precision); //retrieve the newest value for this beam - } - QString KSignalPlotter::valueAsString( qreal value, int precision) const - { -- if(isnan(value)) -+ if(std::isnan(value)) - return QString(); - value = value / d->mScaleDownBy; // scale the value. E.g. from Bytes to KiB - return d->scaledValueAsString(value, precision); -diff --git a/tests/signalplottertest.cpp b/tests/signalplottertest.cpp -index fa058d5..8b3b394 100644 ---- a/tests/signalplottertest.cpp -+++ b/tests/signalplottertest.cpp -@@ -56,8 +56,8 @@ void TestSignalPlotter::testAddRemoveBeamsWithData() - s->addBeam(Qt::blue); - s->addBeam(Qt::red); - -- QVERIFY( isnan(s->lastValue(0)) ); //unset, so should default to NaN -- QVERIFY( isnan(s->lastValue(1)) ); //unset, so should default to NaN -+ QVERIFY( std::isnan(s->lastValue(0)) ); //unset, so should default to NaN -+ QVERIFY( std::isnan(s->lastValue(1)) ); //unset, so should default to NaN - QCOMPARE(s->numBeams(), 2); - QVERIFY(s->beamColor(0) == Qt::blue); - QVERIFY(s->beamColor(1) == Qt::red); -@@ -92,7 +92,7 @@ void TestSignalPlotter::testAddRemoveBeamsWithData() - QVERIFY(s->beamColor(0) == Qt::blue); - QVERIFY(s->beamColor(1) == Qt::red); - QCOMPARE(s->lastValue(0), 1.0); -- QVERIFY( isnan(s->lastValue(1)) ); //unset, so should default to NaN -+ QVERIFY( std::isnan(s->lastValue(1)) ); //unset, so should default to NaN - } - - void TestSignalPlotter::testReorderBeams() -@@ -153,8 +153,8 @@ void TestSignalPlotter::testReorderBeamsWithData() - s->addBeam(Qt::blue); - s->addBeam(Qt::red); - QCOMPARE(s->numBeams(), 2); -- QVERIFY(isnan(s->lastValue(0))); //unset, so should default to NaN -- QVERIFY(isnan(s->lastValue(1))); //unset, so should default to NaN -+ QVERIFY(std::isnan(s->lastValue(0))); //unset, so should default to NaN -+ QVERIFY(std::isnan(s->lastValue(1))); //unset, so should default to NaN - //Add some data - QList data; - data << 1.0 << 2.0; -@@ -189,13 +189,13 @@ void TestSignalPlotter::testReorderBeamsWithData() - QCOMPARE(s->numBeams(), 3); - QCOMPARE(s->lastValue(0), 2.0); - QCOMPARE(s->lastValue(1), 1.0); -- QVERIFY(isnan(s->lastValue(2))); //unset, so should default to NaN -+ QVERIFY(std::isnan(s->lastValue(2))); //unset, so should default to NaN - - newOrder.clear(); - newOrder << 2 << 0 << 1; - s->reorderBeams(newOrder); - QCOMPARE(s->numBeams(), 3); -- QVERIFY(isnan(s->lastValue(0))); //unset, so should default to NaN -+ QVERIFY(std::isnan(s->lastValue(0))); //unset, so should default to NaN - QCOMPARE(s->lastValue(1), 2.0); - QCOMPARE(s->lastValue(2), 1.0); - } --- -2.5.0 - diff --git a/recipes-kde/plasma/untier/libksysguard/libksysguard.bb b/recipes-kde/plasma/untier/libksysguard/libksysguard.bb index 0b083025..cba4b383 100644 --- a/recipes-kde/plasma/untier/libksysguard/libksysguard.bb +++ b/recipes-kde/plasma/untier/libksysguard/libksysguard.bb @@ -25,10 +25,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI += "file://0001-signalplotter-Use-std-namespaced-isnan-and-isinf.patch" -SRC_URI[md5sum] = "ff6c11140a83928c7b240ced2f06b3e8" -SRC_URI[sha256sum] = "4286691ad71f104b54ab5d9cdd8cb8c153984308a4bd998012ea01d36a377e9a" - +SRC_URI[md5sum] = "d2297d1a4996d5ac855a5d98cf1d9581" +SRC_URI[sha256sum] = "b64ffae6d127b640627868c47de256d159a2be87a8239116d29a0c60cbce8585" # cross libs / headers CMAKE_ALIGN_SYSROOT[1] = "KF5SysGuard, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib" diff --git a/recipes-kde/plasma/untier/milou/milou.bb b/recipes-kde/plasma/untier/milou/milou.bb index 94514547..d45421de 100644 --- a/recipes-kde/plasma/untier/milou/milou.bb +++ b/recipes-kde/plasma/untier/milou/milou.bb @@ -19,8 +19,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "6ff8c92c7ef9de1a5491241b5a913365" -SRC_URI[sha256sum] = "851a71166c1faa010536c515d5ab92be5e827a3123acd12e2aa8674f51b4ebbb" +SRC_URI[md5sum] = "fba2776f99c139bb64c731f092687b72" +SRC_URI[sha256sum] = "e517d26e6df7abd05edfeb6f42dd507f02da25c5d4018473f5084c50b81a0477" FILES_${PN} += " \ ${datadir}/k*5 \ diff --git a/recipes-kde/plasma/untier/oxygen/oxygen.bb b/recipes-kde/plasma/untier/oxygen/oxygen.bb index 71a10412..5c8cf05b 100644 --- a/recipes-kde/plasma/untier/oxygen/oxygen.bb +++ b/recipes-kde/plasma/untier/oxygen/oxygen.bb @@ -22,8 +22,8 @@ DEPENDS += " \ PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "1a4199609f385de4a3f1e4054719953e" -SRC_URI[sha256sum] = "2244d3c5015f5c7d52bff5e0e58a1fca35ec084f9a9da3af12f76600f5ddbfc2" +SRC_URI[md5sum] = "3e2cf4a6b4ff58769249525686ecb990" +SRC_URI[sha256sum] = "458eeb0614f075f029ffedb08d71950c5258ad4f6daea0c8cbad89e8a6b27954" SRC_URI += "file://0001-kstyle-add-an-option-BUILD_OXYGEN_SETTINGS-disabled-.patch" PACKAGECONFIG ??= "" diff --git a/recipes-kde/plasma/untier/plasma-desktop/plasma-desktop.bb b/recipes-kde/plasma/untier/plasma-desktop/plasma-desktop.bb index ec19326b..a53035d4 100644 --- a/recipes-kde/plasma/untier/plasma-desktop/plasma-desktop.bb +++ b/recipes-kde/plasma/untier/plasma-desktop/plasma-desktop.bb @@ -42,8 +42,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "24dc314c2d6a8044d37f95bbb6faa7ba" -SRC_URI[sha256sum] = "6649da817141096a6393648c834638ea0a09c1e799b1b300672c22c10c3bea8b" +SRC_URI[md5sum] = "459a7ee12a9e404164d5843b4c22500a" +SRC_URI[sha256sum] = "184a6d4406ce5bbb98e52660be75cf22459ec832cbed2cc49cd363e5da5af160" SRC_URI += "file://0001-Ensure-xkb_base-is-not-empty-instead-of-checking-if-.patch" diff --git a/recipes-kde/plasma/untier/plasma-mediacenter/plasma-mediacenter.bb b/recipes-kde/plasma/untier/plasma-mediacenter/plasma-mediacenter.bb index 42a06dd6..03eb0e52 100644 --- a/recipes-kde/plasma/untier/plasma-mediacenter/plasma-mediacenter.bb +++ b/recipes-kde/plasma/untier/plasma-mediacenter/plasma-mediacenter.bb @@ -26,8 +26,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "c92d176eab31b853e1f7d09163f60bc8" -SRC_URI[sha256sum] = "1231f770032a445b3285765112024bb75e1f47791f58136cb932b92e95c63dfa" +SRC_URI[md5sum] = "351aba4bf5d8932232d04dfaf5165f3e" +SRC_URI[sha256sum] = "9bdd0f724f5decf5c5e0c54c00c73e029307782ade030b51f6ddc9849ace6a1a" SRC_URI += "file://0001-use-pkgconfig-to-find-taglib.patch" FILES_${PN} += " \ diff --git a/recipes-kde/plasma/untier/plasma-nm/plasma-nm.bb b/recipes-kde/plasma/untier/plasma-nm/plasma-nm.bb index 5a015d01..dba46b9b 100644 --- a/recipes-kde/plasma/untier/plasma-nm/plasma-nm.bb +++ b/recipes-kde/plasma/untier/plasma-nm/plasma-nm.bb @@ -41,8 +41,8 @@ DEPENDS += " \ # MobileBroadbandProviderInfo PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "aca9ce83f32cef45ee48b7bad3bcdfa5" -SRC_URI[sha256sum] = "84a7c845eb5f5043a48189c4ffb0ace30a5766da81396a9081a3ac1bb8f3ce75" +SRC_URI[md5sum] = "ec0df73abdcb30aa13737af704130ca1" +SRC_URI[sha256sum] = "85092b306ff8b5cbefbc1dea3550136b7afcfdea14e0fb3c7746b37cb09ba777" # 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 f3f61d84..1b677698 100644 --- a/recipes-kde/plasma/untier/plasma-pa/plasma-pa.bb +++ b/recipes-kde/plasma/untier/plasma-pa/plasma-pa.bb @@ -20,8 +20,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "cf8cbdff95f5ea4be11f2d65855bc1dc" -SRC_URI[sha256sum] = "501b9f8b603f8a14e46103799f6f16ae55fd47ff118f4282ec58b44822b355d7" +SRC_URI[md5sum] = "f9beabe2a235c1c59e6d44c2f09c0bd1" +SRC_URI[sha256sum] = "8fa6da533b94c66b83ae97623ccafb5804989eeb343d8b0666aedd016017aa03" FILES_SOLIBSDEV = "" 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 6676ed34..f61c41cd 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] = "0655781d43086838d5578fd2c349b13b" -SRC_URI[sha256sum] = "975179e092db38dc5d7aaedc982b566e044969f8ec363a46d3d707e4cdcfb906" +SRC_URI[md5sum] = "751c26021ad463215d1e57cbf8f976f5" +SRC_URI[sha256sum] = "e4ceca3d6b3a76d8ed03065eb393aeabaa94d4dd6f575a304c59b38302c19dd6" 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 0332e9d4..f04b330c 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 @@ -20,8 +20,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "88b37d72bd047e8d2bf9ea43e2e752c6" -SRC_URI[sha256sum] = "494e1c1b99faf820c3065dc3e0e68b833a2670d9578d888c1657be43cefa9c5d" +SRC_URI[md5sum] = "b62322564a3c70330021c9b1bedf93af" +SRC_URI[sha256sum] = "b5acbbb5bad853023bf7bf18e3caaa56a731170dc97159b436d5556705362a6f" 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 422c3cd7..3181c78a 100644 --- a/recipes-kde/plasma/untier/powerdevil/powerdevil.bb +++ b/recipes-kde/plasma/untier/powerdevil/powerdevil.bb @@ -23,8 +23,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "10d2d9bc7bd079c6e211f4e22cd9bb1a" -SRC_URI[sha256sum] = "73bfbf63317448a3ab92e5250a016bf7c5628ec10cdf277239dde4e8af2160e9" +SRC_URI[md5sum] = "f3dfc7affd4492731cab7d0ce293dd5b" +SRC_URI[sha256sum] = "eb8a772098f3f629d1612479888cb547dacc8f24a1e48fbbb6d0702c728c57cc" 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 658d2132..ddde0183 100644 --- a/recipes-kde/plasma/untier/sddm-kcm/sddm-kcm.bb +++ b/recipes-kde/plasma/untier/sddm-kcm/sddm-kcm.bb @@ -19,8 +19,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "a6d855596fd28919ca80b4e551b37c6d" -SRC_URI[sha256sum] = "cfd430f886be9f82b8653debf37d402acc9bb9218b58ac0072b3ee771d37f47e" +SRC_URI[md5sum] = "810f4e9ac4d0b6b6cbd3bfa315742b35" +SRC_URI[sha256sum] = "d058614ad0a759855af4a202c567e424b7bea48581736782c8db44aae783836e" FILES_${PN} += " \ ${datadir}/kservices5 \ diff --git a/recipes-kde/plasma/untier/systemsettings/systemsettings.bb b/recipes-kde/plasma/untier/systemsettings/systemsettings.bb index 33a87c6e..13151459 100644 --- a/recipes-kde/plasma/untier/systemsettings/systemsettings.bb +++ b/recipes-kde/plasma/untier/systemsettings/systemsettings.bb @@ -23,8 +23,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "b4a8062f2a0481e93d2b66626a0616b7" -SRC_URI[sha256sum] = "20d9b7c1d789efe7e4f3994a16eda3ff35e231373384d92415850487125a7aa0" +SRC_URI[md5sum] = "34deac7edd5abdafaf37279501a27ae8" +SRC_URI[sha256sum] = "6f4e55138deb108cf7fe3ea2afb549ab8943b4386c51e16198559ab11a95658a" 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 b2f41e3b..eb406a52 100644 --- a/recipes-kde/plasma/untier/user-manager/user-manager.bb +++ b/recipes-kde/plasma/untier/user-manager/user-manager.bb @@ -12,8 +12,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "1a416af5fabf6e7a4063bda48c0d7cef" -SRC_URI[sha256sum] = "9e90fc0c2affa4d1eee2aabc03e146a259e46e214fbbc28696f5d70262a82ebd" +SRC_URI[md5sum] = "6df0619e5446a52111709181878b3717" +SRC_URI[sha256sum] = "1d339ceaaa2dbaae4c333042622a1e2e2affb727312f1c303946f0d6782e4853" FILES_${PN} += " \ ${datadir}/kservices5 \