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

kde-plasma: upgrade 5.23.5 -> 5.24.1

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2022-02-20 23:36:56 +01:00
parent daf0d4966c
commit 70a895971e
48 changed files with 143 additions and 166 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.23.5"
PLASMA_VERSION = "5.24.1"
SRC_URI = "${KDE_MIRROR}/stable/plasma/${PLASMA_VERSION}/${BPN}-${PV}.tar.xz"

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

@@ -55,7 +55,7 @@ UNTIER = " \
plasma-nano \
plasma-nm \
plasma-pa \
plasma-phone-components \
plasma-mobile \
plasma-systemmonitor \
plasma-vault \
plasma-workspace-wallpapers \

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

@@ -8,8 +8,10 @@ LIC_FILES_CHKSUM = " \
inherit kde-plasma gettext
DEPENDS += " \
kcoreaddons-native \
kcoreaddons \
ki18n \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "48982039397a7a58552d649cf8166dfc27b578cf2cb8c1b59b86785e124512cf"
SRC_URI[sha256sum] = "92d9f47364c255cdf7cf39bd229f849b0092635386b3fa62a35f984c1bdde3e9"

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

@@ -27,7 +27,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "b6c5c670708ff4e87ecade6ce6e0c65e1009228e15c8aac023c9283254bc6627"
SRC_URI[sha256sum] = "0e9f420964de1b56bb17f925a5958c89421d4842a8d6f3e52fcd236decf78dd2"
FILES_SOLIBSDEV = ""

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

@@ -27,6 +27,7 @@ DEPENDS += " \
kdelibs4support-native \
kdesignerplugin-native \
kauth-native \
libqalculate \
baloo \
kdeclarative \
plasma-framework \
@@ -59,7 +60,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "2ebee6ab2f10cabc350e0f75a0d8462ae0b7616a795d078f6bb5765396052575"
SRC_URI[sha256sum] = "c79627fed9430c84502ed6917b91372423955ce5ce32abba409350de7b2d8f27"
# REVISIT
FILES:${PN} += " \
@@ -91,7 +92,7 @@ FILES_SOLIBSDEV = " \
${libdir}/libweather_ion${SOLIBSDEV} \
${libdir}/libkfontinst*${SOLIBSDEV} \
"
INSANE_SKIP:${PN} = "dev-so"
# startkde/startplasmacompositor require:
RDEPENDS:${PN} += " \

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

@@ -31,7 +31,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "dbb029a6f47b7b7038ede8d0b491b83d54cdb5438784ef9f7f16eba89aab76d9"
SRC_URI[sha256sum] = "2063535af6f1dda54f78fc65457f417bb40271970cd0274a1784b61c69fae977"
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] = "8d4ab66614d148d64690be1fd57b44c5df53c1915f61b975799d5ae19fdbcbfa"
SRC_URI[sha256sum] = "425d405df13901959ba087440f3f94892ab8ab1e0bab4880eac36405b7fa2c01"
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] = "2ca2a05b786ccd051e8cb1b0ac665d9443790cfaf15054359fa9adf9613edcdf"
SRC_URI[sha256sum] = "5d6728b8de2a8177012d6f8d84f66c10d6a7da37b6d95abcd79f3bc1fbf8976d"
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] = "f92397fe32b607a507a4b3a8ee52f37358ea75b1a9b3c1bca0f54dc1af3cf7cf"
SRC_URI[sha256sum] = "b30fede1c9fc8d80d3a871d98c7c2ed28bbbfadd865e878865fae8f9e98a41e8"
DEPENDS += " \
qtdeclarative \

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

@@ -34,7 +34,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "4d16ae5a5b0f727cee617c89c6d8fc259e12789c44ba4c77c0b036120ffa0388"
SRC_URI[sha256sum] = "7fcc7fbdd19144942f32cd97d146b8e355af9b1c65fe1a369e134a35270ce868"
# 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] = "178e5f342a0a95043c8aa0cf0c7db23a0003b0d971a5aadc2400a4bf85ef1893"
SRC_URI[sha256sum] = "8184ef712f84627f58167d2d0796d757fa761956c3562ed26e3840a7ea446c7c"
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] = "78da1e66da03aa8b34dfef2075655645e9bef1af59671080089bcf8c2d7a0033"
SRC_URI[sha256sum] = "bb0ae13818825a9bc9ef0a3eed627e78dd09d6bf31b8e074fe3108e2b23e00fa"
FILES:${PN} += " \
${datadir}/icons \

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

