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

kde-plasma: upgrade 5.16.5 -> 5.17.0

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2019-10-16 00:01:27 +02:00
parent a28bda9162
commit 8bab9e6115
45 changed files with 106 additions and 309 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.16.5"
PLASMA_VERSION = "5.17.0"
SRC_URI = "${KDE_MIRROR}/stable/plasma/${PLASMA_VERSION}/${BPN}-${PV}.tar.xz"

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

@@ -9,5 +9,5 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "bc861c4dd47e28075a9e40a192f97e22"
SRC_URI[sha256sum] = "2b8c7b7cf114d0eff4ec842009cda264d8cf1254ec4bf65868b6d26f263829bb"
SRC_URI[md5sum] = "7a6be92e4efd687996ce8d4e7068842a"
SRC_URI[sha256sum] = "d6d25e6894d941001af035497388aa998599d89df0ca2847c8aa6275b9bf9266"

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

@@ -24,8 +24,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "ab438ad8ac91cb5a468598addf458d84"
SRC_URI[sha256sum] = "e35dbf7aae8a7b7f21b2304935cad96881af558a7c9d947f0114093038b1c4bc"
SRC_URI[md5sum] = "8e5518bfe06fc61955598c6a0b86e4a3"
SRC_URI[sha256sum] = "23ef9043a968d0f6920b1ca677673c09282c94482be1bfdf5fb38e7b2d09fe3f"
SRC_URI += "file://0001-replace-try_run-by-try_compile-in-compiler-feature-c.patch"
# Workaround

33
recipes-kde/plasma/tier3/plasma-workspace/files/0003-startkde-add-meta-qt5-standard-binary-path-to-PATH.patch
View File

@@ -1,33 +0,0 @@
From aad377ab9446b0e1d187204990d706b505fa254d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Mon, 9 Feb 2015 17:48:32 +0100
Subject: [PATCH] startkde: add meta-qt5 standard binary path to PATH
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
startkde/startkde.cmake | 3 +++
1 file changed, 3 insertions(+)
diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
index 046543e..2663348 100644
--- a/startkde/startkde.cmake
+++ b/startkde/startkde.cmake
@@ -3,6 +3,9 @@
# DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ )
#
+# meta-qt5 specific
+PATH=$PATH:@OE_QMAKE_PATH_QT_BINS@; export PATH
+
# When the X server dies we get a HUP signal from xinit. We must ignore it
# because we still need to do some cleanup.
trap 'echo GOT SIGHUP' HUP
--
1.9.3

37
recipes-kde/plasma/tier3/plasma-workspace/files/0004-startkde-create-kde-s-home.patch
View File

@@ -1,37 +0,0 @@
From 5c0fb3d53f7889e70a47a64cd691bee473ec783f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Wed, 29 Apr 2015 18:10:16 +0200
Subject: [PATCH] startkde: create kde's home
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
fixes:
| static QPlatformTheme* QKdeTheme::createKdeTheme(): Unable to determine KDE dirs
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
startkde/startkde.cmake | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
index 891c21e..cbb7063 100644
--- a/startkde/startkde.cmake
+++ b/startkde/startkde.cmake
@@ -46,6 +46,11 @@ sysConfigDirs=${XDG_CONFIG_DIRS:-/etc/xdg}
# We need to create config folder so we can write startupconfigkeys
mkdir -p $configDir
+# Make qtbase/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
+# happy by creating kde home
+mkdir -p ${HOME}/.kde
+
+
#This is basically setting defaults so we can use them with kstartupconfig5
cat >$configDir/startupconfigkeys <<EOF
kcminputrc Mouse cursorTheme 'breeze_cursors'
--
1.9.3

36
recipes-kde/plasma/tier3/plasma-workspace/files/0005-startkde-enable-starting-X.patch
View File

@@ -1,36 +0,0 @@
From d6335061a718fbc291dbba2fc1e13af577fd2306 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Wed, 29 Apr 2015 16:38:43 +0200
Subject: [PATCH] startkde: enable starting X
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
we can start kde from shell by this which is sometimes helpful for debugging
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
startkde/startkde.cmake | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
index 24e5c1b..0c5f569 100644
--- a/startkde/startkde.cmake
+++ b/startkde/startkde.cmake
@@ -18,8 +18,10 @@ if test $kcheckrunning_result -eq 0 ; then
xmessage -geometry 500x100 "Plasma seems to be already running on this display." > /dev/null 2>/dev/null
exit 1
elif test $kcheckrunning_result -eq 2 ; then
- echo "\$DISPLAY is not set or cannot connect to the X server."
- exit 1
+ echo "Starting X server..."
+ prog=`which startkde`
+ exec xinit $prog
+ exit 0
fi
# Boot sequence:
--
1.9.3

