zepto-forks/meta-qt5-extra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kde-plasma: upgrade 5.21.5 -> 5.22.0

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2021-06-12 02:32:57 +02:00
parent 2299492014
commit 135d141a2c
47 changed files with 285 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
classes/kde-plasma.bbclass
View File

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

3
recipes-kde/packagegroups/plasma-world.bb
View File

@@ -36,11 +36,11 @@ UNTIER = " \
kscreen \
${@bb.utils.contains("DISTRO_FEATURES", "x11", "kscreenlocker", "",d)} \
ksshaskpass \
ksysguard \
kwallet-pam \
kwayland-integration \
${@bb.utils.contains("DISTRO_FEATURES", "x11", "kwin", "",d)} \
kwrited \
layer-shell-qt \
libkscreen \
libksysguard \
milou \
@@ -52,6 +52,7 @@ UNTIER = " \
plasma-nm \
plasma-pa \
plasma-phone-components \
plasma-systemmonitor \
plasma-vault \
plasma-workspace-wallpapers \
${@bb.utils.contains("DISTRO_FEATURES", "polkit", "polkit-kde-agent-1", "",d)} \

2
recipes-kde/plasma/tier1/kdecoration/kdecoration.bb
View File

@@ -12,4 +12,4 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "bc550b7bfde5b5762e76b33ac53f8268b6178ae389c953d729b864b22787d54c"
SRC_URI[sha256sum] = "5e27326b22d899e742606f7bd3493651dc51cd92b5616e30cd4dab3e5356d5b4"

3
recipes-kde/plasma/tier3/kactivitymanagerd/kactivitymanagerd.bb
View File

@@ -27,12 +27,13 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "77b5394cae27d68c55eaa02e7b9be524b6d8fee9a088e505830347b8289ef0c8"
SRC_URI[sha256sum] = "b8882b792086e94b7e1a1130417bdf4c0e08a7af84119812997318c62dfc2950"
FILES_SOLIBSDEV = ""
FILES_${PN} += " \
${datadir}/k*5 \
${datadir}/krunner \
${datadir}/dbus-1 \
${libdir}/libkactivitymanagerd_plugin.so \
${OE_QMAKE_PATH_PLUGINS} \

4
recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb
View File

@@ -50,7 +50,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "9cb16ef4bca9ade0ca82d0cc539533ba9f9be47811ae13d154effc085618e90a"
SRC_URI += "file://0001-Fix-typo.patch"
SRC_URI[sha256sum] = "1ed41a30208d87f7586734fa0ee84eb308f5da57ea614ef537171eac8bbbb77c"
# REVISIT
FILES_${PN} += " \
@@ -80,6 +81,7 @@ FILES_SOLIBSDEV = " \
${libdir}/libtaskmanager${SOLIBSDEV} \
${libdir}/libweather_ion${SOLIBSDEV} \
${libdir}/libkfontinst*${SOLIBSDEV} \
${libdir}/libkrdb${SOLIBSDEV} \
"

31
recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace/0001-Fix-typo.patch Normal file
View File

@@ -0,0 +1,31 @@
From fb8ad2be861b49ce6c0f22c94617877253899522 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sat, 12 Jun 2021 01:40:11 +0200
Subject: [PATCH] Fix typo?
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Statue: Pending
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
kcms/lookandfeel/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kcms/lookandfeel/CMakeLists.txt b/kcms/lookandfeel/CMakeLists.txt
index c13747a..9fa9a61 100644
--- a/kcms/lookandfeel/CMakeLists.txt
+++ b/kcms/lookandfeel/CMakeLists.txt
@@ -5,7 +5,7 @@ if(X11_Xcursor_FOUND)
set(HAVE_XCURSOR TRUE)
endif()
-if(${Breeze_FOUND} AND ${BREEZE_WITH_KDECORATION})
+if(${breeze_FOUND} AND ${BREEZE_WITH_KDECORATION})
set(HAVE_BREEZE_DECO TRUE)
endif()
--
2.31.1

2
recipes-kde/plasma/untier/bluedevil/bluedevil.bb
View File

@@ -31,7 +31,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "26b03747e997fc2e7d734ea583a2a81174f0d982a965e0254c8ba690721f6289"
SRC_URI[sha256sum] = "cc775a3cb3c292966eeaa4b2ad936e74e1ba25867599e88e271952cdf450df3a"
FILES_${PN} += " \
${datadir}/bluedevilwizard \

2
recipes-kde/plasma/untier/breeze-gtk/breeze-gtk.bb
View File