@@ -18,10 +18,12 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "f60730505b429a58401cf2350faafd3108514c9ad46dd7657a42af08c09e409e"
SRC_URI[sha256sum] = "bd3b6ac25068af795a6da3d126ef248f510670e5f9e4982ddcac381ec239ff7f"
FILES:${PN} += " \
${datadir}/kgamma \
${datadir}/kservices5 \
${OE_QMAKE_PATH_PLUGINS} \
"
INSANE_SKIP:${PN} = "dev-so"

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

@@ -33,7 +33,7 @@ DEPENDS += "\
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "6a18e89f19ba30a97a2e0f0f081acc6da1a37789fc009c7a555382bdc015a68c"
SRC_URI[sha256sum] = "5203d1cf255d5fc38b5b4e25a53a7bf48f812ed55e25279a17ce113f5dde5701"
FILES:${PN} += " \
${datadir}/kservices5 \

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

@@ -44,15 +44,16 @@ DEPENDS += " \
DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11", "", d)}"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "67ae1e26b98a3efdeab6a0741bef9948410da6bee63692189535def0de98f138"
SRC_URI += "file://0001-fix-build-in-x11-less-environments.patch"
SRC_URI[sha256sum] = "7959e24d98707cba2403caa68db3a6b20c23d6e5122e903233caf0656ce600c5"
FILES_SOLIBSDEV = ""
FILES:${PN} += " \
${datadir}/kcmusb \
${datadir}/desktop-directories \
${datadir}/k*5 \
${datadir}/kpackage \
\
${libdir}/libKInfoCenterInternal.so \
${OE_QMAKE_PATH_PLUGINS} \
${OE_QMAKE_PATH_QML} \
"

109
recipes-kde/plasma/untier/kinfocenter/kinfocenter/0001-fix-build-in-x11-less-environments.patch
View File