51
recipes-kde/plasma/tier3/plasma-workspace/files/0006-startplasmacompositor-align-qt5-bin-path.patch
View File

@@ -1,51 +0,0 @@
From 3fabfaa8f0beb09513bf0dd770f6273682edd12a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Mon, 15 Aug 2016 22:43:04 +0200
Subject: [PATCH] startplasmacompositor: align qt5 bin path
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
startkde/startplasmacompositor.cmake | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake
index 8ac47aa..55a016a 100644
--- a/startkde/startplasmacompositor.cmake
+++ b/startkde/startplasmacompositor.cmake
@@ -120,12 +120,12 @@ fi
# Get a property value from org.freedesktop.locale1
queryLocale1() {
- qdbus --system org.freedesktop.locale1 /org/freedesktop/locale1 "$1"
+ @OE_QMAKE_PATH_QT_BINS@/qdbus --system org.freedesktop.locale1 /org/freedesktop/locale1 "$1"
}
# Query whether org.freedesktop.locale1 is available. If it is, try to
# set XKB_DEFAULT_{MODEL,LAYOUT,VARIANT,OPTIONS} accordingly.
-if qdbus --system org.freedesktop.locale1 >/dev/null 2>/dev/null; then
+if @OE_QMAKE_PATH_QT_BINS@/qdbus --system org.freedesktop.locale1 >/dev/null 2>/dev/null; then
# Do not overwrite existing values. There is no point in setting only some
# of them as then they would not match anymore.
if [ -z "${XKB_DEFAULT_MODEL}" -a -z "${XKB_DEFAULT_LAYOUT}" -a \
@@ -175,10 +175,10 @@ fi
export XDG_DATA_DIRS
# Make sure that D-Bus is running
-if qdbus >/dev/null 2>/dev/null; then
+if @OE_QMAKE_PATH_QT_BINS@/qdbus >/dev/null 2>/dev/null; then
: # ok
else
- echo 'startplasmacompositor: Could not start D-Bus. Can you call qdbus?' 1>&2
+ echo 'startplasmacompositor: Could not start D-Bus. Can you call @OE_QMAKE_PATH_QT_BINS@/qdbus?' 1>&2
test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
exit 1
fi
--
2.14.3

40
recipes-kde/plasma/tier3/plasma-workspace/files/0007-startplasma.cmake-fix-paths-to-qdbus.patch
View File

@@ -1,40 +0,0 @@
From d5f3d3a0a02f01a78bb867929b854bb7df4861c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Wed, 5 Sep 2018 00:07:23 +0200
Subject: [PATCH] startplasma.cmake: fix paths to qdbus
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
startkde/startplasma.cmake | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/startkde/startplasma.cmake b/startkde/startplasma.cmake
index f7330ab3..4fddd097 100644
--- a/startkde/startplasma.cmake
+++ b/startkde/startplasma.cmake
@@ -169,13 +169,13 @@ if test x"$wait_drkonqi"x = x"true"x ; then
# wait for remaining drkonqi instances with timeout (in seconds)
wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
wait_drkonqi_counter=0
- while qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
+ while @OE_QMAKE_PATH_QT_BINS@/qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
sleep 5
wait_drkonqi_counter=$((wait_drkonqi_counter+5))
if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then
# ask remaining drkonqis to die in a graceful way
- qdbus | grep 'org.kde.drkonqi-' | while read address ; do
- qdbus "$address" "/MainApplication" "quit"
+ @OE_QMAKE_PATH_QT_BINS@/qdbus | grep 'org.kde.drkonqi-' | while read address ; do
+ @OE_QMAKE_PATH_QT_BINS@/qdbus "$address" "/MainApplication" "quit"
done
break
fi
--
2.14.4

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

@@ -44,20 +44,17 @@ DEPENDS += " \
kwin \
${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 libsm libxcb", "", d)} \
zlib \
kpeople \
kactivities-stats \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "0e8defb3a66ff92ad78d2d131f5c6538"
SRC_URI[sha256sum] = "43364fe4e7ea10ad7b5b1d7af4f1baa1d8796b60692f2dfc0d58693f63e458ff"
SRC_URI[md5sum] = "c378aebe24ed165e8e971eb47db632b0"
SRC_URI[sha256sum] = "4480ccf0b9168bdd10d4a5fa3ee40e5e77f10c12713f9de55c5d19e23fe993f0"
SRC_URI += " \
file://0001-fix-build-for-QT_NO_SESSIONMANAGER.patch \
file://0002-align-phonon-path.patch \
file://0003-startkde-add-meta-qt5-standard-binary-path-to-PATH.patch \
file://0004-startkde-create-kde-s-home.patch \
file://0005-startkde-enable-starting-X.patch \
file://0006-startplasmacompositor-align-qt5-bin-path.patch \
file://0007-startplasma.cmake-fix-paths-to-qdbus.patch \
"
# REVISIT
@@ -78,6 +75,7 @@ FILES_${PN} += " \
${datadir}/solid \
${datadir}/wayland-sessions \
${datadir}/xsessions \
${datadir}/kglobalaccel \
\
${libdir}/libkdeinit5*.so \
${libdir}/kconf_update_bin \

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