@@ -10,7 +10,7 @@ inherit kde-plasma python3native
DEPENDS += "sassc-native cairo breeze python3-pycairo-native"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "0fab052f237447df0de55701ab8fb2edce968c865fbba2f2c934d9dc53f0c719"
SRC_URI[sha256sum] = "2ce1f92d7cb3846f4b9ad6eb34fc1f7412f1b0e7cb75de38abed7c7e6a2a610f"
FILES_${PN} += " \
${datadir}/kconf_update \

2
recipes-kde/plasma/untier/breeze/breeze.bb
View File

@@ -31,7 +31,7 @@ DEPENDS += "\
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "9774c695da7d51c45116f85358e002663a1ccc5681b04c9afc7a57e8b075980c"
SRC_URI[sha256sum] = "1b3d2d00bfbafe7cfb6f540809cd89447a52e00c6c435bb671c944af0f2f96ef"
FILES_${PN} += " \
${datadir}/color-schemes \

2
recipes-kde/plasma/untier/discover/discover.bb
View File

@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \
inherit kde-plasma gtk-icon-cache mime-xdg
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "29b8d510a25d997b133aa4d5d3ed0e8f101c61436d5f540b9c5f5df7622f4f84"
SRC_URI[sha256sum] = "a605d3f9d2f35c604da9a36654bf7c8828312c00b3610a25969101f27186a812"
DEPENDS += " \
qtdeclarative \

2
recipes-kde/plasma/untier/kde-cli-tools/kde-cli-tools.bb
View File

@@ -27,7 +27,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "369fe177a33fcd45ab4d81b5b535e4f321c00d2e9c7d1f4b2bd42f4c02da1e49"
SRC_URI[sha256sum] = "28becb598d8aa180c045b7299fd5a0454df1ab355ff570e2584e2faa17ba47e4"
# do not move so-libs to -dev package
FILES_SOLIBSDEV = ""

2
recipes-kde/plasma/untier/kde-gtk-config/kde-gtk-config.bb
View File

@@ -29,7 +29,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "f39178aa9cbfdcd9e6c1663058f3ff74d658e87b29f9b765f67a5bdc7c46ec1d"
SRC_URI[sha256sum] = "1f50babdd3425fc0a2a241fc0af15cf72cc441c2decc5dfb0544e92c247fb17e"
CFLAGS += "-isystem ${STAGING_INCDIR}/harfbuzz"
CXXFLAGS += "-isystem ${STAGING_INCDIR}/harfbuzz"

2
recipes-kde/plasma/untier/kdeplasma-addons/kdeplasma-addons.bb
View File

@@ -41,7 +41,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "3c6dd7266c9bb2b89b7ec6831936afb12e32cb00eca19baaa0706cf251617d7d"
SRC_URI[sha256sum] = "42e399342b4f979ef1aa2e20542ce8308a49369b922aef8cc70b1667733583ec"
FILES_${PN} += " \
${datadir}/icons \

2
recipes-kde/plasma/untier/kgamma5/kgamma5.bb
View File

@@ -19,7 +19,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "e64b41468ee5ac77b2b26b009a2e491c79ca6b7b031e2bafe19dda4eb46558e1"
SRC_URI[sha256sum] = "396e7650914b7473fb453d5e8808b6cd4de697d027aade01d2ec2ee5c814932c"
FILES_${PN} += " \
${datadir}/kgamma \

2
recipes-kde/plasma/untier/khotkeys/khotkeys.bb
View File

@@ -33,7 +33,7 @@ DEPENDS += "\
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "2d58299f705f928f877718c1766a6dce201d728a24e88b9a24ca5e12a5f99c13"
SRC_URI[sha256sum] = "689a9a605df33c595bf650bbaca9277c25b3defe6b5077cfe45280e931dd3699"
FILES_${PN} += " \
${datadir}/kservices5 \

2
recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb
View File

@@ -39,7 +39,7 @@ DEPENDS += " \
DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11", "", d)}"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "715a871f6d761515d804049672d58f78cfc04fd8c5db645c489a940979a6f49c"
SRC_URI[sha256sum] = "1f853c864adab4b4e961d09f2321a861c830322c9f5425d80b8d1453f4559a22"
SRC_URI += "file://0001-fix-build-in-x11-less-environments.patch"
FILES_${PN} += " \

2
recipes-kde/plasma/untier/kmenuedit/kmenuedit.bb
View File

@@ -30,7 +30,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "e044970df84b889e51465270ee7108f898774309f52434ede12aca2701eaed7b"
SRC_URI[sha256sum] = "810efc35661b45c61f521fc878251ccc5b290bed1109451a50c58a89c72d9f3f"
# do not move so-libs to -dev package
FILES_SOLIBSDEV = ""

2
recipes-kde/plasma/untier/kscreen/kscreen.bb
View File