@@ -1,109 +0,0 @@
From 449bfd081227a01d726955efa3c4848e64fe6d4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Thu, 5 Feb 2015 21:15:54 +0100
Subject: [PATCH] fix build in x11-less environments
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
Modules/info/CMakeLists.txt | 5 ++++-
Modules/opengl/CMakeLists.txt | 5 ++++-
Modules/opengl/opengl.cpp | 9 +++++++++
3 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/Modules/info/CMakeLists.txt b/Modules/info/CMakeLists.txt
index 8094a52..1094717 100644
--- a/Modules/info/CMakeLists.txt
+++ b/Modules/info/CMakeLists.txt
@@ -19,7 +19,10 @@ target_link_libraries(kcm_info
KF5::KCMUtils
KF5::I18n
KF5::IconThemes
- ${X11_X11_LIB})
+ KF5::IconThemes)
+if(HAVE_X11)
+target_link_libraries(kcm_info ${X11_X11_LIB})
+endif()
if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
target_link_libraries(kcm_info devinfo)
diff --git a/Modules/opengl/CMakeLists.txt b/Modules/opengl/CMakeLists.txt
index dc823f1..05ef2f6 100644
--- a/Modules/opengl/CMakeLists.txt
+++ b/Modules/opengl/CMakeLists.txt
@@ -14,7 +14,10 @@ ki18n_wrap_ui(KCM_OPENGL_PART_UIS_H ${KCM_OPENGL_PART_UIS})
add_library(kcm_opengl MODULE ${KCM_OPENGL_PART_SRCS} ${KCM_OPENGL_PART_UIS_H})
-target_link_libraries(kcm_opengl KF5::KCMUtils KF5::I18n ${X11_X11_LIB})
+target_link_libraries(kcm_opengl KF5::KCMUtils KF5::I18n)
+if(HAVE_X11)
+target_link_libraries(kcm_opengl ${X11_X11_LIB})
+endif()
find_library(DL_LIBRARY dl)
if (DL_LIBRARY)
diff --git a/Modules/opengl/opengl.cpp b/Modules/opengl/opengl.cpp
index a3cd394..feb4dc3 100644
--- a/Modules/opengl/opengl.cpp
+++ b/Modules/opengl/opengl.cpp
@@ -24,9 +24,12 @@
#include <KLocalizedString>
#include <KMessageBox>
+#include <config-X11.h>
+#if HAVE_X11
// X11 includes
#include <X11/Xlib.h>
#include <X11/Xutil.h>
+#endif // HAVE_X11
#include <openglconfig.h>
@@ -788,6 +791,7 @@ static QTreeWidgetItem *get_gl_info_glx(Display *dpy, int scrnum, Bool allowDire
#endif
#if KCM_HAVE_EGL
+#if HAVE_X11
static QTreeWidgetItem *get_gl_info_egl(Display *dpy, int scrnum, QTreeWidgetItem *l1, QTreeWidgetItem *after)
{
Window win;
@@ -904,6 +908,7 @@ static QTreeWidgetItem *get_gl_info_egl(Display *dpy, int scrnum, QTreeWidgetIte
XFree(visinfo);
return result;
}
+#endif // HAVE_X11
static QTreeWidgetItem *get_gl_info_egl_qt(QTreeWidgetItem *l1, QTreeWidgetItem *after, QSurfaceFormat::OpenGLContextProfile profile, const QString &title)
{
@@ -948,7 +953,9 @@ bool GetInfo_OpenGL(QTreeWidget *treeWidget)
{
QTreeWidgetItem *l1, *l2 = nullptr;
+#if HAVE_X11
static bool isX11 = QGuiApplication::platformName() == QLatin1String("xcb");
+#endif // HAVE_X11
static bool isWayland = QGuiApplication::platformName().contains(QLatin1String("wayland"));
QTreeWidgetItem *header = new QTreeWidgetItem();
@@ -960,6 +967,7 @@ bool GetInfo_OpenGL(QTreeWidget *treeWidget)
l1 = new QTreeWidgetItem(treeWidget);
+#if HAVE_X11
if (isX11) {
char *displayName = nullptr;
Display *dpy;
@@ -1006,6 +1014,7 @@ bool GetInfo_OpenGL(QTreeWidget *treeWidget)
#endif
XCloseDisplay(dpy);
}
+#endif // HAVE_X11
if (isWayland) {
IsDirect = true;
--
2.21.0

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

@@ -31,7 +31,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "821436fcb1a38b3d8e1c969119d7e1f326f02be1f1518baa51917f946e5c6d4c"
SRC_URI[sha256sum] = "483c20bd9645d8fa14a2879b1c431798887bb466e8903827c75ad0fec37b8e90"
# do not move so-libs to -dev package
FILES_SOLIBSDEV = ""

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

@@ -31,7 +31,7 @@ DEPENDS += "\
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "d1032cfd442ee872db714522d8874a48050723ac22c47783c7478a11e47fb948"
SRC_URI[sha256sum] = "63c28e1e0cb306428ccb427b8001c79588ebf8b28b1c43a16edcf0df4dbe30c5"
FILES:${PN} += " \
${datadir}/k*_kscreen \

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

@@ -30,7 +30,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "f5ca9dd81f17c599e11a51c6e986ff768ad88c0bde7e42e097d6a7efd9e6701f"
SRC_URI[sha256sum] = "b8d440448f60896e423d16a8f091e9dc1b0ec1c32508f487d3d0c4159a9f3237"
SRC_URI += "file://kde.pam"
do_install:append() {

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

@@ -15,4 +15,4 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "2e0e919d8d9cb203c68b3a8145147034d994bc2425f535b64917b10a8c9a0a5d"
SRC_URI[sha256sum] = "308020a321423cba3339b914bc50eef34a56fb0d6736675cb237d2417fbf0181"

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

@@ -16,7 +16,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "89df447e2d79d8fc19225ef57c21abdb56f0adc52536b470f6cf691c79200ab2"
SRC_URI[sha256sum] = "7341102ecb8a892f635c6cc0da01176a3b360e67f4978bc9914bf53abf0175c8"
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

@@ -17,7 +17,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "4f114633d828f41ee26b5c4ffd3a3fdb6756f363d283ed52b176c69cc946463f"
SRC_URI[sha256sum] = "2b373e1c3b83279e5b4f90e67c1e1f6fdf8bf4e7fb769b98d7528e4450afb54c"
FILES:${PN} += " \
${OE_QMAKE_PATH_PLUGINS} \

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

@@ -27,7 +27,7 @@ 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] = "7e1d1b72d55fced5068ff781d285f07fdb97ec10326d143aec8f9901670d0c2d"
SRC_URI[sha256sum] = "78fc90e554cacff0a895b1c724b8a3651668c970b3a7818f2a4952d34912b35e"
do_configure:append() {
# adjust path to protocol sources in sysroot

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

@@ -26,9 +26,9 @@ index 31c5a91..ad6a0f0 100644
+find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core)
+if(FALSE)
find_package(KF5Wayland ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(PlasmaWaylandProtocols CONFIG REQUIRED)
find_package(PlasmaWaylandProtocols 1.6.0 CONFIG REQUIRED)
@@ -77,9 +78,11 @@ add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00)
@@ -75,9 +76,11 @@ add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00)
if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
ecm_install_po_files_as_qm(po)
endif()
@@ -40,7 +40,7 @@ index 31c5a91..ad6a0f0 100644
if (BUILD_TESTING)
add_subdirectory(autotests)
add_subdirectory(tests)
@@ -113,6 +116,7 @@ install(EXPORT KWaylandServerTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FI
@@ -111,6 +114,7 @@ install(EXPORT KWaylandServerTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FI
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kwaylandserver_version.h
DESTINATION ${KDE_INSTALL_INCLUDEDIR} COMPONENT Devel )

22
recipes-kde/plasma/untier/kwin/kwin-native.bb Normal file
View File

@@ -0,0 +1,22 @@
SUMMARY = "KDE's window manager native helper"
LICENSE = "GPL-2.0-or-later"
LIC_FILES_CHKSUM = " \
file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
"
require ${BPN}.inc
inherit kde-plasma native
SRC_URI += "file://CMakeLists.txt"
OECMAKE_SOURCEPATH = "${WORKDIR}"
do_configure:prepend() {
cp -f ${S}/src/effects/strip-effect-metadata.cpp ${WORKDIR}
}
do_install() {
install -d ${D}${bindir}
install -m 755 ${B}/kwin-strip-effect-metadata ${D}${bindir}
}

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

@@ -1,5 +1,5 @@
SUMMARY = "KDE's window manager"
LICENSE = "BSD-2-Clause & BSD-3-Clause & GPL-2.0 & GPL-2.0+ & GPL-3.0 & GPL-3.0+ & LGPL-2.0 & LGPL-2.0+ & LGPL-2.1 & LGPL-3.0"
LICENSE = "BSD-2-Clause & BSD-3-Clause & GPL-2.0-only & GPL-2.0-or-later & GPL-3.0-only & GPL-3.0-or-later & LGPL-2.0-only & LGPL-2.0-or-later & LGPL-2.1-only & LGPL-3.0-only"
LIC_FILES_CHKSUM = " \
file://LICENSES/BSD-2-Clause.txt;md5=63d6ee386b8aaba70b1bf15a79ca50f2 \
file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
@@ -22,12 +22,15 @@ DEPENDS += " \
libinput \
qtsensors \
fontconfig \
lcms \
\
${BPN}-native \
kauth-native \
kconfig-native kconfig \
kdoctools-native kdoctools \
kcoreaddons-native kcoreaddons \
kpackage-native kpackage \
breeze \
sonnet-native \
kactivities \
kconfigwidgets \
@@ -51,13 +54,14 @@ DEPENDS += " \
kdecoration \
kscreenlocker \
kwayland-server \
krunner \
"
# this condition matches always currently - it is kept in this way as a marker
DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 qtx11extras libepoxy xcb-util-cursor", "",d)}"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "f749e7e9b753d1ed1ae9655ea3cdec7d13946c64c820d4c85be2c0f95ac55f01"
require ${BPN}.inc
SRC_URI += "file://0001-Remove-kwin-strip-effect-metadata-find-build-dance.patch"
FILES:${PN} += " \
${datadir}/config.kcfg \
@@ -66,6 +70,7 @@ FILES:${PN} += " \
${datadir}/k*5 \
${datadir}/knsrcfiles \
${datadir}/kpackage \
${datadir}/krunner \
${datadir}/icons \
${systemd_user_unitdir} \
${OE_QMAKE_PATH_PLUGINS} \
@@ -73,13 +78,6 @@ FILES:${PN} += " \
${libdir}/kconf_update_bin \
"
# taken from bitbake.conf with lucky modification: all lt libraries end with s.so
# only move them to -dev package
FILES_SOLIBSDEV = "${base_libdir}/lib*${SOLIBSDEV} ${libdir}/lib*s${SOLIBSDEV}"
FILES:${PN} += " \
${libdir}/*.so \
"
RDEPENDS:${PN} += " \
${@bb.utils.contains("DISTRO_FEATURES", "x11 wayland", "xwayland", "",d)} \
${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland", "",d)} \

3
recipes-kde/plasma/untier/kwin/kwin.inc Normal file
View File

@@ -0,0 +1,3 @@
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "f2d71f786efab031f4e4709e09e460257cc65bc876e5e09b508f293f95dd07ab"

45
recipes-kde/plasma/untier/kwin/kwin/0001-Remove-kwin-strip-effect-metadata-find-build-dance.patch Normal file
View File

@@ -0,0 +1,45 @@
From 6576ed9befb6c4d53dbb893068145b1daef82675 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sat, 12 Feb 2022 22:57:07 +0100
Subject: [PATCH] Remove kwin-strip-effect-metadata find/build dance
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
src/effects/CMakeLists.txt | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/src/effects/CMakeLists.txt b/src/effects/CMakeLists.txt
index 9d06969..257f086 100644
--- a/src/effects/CMakeLists.txt
+++ b/src/effects/CMakeLists.txt
@@ -8,22 +8,6 @@ function(kwin_add_effect_config name)
kcoreaddons_add_plugin(${name} INSTALL_NAMESPACE "kwin/effects/configs" SOURCES ${ARGV})
endfunction()
-if (CMAKE_CROSSCOMPILING)
- if (NOT KWIN_HOST_TOOLING)
- message(FATAL_ERROR "Please provide the path to a native build and pass -DKWIN_HOST_TOOLING=path")
- endif()
- find_file(KSEM_EXECUTABLE StripEffectMetadataTargets.cmake
- PATHS ${KWIN_HOST_TOOLING}
- NO_DEFAULT_PATH
- NO_CMAKE_FIND_ROOT_PATH)
- include(${KSEM_EXECUTABLE})
-else()
- add_executable(kwin-strip-effect-metadata strip-effect-metadata.cpp)
- target_link_libraries(kwin-strip-effect-metadata Qt5::Core)
- # Export the kwin-strip-effect-metadata target to a file, so it can be used by another build.
- export(TARGETS kwin-strip-effect-metadata FILE ${CMAKE_BINARY_DIR}/StripEffectMetadataTargets.cmake)
-endif()
-
function (kwin_strip_builtin_effect_metadata target metadata)
set(stripped_metadata "${CMAKE_CURRENT_BINARY_DIR}/${metadata}.stripped")
--
2.34.1

8
recipes-kde/plasma/untier/kwin/kwin/CMakeLists.txt Normal file
View File

@@ -0,0 +1,8 @@
project(kwinnative LANGUAGES CXX)
set(CMAKE_AUTOMOC ON)
find_package(Qt5 COMPONENTS Core REQUIRED)
add_executable(kwin-strip-effect-metadata strip-effect-metadata.cpp)
target_link_libraries(kwin-strip-effect-metadata Qt5::Core)

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

@@ -16,7 +16,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "1b4762a40cee10fbd9120cde880fb53d4668433c4f8719b00420b4ef6608492a"
SRC_URI[sha256sum] = "0151f1afa0895b366b3d79878e1b3118a7630fa24c10b326560d1e0ea8daa156"
FILES:${PN} += " \
${datadir}/knotifications5 \

2
recipes-kde/plasma/untier/layer-shell-qt/layer-shell-qt.bb
View File

@@ -14,7 +14,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "59aff42c166aab2c392a46f0a40525eff844da99a21f39a0e12ce608d33706aa"
SRC_URI[sha256sum] = "4499a5dd8dc5df563550f95f725461b03cb7f178efe3a8994d3c0dcd6f4200ab"
FILES:${PN} += " \
${OE_QMAKE_PATH_PLUGINS} \

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

@@ -11,13 +11,15 @@ inherit kde-plasma
DEPENDS += " \
qtwayland-native \
plasma-wayland-protocols \
${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 qtx11extras", "", d)} \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "31d433323616bcfda3c0c11e5dcb15acb83a4973993a5aa82bc85cca4c7a8f23"
SRC_URI[sha256sum] = "bd2791709d6c09711a9a58f4639cb1ab83df98237a2b6ba133f9b1a2690f29a5"
FILES:${PN} += " \
${datadir}/dbus-1 \
${OE_QMAKE_PATH_PLUGINS} \
${systemd_user_unitdir} \
"

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

@@ -44,7 +44,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "3030a6d579b8c2bd713677f1bd32dafaaf8ff2237b8be2177d7c9f3f677ec1bf"
SRC_URI[sha256sum] = "ec1b3c5a63fc990e111f582a0512459ba3cb7002423c9dd52c664abf9589165d"
do_compile:append() {
sed -i 's:${STAGING_DIR_HOST}${prefix}:${_IMPORT_PREFIX}:g' ${B}/CMakeFiles/Export/lib/cmake/KSysGuard/KSysGuardLibraryTargets.cmake

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

@@ -26,7 +26,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "f00540998d172d3c5bbc83ebbfefed676bbd9a9c4a2c733ff9b9d85b18346c15"
SRC_URI[sha256sum] = "bb5f1c4ade4b9a7533bd15141abfc1ed2f12009766ae657e859175214263c993"
FILES:${PN} += " \
${datadir}/k*5 \

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

@@ -31,7 +31,7 @@ DEPENDS += " \
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "0c6ccf96edff50088323c83fc50bbc7c04ec7a5d64f398456f09634ab14f7eef"
SRC_URI[sha256sum] = "c23a44485a36333d45ced6596998d5e17e29c09c8570876263bc27636d8ad26a"
PACKAGECONFIG ??= ""
PACKAGECONFIG[settings] = "-DBUILD_OXYGEN_SETTINGS=ON,-DBUILD_OXYGEN_SETTINGS=OFF,kcmutils"

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

@@ -57,7 +57,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "b3905877a32dbe36b923d8624b9d7ac0174071f7ec08bf057f3e94c1b566a87a"
SRC_URI[sha256sum] = "08c45caa8d423698b349ee13ff83a6b4c8389249c594e39b64c56d26e37c5fc7"
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

@@ -32,7 +32,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "8f9672da0501e835763254e24b36069ba3bcd6c5ba90505fdfb7b1923766800d"
SRC_URI[sha256sum] = "2c2ca20ae54e9705468566c521c1556ec30618adbee00219f5469c67d6b8aae4"
FILES:${PN} += " \
${datadir}/kconf_update \

5
recipes-kde/plasma/untier/plasma-phone-components/plasma-phone-components.bb → recipes-kde/plasma/untier/plasma-mobile/plasma-mobile.bb
View File

@@ -1,4 +1,4 @@
DESCRIPTION = "Plasma Phone Components"
DESCRIPTION = "Plasma Mobile Phone Components"
HOMEPAGE = "https://community.kde.org/Plasma/Mobile/Code"
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 = " \
@@ -22,12 +22,13 @@ DEPENDS += " \
kdbusaddons \
knotifications \
kwin \
networkmanager-qt \
"
inherit kde-plasma gettext
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "36bb23c9a9a81bdb604a553e2474a7b88866f6ed93a11644a3eaeccdfc1d8021"
SRC_URI[sha256sum] = "6e0d3aeac4c50835b33d2200ab9829c6b4e42739306c50b333a995a5a225dbc2"
FILES:${PN} += " \
${datadir}/k*5 \

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

@@ -14,7 +14,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "35766683a9a108a98b7ae654c8393fbbc9259dbae2345846ff67561de03a06fa"
SRC_URI[sha256sum] = "95299f2acc9c9205d93951263d5b499487ee10d00d097393f167d234ac01163f"
FILES:${PN} += " \
${datadir}/plasma \

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

@@ -50,7 +50,7 @@ DEPENDS += " \
# MobileBroadbandProviderInfo
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "4346067fafb34fbb71d39f88f8c8b52eb6b229e846072b610cbd934dfcb75393"
SRC_URI[sha256sum] = "99f135762313631078af107b61f75818752e23c102a435c6ccf84eb64837d30d"
# do not move so-libs to -dev package
FILES_SOLIBSDEV = ""

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

@@ -27,7 +27,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "afbbeb580ff2d1ec07b3e6fa292222f920427f690af6c216ab2f1f89537196dd"
SRC_URI[sha256sum] = "6c2ae9e93f79143b928f475be1684eb5e97108445b2047a68395bb5d45a9802e"
FILES_SOLIBSDEV = ""

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

@@ -31,11 +31,12 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "8e8600ea93124c9d14fe245fbcda47daa5d594c4274100c0d43929f9fa52dfea"
SRC_URI[sha256sum] = "c0f2b38b4c015bc07d90ca5023d3d9cbe81d126b51fa4cde60a6081448981251"
FILES:${PN} += " \
${datadir}/config.kcfg \
${datadir}/ksysguard \
${datadir}/knsrcfiles \
${datadir}/plasma \
${OE_QMAKE_PATH_QML} \
"

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

@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = " \
inherit kde-plasma gtk-icon-cache
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "0d6cffa89f53de921a983340b066119315c8bbff613ddc9bdedbe2247018c5bd"
SRC_URI[sha256sum] = "0be5c86dd09a90d178977acfb30ab3cd17a972f32aabb9a31409b6716cc4d42a"
DEPENDS += " \
kauth-native \

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] = "dd6d03fa758fbb046e1a631d129223164a378b122ec17d900ac76cf47d18265b"
SRC_URI[sha256sum] = "8085b42ee2f18b6459ef88ced94430a4e82087509b2ec341af63f82edff7154f"
FILES:${PN} += "${datadir}/wallpapers"

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

@@ -24,7 +24,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "967e69d1e9246dac1cd2c6f0f38565d954cf5d298170af9a330a1f94f07af7f1"
SRC_URI[sha256sum] = "2f3d5aab3ad42823474713f8916bc897ac469c9b3322989bccd3f7980696e738"
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] = "268420b48f683815457d61a11f9a565e7f176692a19c64997376cbc149c3b2d3"
SRC_URI[sha256sum] = "f437e099685865a0386419976bddcb733c5f1fdcf400b8f486e094a55ac72a4b"
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] = "bb338657463878b535f73eec6fc32c1f83f0928aeb7e61f66f497044eb0b5233"
SRC_URI[sha256sum] = "c1fa49c7c8dcc2c4f037c549e107e1ba169de83c917a485b1728cc7e3b1fa3b5"
RDEPENDS:${PN} = "sddm"

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

@@ -33,7 +33,7 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[sha256sum] = "500ecb5955391b49a12578a2f54cabd2bed3c150a2a6e68833beafceacc21a6a"
SRC_URI[sha256sum] = "b356b7c3bd4c73f6374ee14b9a9b4e0c8aabe3c7f2ae8f7b007d6d0f17dbcc72"
FILES:${PN} += " \
${datadir}/k*5 \