@@ -25,8 +25,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "c8356dd97659381dacc6d3fa3f2117ea"
SRC_URI[sha256sum] = "60ac3471d30cb113b1959eacdaa1f4898f04f779f94a35dbca00993cda4ea464"
SRC_URI[md5sum] = "04e7356e93bf552829794bc7aadbc74d"
SRC_URI[sha256sum] = "c4576b72dead133483e8faab787ea5daf96217216b324df529ca5381a5aac929"
FILES_${PN} += " \
${datadir}/bluedevilwizard \

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

@@ -9,8 +9,8 @@ inherit kde-plasma python3native
DEPENDS += "sassc-native cairo breeze python3-pycairo-native"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "32a4ee2e693414d975f60c23d1c6e99a"
SRC_URI[sha256sum] = "d9849ecf6c2fc85fde76912410ab36c46ca65b96d80b4e51819ca35015a88098"
SRC_URI[md5sum] = "c947d414522db82e726ce77ba3122163"
SRC_URI[sha256sum] = "bba00e94bad2b6f9baae19b1edba076785f45a94b591dd4b34f7b9104348cc3a"
FILES_${PN} += " \
${datadir}/kconf_update \

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

@@ -27,8 +27,8 @@ DEPENDS += "\
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "b4ba108bf4c47902c457639cda07936b"
SRC_URI[sha256sum] = "09225021a2cf396e74cabe692b0a5dcf9a12f0b47f02fb14df6ccc9db01f2e6b"
SRC_URI[md5sum] = "26ac83ff47abf9bb4789b64dd4544073"
SRC_URI[sha256sum] = "9d32ceffe33b776fcb7ec92d99088503a97c49e4b6216153438d5f7b93af8345"
FILES_${PN} += " \
${datadir}/color-schemes \

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

@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = " \
inherit kde-plasma gtk-icon-cache
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "d3e971a730de28aeb9a90a66d554a7f9"
SRC_URI[sha256sum] = "26c47a5c0f59a31f37da85e894a926c76805b66f91dde8ba6d2de8015842d5c1"
SRC_URI[md5sum] = "a597dc9f164661b6c4f057bcc96457b9"
SRC_URI[sha256sum] = "1d33f40cb259552d7083aaf7cbbb18da3f8ecd321e74ca4b7fe206352dca5daf"
DEPENDS += " \
qtdeclarative \

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

@@ -27,8 +27,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "69353f70406c703cb2be8295a35075e3"
SRC_URI[sha256sum] = "bc82b159d3c9a23f0ecb47a8314b645041b01692887a3be0ef0582d54f926de2"
SRC_URI[md5sum] = "cbb4668046ee001dc6c01075c7120103"
SRC_URI[sha256sum] = "1d554bc8c68b9a7ec7e467bcd38b64ed706c5c6a6de566c4b205b536f5490744"
# do not move so-libs to -dev package
FILES_SOLIBSDEV = ""

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

@@ -24,8 +24,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "fcf3a7334f5521c265e44fa5d3450876"
SRC_URI[sha256sum] = "f78abf129aaa7afac2c7a71105b36b9553a975bbcb89ec65a0166099d1cca8c1"
SRC_URI[md5sum] = "6eb2196231d954989820508d32ba1e75"
SRC_URI[sha256sum] = "a6eb212078877ef37cd103d92d2d342d6306c5c1f16778586dd271ecb75a3bd6"
CFLAGS += "-isystem ${STAGING_INCDIR}/harfbuzz"
CXXFLAGS += "-isystem ${STAGING_INCDIR}/harfbuzz"

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