@@ -29,7 +29,7 @@ DEPENDS += "\
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "46698bd55ad08e0b833767f2c679832a276826abc37fd9c037614589101a84da"
SRC_URI[sha256sum] = "5f805e8d3b269fc1f7a9d2f582e49c9b173bd3eb0fd7393ff3b4d7980335519f"
FILES_${PN} += " \
${datadir}/k*_kscreen \

3
recipes-kde/plasma/untier/kscreenlocker/kscreenlocker.bb
View File

@@ -20,6 +20,7 @@ DEPENDS += " \
kdelibs4support \
kcrash \
kglobalaccel \
layer-shell-qt \
libxcb \
systemd \
qtx11extras \
@@ -29,7 +30,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "1dad76b7c791e1077777bc9e1b309a6778c4e2124a1211105f2ca9dffa903637"
SRC_URI[sha256sum] = "9feacfa447b64bd039e6bb0e339d723927754f2c53161bfd915fe5b1b30fdc75"
SRC_URI += "file://kde.pam"
do_install_append() {

2
recipes-kde/plasma/untier/ksshaskpass/ksshaskpass.bb
View File

@@ -21,4 +21,4 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "a2f963a9991cbe639a63664a820b4c55c1bd75be6a209a8b439911ec4911f119"
SRC_URI[sha256sum] = "61f856613833df7fb3285fb19e5db6ce6f832392369394058fcc6337db6bf497"

47
recipes-kde/plasma/untier/ksysguard/ksysguard.bb
View File

@@ -1,47 +0,0 @@
SUMMARY = "KSYSGUARD"
LICENSE = "GPL-2.0 & GFDL-1.2"
LIC_FILES_CHKSUM = " \
file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
"
inherit kde-plasma gettext mime-xdg
DEPENDS += " \
kauth-native \
kconfig-native \
kcoreaddons \
kcoreaddons-native \
kdoctools-native \
ki18n \
kitemviews \
knewstuff \
kconfig \
kiconthemes \
kdelibs4support \
libksysguard \
libnl \
"
# REVISIT optionals
# TODO libcap
DEPENDS += " \
lmsensors \
networkmanager-qt \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "103b34b83fd2ea1af1cb01b67de70be2ad5362e22270d23cd437ac210bca1bb0"
# do not move so-libs to -dev package
FILES_SOLIBSDEV = ""
FILES_${PN} += " \
${datadir}/dbus-1 \
${datadir}/icons \
${datadir}/k*5 \
${datadir}/knsrcfiles \
${libdir}/libkdeinit5_ksysguard.so \
${libdir}/libksgrdbackend.so \
${OE_QMAKE_PATH_PLUGINS}/ksysguard \
"

2
recipes-kde/plasma/untier/kwallet-pam/kwallet-pam.bb
View File

@@ -15,7 +15,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "bf3f30e990bf5c79b0fd2e24d82d01f99c226c5f2c64f57ed4a0bab754046e6b"
SRC_URI[sha256sum] = "461c01bb2f1d534222839698e9b677a288c8deea00514f9d3a0df43d5614d655"
SRC_URI += "file://0001-use-pkgconfig-to-find-libgcrypt.patch"
EXTRA_OECMAKE += "-DCMAKE_INSTALL_LIBDIR=${base_libdir}"

2
recipes-kde/plasma/untier/kwayland-integration/kwayland-integration.bb
View File

@@ -16,7 +16,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "bd1c713ea584c56f1d3551b08f7d5cd9fd9f66dff85e89de2436d71a3c2404f2"
SRC_URI[sha256sum] = "2348533e520ab38e094d71ed07f35f33339af996a97088a2b8d3fb64ad516949"
FILES_${PN} += " \
${OE_QMAKE_PATH_PLUGINS} \

21
recipes-kde/plasma/untier/kwayland-server/kwayland-server.bb
View File

@@ -11,13 +11,23 @@ LIC_FILES_CHKSUM = " \
inherit kde-plasma
DEPENDS += " \
DEPENDS_remove_class-native = " kwayland-native"
DEPENDS_append_class-native = " \
qtwayland-native \
"
DEPENDS_append_class-target = " \
${BPN}-native \
qtwayland-native \
plasma-wayland-protocols \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "2fcfc16e8bda1f85db8148715ec08a1b36a0738c3796cf886faadc983f8e21c9"
SRC_URI_append_class-native = " \
file://0001-Build-qtwaylandscanner_kde-only-for-native-build.patch \
file://0002-Avoid-traces-to-sysroot-to-avoid-false-fails-by-cmak.patch \
"
SRC_URI[sha256sum] = "84617871c47f7e5060462728a82bfcdad14fd0bb2f1f8252bee077e28deb1694"
do_configure_append() {
# adjust path to protocol sources in sysroot
@@ -26,3 +36,10 @@ do_configure_append() {
sed -i 's: ${datadir}/plasma-wayland-protocols: ${STAGING_DATADIR}/plasma-wayland-protocols:g' ${B}/build.ninja
sed -i 's: ${datadir}/wayland/wayland.xml: ${STAGING_DATADIR}/wayland/wayland.xml:g' ${B}/build.ninja
}
do_install_class-native() {
install -d ${D}${bindir}
install -m0755 ${B}/bin/* ${D}${bindir}/
}
BBCLASSEXTEND = "native"

70
recipes-kde/plasma/untier/kwayland-server/kwayland-server/0001-Build-qtwaylandscanner_kde-only-for-native-build.patch Normal file
View File

@@ -0,0 +1,70 @@
From c5f3a664e22b1cb5941ea2704e0e740fbddee647 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Fri, 11 Jun 2021 22:56:19 +0200
Subject: [PATCH] Build qtwaylandscanner_kde only for native build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate[oe-specific]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
CMakeLists.txt | 6 +++++-
src/CMakeLists.txt | 4 +++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 47ecfd4..7690823 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,7 +39,8 @@ ecm_setup_version(PROJECT VARIABLE_PREFIX KWAYLANDSERVER
SOVERSION 5)
# Dependencies
-find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Concurrent Gui WaylandClient)
+find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core)
+if(FALSE)
find_package(KF5Wayland ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(PlasmaWaylandProtocols CONFIG REQUIRED)
@@ -71,9 +72,11 @@ add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00)
if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
ecm_install_po_files_as_qm(po)
endif()
+endif()
add_subdirectory(src)
+if(FALSE)
if (BUILD_TESTING)
add_subdirectory(autotests)
add_subdirectory(tests)
@@ -107,5 +110,6 @@ install(EXPORT KWaylandServerTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FI
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kwaylandserver_version.h
DESTINATION ${KDE_INSTALL_INCLUDEDIR} COMPONENT Devel )
+endif()
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 93c174e..8d75147 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,6 @@
add_subdirectory(tools)
-add_subdirectory(server)
+if(FALSE)
ecm_qt_install_logging_categories(
EXPORT KWAYLANDSERVER
FILE kwaylandserver.categories
@@ -46,3 +46,5 @@ if(BUILD_QCH)
COMPONENT Devel
)
endif()
+endif()
+
--
2.31.1

34
recipes-kde/plasma/untier/kwayland-server/kwayland-server/0002-Avoid-traces-to-sysroot-to-avoid-false-fails-by-cmak.patch Normal file
View File

@@ -0,0 +1,34 @@
From b10ed15c363f7753cd18ecf1fd921e6a549e4992 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Fri, 11 Jun 2021 23:58:51 +0200
Subject: [PATCH] Avoid traces to sysroot - to avoid false fails by
cmake_extra_sanity.bbclass
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Similar as we have done for qtwayland but here we can patch.
Upstream-Status: Inappropriate[oe-specific]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
src/tools/qtwaylandscanner.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/tools/qtwaylandscanner.cpp b/src/tools/qtwaylandscanner.cpp
index 165c250..63aa4c1 100644
--- a/src/tools/qtwaylandscanner.cpp
+++ b/src/tools/qtwaylandscanner.cpp
@@ -468,7 +468,7 @@ bool Scanner::process()
return false;
printf("// This file was generated by qtwaylandscanner\n");
- printf("// source file is %s\n\n", qPrintable(m_protocolFilePath));
+ //printf("// source file is %s\n\n", qPrintable(m_protocolFilePath));
for (auto b : qAsConst(m_includes))
printf("#include %s\n", b.constData());
--
2.31.1

32
recipes-kde/plasma/untier/kwin/files/0001-Make-building-of-QPA-wayland-plugin-an-option.patch
View File

@@ -1,32 +0,0 @@
From 61fe7ff07fe38dccc16d6bfc67c62432c62293e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Mon, 14 Dec 2015 23:39:16 +0100
Subject: [PATCH] Make building of QPA wayland plugin an option
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Pure X11 accelerator blob environments fail building for wayland
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
plugins/CMakeLists.txt | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index bf59cac..6026948 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -1,3 +1,7 @@
+option(KWIN_BUILD_QPA "Enable building of KWin wayland plugin." ON)
+
add_subdirectory(kglobalaccel)
+if( KWIN_BUILD_QPA )
add_subdirectory(qpa)
+endif()
add_subdirectory(idletime)
--
2.5.0

6
recipes-kde/plasma/untier/kwin/kwin.bb
View File

@@ -61,11 +61,7 @@ DEPENDS += " \
DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 qtx11extras libepoxy xcb-util-cursor", "",d)}"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "a286edfaa13bf73565514ee3edb092cfbccac2307c48058a7302a4676c808331"
SRC_URI += "file://0001-Make-building-of-QPA-wayland-plugin-an-option.patch"
# pure X11 environments fail to build wayland plugin
EXTRA_OECMAKE += "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '-DKWIN_BUILD_QPA=ON', '-DKWIN_BUILD_QPA=OFF', d)}"
SRC_URI[sha256sum] = "56e6cfe23d445b1ee0650c5ac484e8cc63ba39e2f2d77a0d32c4c23905cc0e01"
# kwin check libepoxy only -> egl pkgconfig is skipped
CXXFLAGS_append_mx6 += " -DLINUX=1"

2
recipes-kde/plasma/untier/kwrited/kwrited.bb
View File

@@ -16,7 +16,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "e1e79046b9657defa5074e46f7bcb09e9000f6e4bc3504eda9363fc60891294e"
SRC_URI[sha256sum] = "069eeb75d8c8a23f4b8524f94d980129099a8fb076c3f09c086fca6046980319"
FILES_${PN} += " \
${datadir}/knotifications5 \

21
recipes-kde/plasma/untier/layer-shell-qt/layer-shell-qt.bb Normal file
View File

@@ -0,0 +1,21 @@
SUMMARY = "Allow applications to make use of the Wayland wl-layer-shell protocol"
LICENSE = "BSD-3-Clause & CC0-1.0 & LGPL-3.0-or-later & MIT"
LIC_FILES_CHKSUM = " \
file://LICENSES/BSD-3-Clause.txt;md5=f225922a2c12dfa5218fb70c49db3ea6 \
file://LICENSES/CC0-1.0.txt;md5=65d3616852dbf7b1a6d4b53b00626032 \
file://LICENSES/LGPL-3.0-or-later.txt;md5=3000208d539ec061b899bce1d9ce9404 \
file://LICENSES/MIT.txt;md5=7dda4e90ded66ab88b86f76169f28663 \
"
inherit kde-plasma
DEPENDS += " \
qtwayland-native \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "7e08f39716885aa43a3f2f1bfb29441ef9ee4b07b2928a9680ae8e4c28adcaf7"
FILES_${PN} += " \
${OE_QMAKE_PATH_PLUGINS} \
"

144
recipes-kde/plasma/untier/libkscreen/files/0001-fix-configuration-build-on-x-less-systems.patch
View File

@@ -1,144 +0,0 @@
From f7d25d036e02d9db3806818bf358c59ab4efdf38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Thu, 1 Nov 2018 23:56:48 +0100
Subject: [PATCH] fix configuration/build on x-less systems
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
CMakeLists.txt | 7 ++++++-
backends/qscreen/CMakeLists.txt | 5 ++++-
src/CMakeLists.txt | 5 ++++-
src/backendlauncher/CMakeLists.txt | 5 ++++-
src/backendlauncher/backendloader.cpp | 2 ++
src/backendmanager.cpp | 7 ++++++-
6 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 601d34a..1320625 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,7 +22,7 @@ include(CMakePackageConfigHelpers)
include(GenerateExportHeader)
include(KDEClangFormat)
-find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Gui Test X11Extras)
+find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Gui Test)
# Wayland backend
find_package(KF5Wayland ${KF5_MIN_VERSION} CONFIG REQUIRED)
@@ -36,6 +36,11 @@ set_package_properties(XCB PROPERTIES
PURPOSE "Required for building XRandR backends"
)
+if (XCB_RANDR_FOUND)
+ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras)
+ add_definitions(-DWITH_XCB_RANDR=1)
+endif()
+
option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF)
add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)")
diff --git a/backends/qscreen/CMakeLists.txt b/backends/qscreen/CMakeLists.txt
index acd52f4..a4cf0a2 100644
--- a/backends/qscreen/CMakeLists.txt
+++ b/backends/qscreen/CMakeLists.txt
@@ -15,8 +15,11 @@ set_target_properties(KSC_QScreen PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_B
set_target_properties(KSC_QScreen PROPERTIES PREFIX "")
target_link_libraries(KSC_QScreen Qt5::Core
Qt5::Gui
- Qt5::X11Extras
KF5::Screen
)
+if (XCB_RANDR_FOUND)
+ target_link_libraries(KSC_QScreen Qt5::X11Extras)
+endif()
+
install(TARGETS KSC_QScreen DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/kscreen/)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5718cf1..3094814 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -30,9 +30,12 @@ target_link_libraries(KF5Screen
Qt5::Gui
PRIVATE
Qt5::DBus
- Qt5::X11Extras
)
+if (XCB_FOUND)
+ target_link_libraries(KF5Screen PRIVATE Qt5::X11Extras)
+endif()
+
set_target_properties(KF5Screen PROPERTIES
VERSION "${KSCREEN_VERSION_STRING}"
SOVERSION "${KSCREEN_SOVERSION}"
diff --git a/src/backendlauncher/CMakeLists.txt b/src/backendlauncher/CMakeLists.txt
index e031a89..c933f10 100644
--- a/src/backendlauncher/CMakeLists.txt
+++ b/src/backendlauncher/CMakeLists.txt
@@ -26,10 +26,13 @@ target_link_libraries(kscreen_backend_launcher
KF5Screen
Qt5::Core
Qt5::Gui
- Qt5::X11Extras
Qt5::DBus
)
+if (XCB_FOUND)
+ target_link_libraries(kscreen_backend_launcher Qt5::X11Extras)
+endif()
+
install(TARGETS kscreen_backend_launcher
DESTINATION ${CMAKE_INSTALL_FULL_LIBEXECDIR_KF5}
)
diff --git a/src/backendlauncher/backendloader.cpp b/src/backendlauncher/backendloader.cpp
index 40f854d..86ccf49 100644
--- a/src/backendlauncher/backendloader.cpp
+++ b/src/backendlauncher/backendloader.cpp
@@ -28,7 +28,9 @@
#include <QDBusConnectionInterface>
#include <QDir>
#include <QPluginLoader>
+#ifdef WITH_XCB_RANDR
#include <QX11Info>
+#endif
#include <memory>
diff --git a/src/backendmanager.cpp b/src/backendmanager.cpp
index 6785eb9..9f13cef 100644
--- a/src/backendmanager.cpp
+++ b/src/backendmanager.cpp
@@ -38,7 +38,9 @@
#include <QGuiApplication>
#include <QStandardPaths>
#include <QThread>
+#ifdef WITH_XCB_RANDR
#include <QX11Info>
+#endif
#include <memory>
@@ -151,9 +153,12 @@ QFileInfo BackendManager::preferredBackend(const QString &backend)
} else if (!env_kscreen_backend.isEmpty()) {
backendFilter = env_kscreen_backend;
} else {
+#ifdef WITH_XCB_RANDR
if (QX11Info::isPlatformX11()) {
backendFilter = QStringLiteral("XRandR");
- } else if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"))) {
+ } else
+#endif
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"))) {
backendFilter = QStringLiteral("KWayland");
} else {
backendFilter = QStringLiteral("QScreen");
--
2.14.4

11
recipes-kde/plasma/untier/libkscreen/libkscreen.bb
View File

@@ -1,8 +1,10 @@
SUMMARY = "KDE's screen management software"
LICENSE = "GPL-2.0"
LICENSE = "GPL-2.0-only & GPL-2.0-or-later & GPL-3.0-only & LGPL-2.1-or-later"
LIC_FILES_CHKSUM = " \
file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://COPYING.LIB;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://LICENSES/GPL-2.0-only.txt;md5=9e2385fe012386d34dcc5c9863070881 \
file://LICENSES/GPL-2.0-or-later.txt;md5=9e2385fe012386d34dcc5c9863070881 \
file://LICENSES/GPL-3.0-only.txt;md5=49fc03046e56a282c0c743b5d3a55b7c \
file://LICENSES/LGPL-2.1-or-later.txt;md5=147a320ed8b16b036829a0c71d424153 \
"
inherit kde-plasma
@@ -10,8 +12,7 @@ inherit kde-plasma
DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 qtx11extras", "", d)}"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "13059ff71a395efbbb6231a4a796a174adb6a16433051e03db9bc83b7d1e7cba"
SRC_URI += "file://0001-fix-configuration-build-on-x-less-systems.patch"
SRC_URI[sha256sum] = "0630ca1dff1dfc7ba74d508c3ff2cb82fd8642281890ded095dff97206299aeb"
FILES_${PN} += " \
${datadir}/dbus-1 \

15
recipes-kde/plasma/untier/libksysguard/libksysguard.bb
View File

@@ -8,27 +8,36 @@ LIC_FILES_CHKSUM = " \
inherit kde-plasma gettext
DEPENDS += " \
qtwebkit \
qtwebengine \
qtwebchannel \
kauth-native \
kconfig-native \
kcoreaddons-native \
kpackage-native \
kdesignerplugin-native \
kcoreaddons \
kconfig \
ki18n \
kjobwidgets \
kwindowsystem \
kcompletion \
kwidgetsaddons \
kiconthemes \
kconfigwidgets \
kservice \
plasma-framework \
kglobalaccel \
kio \
kdeclarative \
knewstuff \
zlib \
libnl \
libpcap \
libcap \
${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 qtx11extras libxres", "", d)} \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "5ff8c687a9d245d28ec4b92c019d2234cd931796c619ebb096de6e49cd18ebe8"
SRC_URI[sha256sum] = "a2d3973aaf7d5c4a1cb6dd463ec8183dd4e9a6c6b851df4b8824f8dd562607a9"
FILES_${PN} += " \
${datadir}/dbus-1 \

2
recipes-kde/plasma/untier/milou/milou.bb
View File

@@ -23,7 +23,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "31c0db3b48aa4c081b748b999deb428e3c15e99fbf6b2128a900864975683b18"
SRC_URI[sha256sum] = "ee38467ef60e5d9090874820e15548c84c92c0d86491492671d48bb797354ffd"
FILES_${PN} += " \
${datadir}/k*5 \

2
recipes-kde/plasma/untier/oxygen/oxygen.bb
View File

@@ -25,7 +25,7 @@ DEPENDS += " \
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "ac0ad3b62438d08b7103e49871b6751e22bb2308c42072b830f4f8ee00d83649"
SRC_URI[sha256sum] = "1a9e016dd70e5e6d0a282c786a4db93a0d212a7a91d563ff27a8927864d5a745"
PACKAGECONFIG ??= ""
PACKAGECONFIG[settings] = "-DBUILD_OXYGEN_SETTINGS=ON,-DBUILD_OXYGEN_SETTINGS=OFF,kcmutils"

2
recipes-kde/plasma/untier/plasma-desktop/plasma-desktop.bb
View File

@@ -50,7 +50,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "de507e305c8021d9226381e2beded1cf45d1b224e9a5201529924cd60eb31a27"
SRC_URI[sha256sum] = "f4f8980036157e84aba53181f188bbd45c455408ee411c1df1b12dbac1c0d8a9"
SRC_URI += "file://0001-Ensure-xkb_base-is-not-empty-instead-of-checking-if-.patch"
FILES_SOLIBSDEV = "${libdir}/libkfont*${SOLIBSDEV}"

2
recipes-kde/plasma/untier/plasma-integration/plasma-integration.bb
View File

@@ -26,7 +26,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "1e745570c9a4526a52a1fd7fc46b4cd5973c2b6047c4577b277bc5910d830c75"
SRC_URI[sha256sum] = "48f7873e6b882cbba93d6297a119ba1a1c090b6f42f4f03fe13bb4e5632e308e"
FILES_${PN} += " \
${datadir}/kconf_update \

2
recipes-kde/plasma/untier/plasma-nm/plasma-nm.bb
View File

@@ -45,7 +45,7 @@ DEPENDS += " \
# MobileBroadbandProviderInfo
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "9098e660a391e821161ed9ad2361b568297df2b53742a8afe18d6104ac700ba3"
SRC_URI[sha256sum] = "1b04f0a9d595caa243979bdbe1dfccc600bd9b7f163e193b2d7d0075c637a975"
# do not move so-libs to -dev package
FILES_SOLIBSDEV = ""

2
recipes-kde/plasma/untier/plasma-pa/plasma-pa.bb
View File

@@ -25,7 +25,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "f6ef1ea24bc8ef8717a09fc4396e8611c315da3175ffa69d873d485524ca9002"
SRC_URI[sha256sum] = "6d6f3ba2303c6f640fa2c8c3c648e10021651a00f5ab10d5d78dc7e3ed9d4741"
FILES_SOLIBSDEV = ""

13
recipes-kde/plasma/untier/plasma-phone-components/plasma-phone-components.bb
View File

@@ -1,9 +1,13 @@
DESCRIPTION = "Plasma Phone Components"
HOMEPAGE = "https://community.kde.org/Plasma/Mobile/Code"
LICENSE = "GPL-2.0 & LGPL-2.1"
LICENSE = "GPL-2.0-only & GPL-2.0-or-later & GPL-3.0-only & LGPL-2.0-or-later & LGPL-2.1-only & LGPL-3.0-only"
LIC_FILES_CHKSUM = " \
file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
file://LICENSES/GPL-2.0-only.txt;md5=9e2385fe012386d34dcc5c9863070881 \
file://LICENSES/GPL-2.0-or-later.txt;md5=9e2385fe012386d34dcc5c9863070881 \
file://LICENSES/GPL-3.0-only.txt;md5=49fc03046e56a282c0c743b5d3a55b7c \
file://LICENSES/LGPL-2.0-or-later.txt;md5=da48810c4ddf8e49efa031294a26b98c \
file://LICENSES/LGPL-2.1-only.txt;md5=147a320ed8b16b036829a0c71d424153 \
file://LICENSES/LGPL-3.0-only.txt;md5=8d51f5b5fd447f7a1040c3dc9f0a8de6 \
"
DEPENDS += " \
@@ -16,12 +20,13 @@ DEPENDS += " \
plasma-framework \
kdbusaddons \
knotifications \
kwin \
"
inherit kde-plasma gettext
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "811bd9986f0cbcb2f24ce6a99005868340184c33c655009330168dec8a45e769"
SRC_URI[sha256sum] = "9126c165a1a647e8753bf602d4a7b419beffe89223a5c53801c78b63f7bbe1af"
FILES_${PN} += " \
${datadir}/k*5 \

41
recipes-kde/plasma/untier/plasma-systemmonitor/plasma-systemmonitor.bb Normal file
View File

@@ -0,0 +1,41 @@
SUMMARY = "GUI to monitor system sensors, process information and other resources"
LICENSE = "BSD-3-Clause & CC0-1.0 & GPL-2.0-only & GPL-3.0-only & LGPL-2.0-or-later & LGPL-2.1-only & LGPL-3.0-only & LGPL-3.0-or-later"
LIC_FILES_CHKSUM = " \
file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
file://LICENSES/CC0-1.0.txt;md5=6fd064768b8d61c31ddd0540570fbd33 \
file://LICENSES/GPL-2.0-only.txt;md5=93e64b4a83c7e441e48bbdeeea05c977 \
file://LICENSES/GPL-3.0-only.txt;md5=1c76c4cc354acaac30ed4d5eefea7245 \
file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
file://LICENSES/LGPL-3.0-or-later.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
"
inherit kde-plasma gettext
DEPENDS += " \
kauth-native \
kconfig-native \
kcoreaddons-native \
kpackage-native \
ki18n \
kconfig \
kdeclarative \
kservice \
kglobalaccel \
kdbusaddons \
knewstuff \
kitemmodels \
kirigami2 \
libksysguard \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "6fa0c22f0754f57ce5ab7d43398d5e35217598db34d9fa9e4ad01203cfe375ca"
FILES_${PN} += " \
${datadir}/config.kcfg \
${datadir}/ksysguard \
${datadir}/knsrcfiles \
${OE_QMAKE_PATH_QML} \
"

5
recipes-kde/plasma/untier/plasma-vault/plasma-vault.bb
View File

@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = " \
inherit kde-plasma gtk-icon-cache
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "7519b5da20e59f571128b66fc22e5d2b2027752e01caa1c70574b12dcfd8979b"
SRC_URI[sha256sum] = "1f3bbabc5e29b88e85276894020f881360cafaf756f929ec2ae96dba612e96ab"
DEPENDS += " \
kauth-native \
@@ -21,10 +21,11 @@ DEPENDS += " \
kconfigwidgets \
kdbusaddons \
kio \
libksysguard \
plasma-framework \
kwidgetsaddons \
ksysguard \
networkmanager-qt \
libksysguard \
"
FILES_${PN} += " \

2
recipes-kde/plasma/untier/plasma-workspace-wallpapers/plasma-workspace-wallpapers.bb
View File

@@ -7,6 +7,6 @@ LIC_FILES_CHKSUM = " \
inherit kde-plasma
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "759acd1b6de1e272c751d9366002038fef6617d6717d82262ec459584502404a"
SRC_URI[sha256sum] = "1d057d38de293ef59f2ecfe37b5edb2eb4572c008cf694e61f17634d4442cf14"
FILES_${PN} += "${datadir}/wallpapers"

2
recipes-kde/plasma/untier/polkit-kde-agent-1/polkit-kde-agent-1.bb
View File

@@ -23,7 +23,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "e68bad084d9144092c8aef68552434c9dba702caf953ea8fa7dcf7731ed689ad"
SRC_URI[sha256sum] = "83caf23430e2ebba52163d523455f66e18c58fa74489bc0f93c7adec0df3d240"
FILES_${PN} += " \
${datadir}/knotifications5 \

2
recipes-kde/plasma/untier/powerdevil/powerdevil.bb
View File

@@ -30,7 +30,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "fdb0305b576345f17d21e2f3a3604e55b0413456cc8b58017e354d5c42d0dda3"
SRC_URI[sha256sum] = "cdaac1a0cad2ec5cc0c60d2ea8ce9df143ed2b29791ab32acb0abea680763bc1"
FILES_${PN} += " \
${datadir}/k*5 \

2
recipes-kde/plasma/untier/sddm-kcm/sddm-kcm.bb
View File

@@ -24,7 +24,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "5280c8e75167233808d44ce0091f66020a3f8f12590fd9272d3b3fda12ce2d6d"
SRC_URI[sha256sum] = "c1fec113d99159834d322286ac1625dd7dbe11ba39ea137e488774bf4e388d4d"
RDEPENDS_${PN} = "sddm"

2
recipes-kde/plasma/untier/systemsettings/systemsettings.bb
View File

@@ -33,7 +33,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "95784e6f0dc89778ebbd0bc4536f690cd8454001c7665eb853c0c6eace987acd"
SRC_URI[sha256sum] = "668e69eecc5f7dc83d3e796c4233cc81696cda398d034c1adf490e4bafb9d9ef"
FILES_${PN} += " \
${datadir}/k*5 \