@@ -34,8 +34,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "bf2f06bd5909d0e09eb78b248dc3aefc"
SRC_URI[sha256sum] = "a4737a54b75143053a9f8a5bc28c608f843c524872c665d4e5a65bd2853e1e00"
SRC_URI[md5sum] = "be9bb150c31b1d04315c6ae476bf2916"
SRC_URI[sha256sum] = "d4c6ab840f61dcdc52b925045614f9de4089dc2fdf89726fd7c8638c521eb42e"
FILES_${PN} += " \
${datadir}/icons \

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

@@ -19,8 +19,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "01eabdad7d4b5827783af0665f03fdd7"
SRC_URI[sha256sum] = "838fabf4312f022ee3df5bba940c0c73e26260cfee39235c1ba8da8a2e61bfa0"
SRC_URI[md5sum] = "abe5f63bfaee5209a0771a1d1249ff3b"
SRC_URI[sha256sum] = "5d4c7cfc63896746a994128db03037bff666132e8e35378de60ac91a3959493d"
FILES_${PN} += " \
${datadir}/kgamma \

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

@@ -31,8 +31,8 @@ DEPENDS += "\
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "51806d36e83aa03aa6e201e58dafcf56"
SRC_URI[sha256sum] = "e7b866b5249ff7c5860a5a222dca79691ca1f09af176f786021fbbadbd718c8c"
SRC_URI[md5sum] = "9ef75b5a7501514ce83bed9a6a785c7a"
SRC_URI[sha256sum] = "da7d2a1db9f49b34ea5b24ec9bd6450142cb4e708c9a8f478adc94eb7f190d69"
FILES_${PN} += " \
${datadir}/kservices5 \

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

@@ -1,27 +1,26 @@
From 449bfd081227a01d726955efa3c4848e64fe6d4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
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@googlemail.com>
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
Modules/info/CMakeLists.txt | 6 ++++--
Modules/opengl/CMakeLists.txt | 5 ++++-
Modules/opengl/opengl.cpp | 13 +++++++++++--
3 files changed, 19 insertions(+), 5 deletions(-)
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 4dae851..a528dbd 100644
index 4dae851..abb7e1b 100644
--- a/Modules/info/CMakeLists.txt
+++ b/Modules/info/CMakeLists.txt
@@ -22,8 +22,10 @@ target_link_libraries(kcm_info
KF5::CoreAddons
@@ -23,7 +23,10 @@ target_link_libraries(kcm_info
KF5::KCMUtils
KF5::I18n
- KF5::IconThemes
KF5::IconThemes
- ${X11_X11_LIB})
+ KF5::IconThemes)
+if(HAVE_X11)
@@ -47,7 +46,7 @@ index ab45779..2e05799 100644
find_library(DL_LIBRARY dl)
if (DL_LIBRARY)
diff --git a/Modules/opengl/opengl.cpp b/Modules/opengl/opengl.cpp
index c87cde8..5df02e3 100644
index 340af6d..e03973d 100644
--- a/Modules/opengl/opengl.cpp
+++ b/Modules/opengl/opengl.cpp
@@ -39,9 +39,12 @@
@@ -59,16 +58,14 @@ index c87cde8..5df02e3 100644
// X11 includes
#include <X11/Xlib.h>
#include <X11/Xutil.h>
+#endif
+#endif // HAVE_X11
#include <openglconfig.h>
@@ -782,7 +785,8 @@ static QTreeWidgetItem *get_gl_info_glx(Display *dpy, int scrnum, Bool allowDire
}
@@ -783,6 +786,7 @@ static QTreeWidgetItem *get_gl_info_glx(Display *dpy, int scrnum, Bool allowDire
#endif
-#if KCM_HAVE_EGL
+#if KCM_HAVE_EGL
#if KCM_HAVE_EGL
+#if HAVE_X11
static QTreeWidgetItem *get_gl_info_egl(Display *dpy, int scrnum, QTreeWidgetItem *l1, QTreeWidgetItem *after)
{
@@ -86,9 +83,9 @@ index c87cde8..5df02e3 100644
QTreeWidgetItem *l1, *l2 = nullptr;
+#if HAVE_X11
static bool isX11 = QGuiApplication::platformName() == QStringLiteral("xcb");
+#endif
static bool isWayland = QGuiApplication::platformName().contains(QStringLiteral("wayland"));
static bool isX11 = QGuiApplication::platformName() == QLatin1String("xcb");
+#endif // HAVE_X11
static bool isWayland = QGuiApplication::platformName().contains(QLatin1String("wayland"));
QTreeWidgetItem *header = new QTreeWidgetItem();
@@ -955,6 +962,7 @@ bool GetInfo_OpenGL(QTreeWidget *treeWidget)
@@ -99,20 +96,14 @@ index c87cde8..5df02e3 100644
if (isX11) {
char *displayName = nullptr;
Display *dpy;
@@ -983,7 +991,7 @@ bool GetInfo_OpenGL(QTreeWidget *treeWidget)
l2 = get_gl_info_glx(dpy, scrnum, true, l1, l2);
if (l2) l2->setExpanded(true);
#endif
-#if KCM_HAVE_EGL
+#if KCM_HAVE_EGL && HAVE_X11
l2 = get_gl_info_egl(dpy, scrnum, l1, l2);
if (l2)
l2->setExpanded(true);
@@ -1000,6 +1008,7 @@ bool GetInfo_OpenGL(QTreeWidget *treeWidget)
#endif
XCloseDisplay(dpy);
}
+#endif
+#endif // HAVE_X11
if (isWayland) {
IsDirect = true;
--
2.21.0

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

@@ -38,8 +38,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "070a3dded608d815072c1bbd4e8c6a8d"
SRC_URI[sha256sum] = "e3bbc5e2baedf35dc8750c99e18c115b651f2665218a105c08177bc5250eb9b1"
SRC_URI[md5sum] = "b093ef4c0d7d0eccf5d26f18f8c3edb3"
SRC_URI[sha256sum] = "f9866450a795b6c458011de457f27e51258803459d5d384b7366f13f9a1c8d7e"
SRC_URI += "file://0001-fix-build-in-x11-less-environments.patch"
FILES_${PN} += " \

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

@@ -30,8 +30,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "3a79a1a3f8e4e136f13bea60b25c8c48"
SRC_URI[sha256sum] = "8e95b81b910e5e78689fc7d4427c813ba7d39426df24cf8606adb850913a19a4"
SRC_URI[md5sum] = "f93d66bb0e71bc70310bf64a5eaa4140"
SRC_URI[sha256sum] = "c8c433e8d4e3e13a5ace0ebc265756441aa01a07b1e68e45ce71387f128cc706"
# do not move so-libs to -dev package
FILES_SOLIBSDEV = ""

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

@@ -28,13 +28,13 @@ DEPENDS += "\
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "232f15146937ab39103ece84a251ee8d"
SRC_URI[sha256sum] = "ce35f554014cee819767180f0c9381d539e497edfb9c290b279fa78e9dea4bb0"
SRC_URI[md5sum] = "244d653fd0e529e71f14b512aba2fd89"
SRC_URI[sha256sum] = "9a1e689f0b8ac69fd9c471a5f4f54a846c1ec8a1914ab9b71754a81cd4c5d6ee"
FILES_${PN} += " \
${datadir}/k*_kscreen \
${datadir}/kservices5 \
${datadir}/icons \
${datadir}/plasma \
${datadir}/kpackage \
${OE_QMAKE_PATH_PLUGINS} \
"

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

@@ -29,8 +29,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "a18c1dc4a30c3caf6d93d41ec59395e3"
SRC_URI[sha256sum] = "5ed6fdeac9aaba014edf67c5f782fc210d58310d083afaa589d0ff1bb3e8e02d"
SRC_URI[md5sum] = "7c4bc920667746b600bc2238aa3f6fe6"
SRC_URI[sha256sum] = "2047e1dad90fd1c298ab23c7668fa60fd1189b1d232aca0ed5976d086ac1f3cb"
SRC_URI += "file://kde.pam"

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

@@ -21,5 +21,5 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "d702806d2d8fe05567a2984c83ae93d2"
SRC_URI[sha256sum] = "78eaa38ebbf888a8905e9385173e7161335041d6d07720283ce6f3fa06426a33"
SRC_URI[md5sum] = "434f0ba5e9a053f20a698048b1b8fa06"
SRC_URI[sha256sum] = "75ed318ebac038b6309b78f10dd1ef6e23935e93f7575372e2c2c4bbe607febb"

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

@@ -28,8 +28,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "b83947cb65e22df229f20cd67445ede3"
SRC_URI[sha256sum] = "5558977389cb1fac4a5ce52c9430b27d9d1ee92705ae1995d92bed5340477282"
SRC_URI[md5sum] = "0578f80427baae5d068855fcb9621070"
SRC_URI[sha256sum] = "4181535cc74f73c0a75fcf7a377595bd0381125a6f5537b116327b94402013d5"
# do not move so-libs to -dev package
FILES_SOLIBSDEV = ""

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

@@ -15,8 +15,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "0cee2bcca3edd8fd09c3c8b49c318430"
SRC_URI[sha256sum] = "4a12a8ed51973f9ea318a39a699523bcc99ae4e1cac932fccd19dedd45e758a8"
SRC_URI[md5sum] = "718cb60927e63eaecdfb02824d8f9fd5"
SRC_URI[sha256sum] = "224af4870be35075f4aec8bf9984eff7ef65d1656a2c5ca2ba1fdb5efcc574bc"
SRC_URI += " \
file://0001-use-pkgconfig-to-find-libgcrypt.patch \
"

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

@@ -10,11 +10,12 @@ inherit kde-plasma
DEPENDS += " \
kidletime \
kwindowsystem \
kguiaddons \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "bcd44ec98c9a8e6b99c703ea7eeef087"
SRC_URI[sha256sum] = "63724ecfb6db053ee949273979b393192309dbeed45b59bc193a605f90232282"
SRC_URI[md5sum] = "957501803ec62d7f09b0d728e2e5442f"
SRC_URI[sha256sum] = "6cf410dd8286e9d6b26e10d8ba297d36d13c93a329c463326b47f0bffeb3c4c2"
FILES_${PN} += " \
${OE_QMAKE_PATH_PLUGINS} \

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

@@ -54,8 +54,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "cc9ae0ee82ec8a61233d8e27bf6c0f37"
SRC_URI[sha256sum] = "7ff0e114e323ff7e10d78a157f8242b1d3cfa03967898d9e3fd3c039b7c9918b"
SRC_URI[md5sum] = "60bcf3538e6f2a086665d664647ec9b5"
SRC_URI[sha256sum] = "d99443978a0f5f12d93d1d877312144d9387762933e12ac614992ae6e92daed7"
SRC_URI += " \
file://0001-Make-building-of-QPA-wayland-plugin-an-option.patch \

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

@@ -16,8 +16,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "502147042e09b93e1beb59de354ef4bf"
SRC_URI[sha256sum] = "4b122099b0a362fc409b50b7523689ba8a112508dad26f58753c6b648e7c5313"
SRC_URI[md5sum] = "4fd6d7ae9258db3fa07e1ccf29919ccf"
SRC_URI[sha256sum] = "514bbfbd3e4ab1ea764eb61b5f62606f6359d74d55908ee7296ad8491fc6e361"
SRC_URI += " \
file://0001-fix-build-for-qtbase-without-session-management.patch \

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

@@ -10,8 +10,8 @@ inherit kde-plasma
DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 qtx11extras", "", d)}"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "148a75d94f3e53461f4c5480cf8beb83"
SRC_URI[sha256sum] = "fd2d1e849315ac745ecfe757d6b2c5cc6486e0be5397f686dae3916c0252c938"
SRC_URI[md5sum] = "87e862906d3b3abb7701f3b1e8e844f6"
SRC_URI[sha256sum] = "80f72afc9a2409dfe80853c007b596e4c1bcc92bee95741b894646ef3176dd7e"
SRC_URI += " \
file://0001-fix-configuration-build-on-x-less-systems.patch \

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

@@ -27,8 +27,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "7a7e8badf76dfbf13eaf7a0e15143e52"
SRC_URI[sha256sum] = "f09b99737a937df890ecdd2a33720b6cba3c79fc8bc17ef1470572748a6e1976"
SRC_URI[md5sum] = "c0ea69386308b1ee5d7cb6a9132161c1"
SRC_URI[sha256sum] = "87370f4c16ba489e988f39e53015a677b1e30070e79888b07f9826695ec7e9ac"
FILES_${PN} += " \
${datadir}/dbus-1 \

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

@@ -19,11 +19,12 @@ DEPENDS += " \
ki18n \
kdeclarative \
kservice \
kitemmodels \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "db48035caf98e4750598c888af5b0fe3"
SRC_URI[sha256sum] = "bfcdba29262dda9f386ee99132053ad5751194b2df8219899fcbb0b3699afcd5"
SRC_URI[md5sum] = "45424c10d6c9b8618653021981eab4ab"
SRC_URI[sha256sum] = "d8e94ecf18f2f41e3bcb66ae324996dc1db6c3addc4a506e060c7874c2764107"
FILES_${PN} += " \
${datadir}/k*5 \

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

@@ -25,8 +25,8 @@ DEPENDS += " \
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "9c5790a937b0eaaa71839318260f7659"
SRC_URI[sha256sum] = "0e85dcd874d2e69aaa2d4eefc379289c7dd572437f53e42f1d6d260d97c2f8a2"
SRC_URI[md5sum] = "174b329dcf9e2166a5b8129d911084d9"
SRC_URI[sha256sum] = "0ed752fc90634277d40f816a0ce0717b4708ced1e88596ab890112991c9614d2"
SRC_URI += "file://0001-kstyle-add-an-option-BUILD_OXYGEN_SETTINGS-disabled-.patch"
PACKAGECONFIG ??= ""
@@ -37,5 +37,6 @@ FILES_${PN} += " \
${datadir}/kservices5 \
${datadir}/kstyle \
${datadir}/plasma \
${datadir}/color-schemes \
${OE_QMAKE_PATH_PLUGINS} \
"

6
recipes-kde/plasma/untier/plasma-browser-integration/plasma-browser-integration.bb
View File

@@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING-GPL3;md5=d32239bcb673463ab874e80d47fae504"
inherit kde-plasma gettext
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "68045b252712dc5751c2693b5377d320"
SRC_URI[sha256sum] = "99269c7e27fddb0c075bff28a5afba41298dc8d28297d69f35f6bc30f3af1d35"
SRC_URI[md5sum] = "a9847228f5be4aa80ba8504e007c1585"
SRC_URI[sha256sum] = "2b91669492f30fa7fcc082e31499f99e93a21365e27ebae3a14ead7ddeaa28d4"
DEPENDS += " \
kauth-native \
@@ -19,6 +19,8 @@ DEPENDS += " \
krunner \
kwindowsystem \
kactivities \
kfilemetadata \
purpose \
"
# TBD split chrome/chromium/mozilla

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

@@ -50,8 +50,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "c5b2d1dc0e8cd28e34187f8b8b4f9193"
SRC_URI[sha256sum] = "49dc4c9eff5742eb52fc0d12c139c194eda837945389cd09f498a0c4c352a20f"
SRC_URI[md5sum] = "53d69ee0a4ae37c11c2eec8f2246dae6"
SRC_URI[sha256sum] = "f4a913a60fee4597a7a6c98a263f9a7a40f7663f3903b4042a7f90a686dc8aa0"
SRC_URI += "file://0001-Ensure-xkb_base-is-not-empty-instead-of-checking-if-.patch"

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

@@ -26,8 +26,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "fa75509c046177e39a1ab5013c444b23"
SRC_URI[sha256sum] = "635f109e7b59bb440c6be0c7a4baae70d2f44e659ab0522e170693b664e6d709"
SRC_URI[md5sum] = "ccba9f576c29c93cc2ac9a1c34baa28e"
SRC_URI[sha256sum] = "d6011bd9a94e6c8e96f9b0fbbf7f17d8170be93a24edb1e7b0ff6ac6e28429ff"
FILES_${PN} += " \
${datadir}/kconf_update \

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

@@ -45,8 +45,8 @@ DEPENDS += " \
# MobileBroadbandProviderInfo
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "4d28d46f277ffea2c414fa81b09f250a"
SRC_URI[sha256sum] = "b519429bd784ff2ede0bf10e1e943822ef08ea5cf85e901363fda36d32907460"
SRC_URI[md5sum] = "2db55f5ed7e5d8259cdd87bb578d4cc8"
SRC_URI[sha256sum] = "322516acabb5a49c613f951c5049f6a15edf2b54340f08bca3c86a5b1bd6e56b"
# do not move so-libs to -dev package
FILES_SOLIBSDEV = ""

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

@@ -25,8 +25,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "4a0a12682ed962fd12133ec446da95af"
SRC_URI[sha256sum] = "e029563d50cc6266a4a3e22574c33fef4670e1aaab18630eb30769e2167acc96"
SRC_URI[md5sum] = "d3e3b38c3a615973bdb35d41cc58010c"
SRC_URI[sha256sum] = "da660d75ea0a4589ee3730a2697665c791e6525f35813cbf90c48408607b1ee6"
FILES_SOLIBSDEV = ""

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

@@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = " \
inherit kde-plasma gtk-icon-cache
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "57b1bd74fa915a598f0a5ed4d779e044"
SRC_URI[sha256sum] = "2bb40a80c35f3eaedc729013a8b6b76641cc74eca4fd171f1cda99237f83198c"
SRC_URI[md5sum] = "a7b870fda91ecdf386999ee765613756"
SRC_URI[sha256sum] = "d63cba4e3a89a10571f120d75405a837964c0176351ce78bed04f58b37f58fd6"
DEPENDS += " \
kauth-native \

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

@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \
inherit kde-plasma
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "86e6cc11c250989db93b28fbb60e26e6"
SRC_URI[sha256sum] = "ff6e0eac42c540c72556439e6477fb78be2dab456386218813cce021f82d42d9"
SRC_URI[md5sum] = "b68a7d75f28d7a4516cbfaee24d93733"
SRC_URI[sha256sum] = "67d3e69d9ad6292cf6b70ab7f35fe0a88d2a626efd0a1c4fa70b5c0049d1c973"
FILES_${PN} += "${datadir}/wallpapers"

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

@@ -23,8 +23,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "0f96c52bd63db5aa8a88ed65a0221bee"
SRC_URI[sha256sum] = "6f7a17990d72bb25c93acae919b764f95ac226754209b2e177075fbe9251f95f"
SRC_URI[md5sum] = "d4fa5ba078399cefd65fe7c70619b546"
SRC_URI[sha256sum] = "9bbe7faa06a25768ba5dcdb3a084afeb8d9d3e284388d0c6138bd4cd51a418f0"
SRC_URI += "file://0001-fix-build-for-QT_NO_SESSIONMANAGER.patch"

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

@@ -30,8 +30,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "401c025a70eadf4ef2b5d37ea0b3feed"
SRC_URI[sha256sum] = "ac868f31df8c6bcc6b1c850efa0640695ba698caabefcb21fc0b0c3405712139"
SRC_URI[md5sum] = "3802dd3c22a4347fcf0299136d551705"
SRC_URI[sha256sum] = "ea0ebd64c9f315f890421ae2ff0d7d756b61071331868ff9a63e47a9cba59fe5"
FILES_${PN} += " \
${datadir}/k*5 \

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

@@ -22,8 +22,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "c8ec664a7e6a23e92da49d29a021e940"
SRC_URI[sha256sum] = "4220d18f1a04c767649bffee1aed6c2b2c12c60cd7d6ca6fabc3dbec1ec3f127"
SRC_URI[md5sum] = "f1bb8fddb7e34ad3f4d38f02bb989461"
SRC_URI[sha256sum] = "3ab6da7692df4b35c088f45657dfe2430797021c7c7fd6091747d7fd9ca594d7"
RDEPENDS_${PN} = "sddm"

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

@@ -33,8 +33,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "9cd1d822965b7c2d46b7ef4c0de383a2"
SRC_URI[sha256sum] = "57944cf3f566cf5e25d5859f5716b2ad5dbd87de259f8d77efdfdd50a16fe1ec"
SRC_URI[md5sum] = "9073fc9e8d64bcd255b2ff4f49586b4e"
SRC_URI[sha256sum] = "7b3d93bd3cd4c33b878aabff4bd9c8134ca7395a0290e59260464cf5d69f17f3"
FILES_${PN} += " \
${datadir}/k*5 \

4
recipes-kde/plasma/untier/user-manager/user-manager.bb
View File

@@ -16,8 +16,8 @@ DEPENDS += " \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "7cd7c3836a96cf875f4c5607e5455e0b"
SRC_URI[sha256sum] = "e9df3ec2718de68b0b46d0b86f993fe450b236e13dda6219f350121f08f4c468"
SRC_URI[md5sum] = "b5f5abce69256003a1fe918e0d23986d"
SRC_URI[sha256sum] = "659fab189915140e136c426d6a22852f9685ab85f1fec07a44faaa7a663c8d3d"
FILES_${PN} += " \
${datadir}/kservices5 \