kde-plasma: update 5.11.5 -> 5.12.0
Note: plasma-wayland does not start yet due to wrong path of qdbus. Will fix soon... Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
inherit kde-base
|
||||
|
||||
PLASMA_VERSION = "5.11.5"
|
||||
PLASMA_VERSION = "5.12.0"
|
||||
|
||||
SRC_URI = "${KDE_MIRROR}/stable/plasma/${PV}/${BPN}-${PV}.tar.xz"
|
||||
|
||||
|
||||
@@ -5,5 +5,5 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
|
||||
inherit kde-plasma
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "3e9f72dd149ad349c9597b011934bdbf"
|
||||
SRC_URI[sha256sum] = "2da1be7a61e9c941cd3e2b01ee8e6bce1012bb2acf10ba6cc9014ee739ae8942"
|
||||
SRC_URI[md5sum] = "a6b40fb070bfd2ff654f79e9f29ba9a1"
|
||||
SRC_URI[sha256sum] = "d75efdc5a64e0fd11cb54666bdb403fbe53077049d8ee49c174fd06e98aa092b"
|
||||
|
||||
@@ -24,8 +24,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "f3d374ff2b8b9a34f157031405c7fb96"
|
||||
SRC_URI[sha256sum] = "a064fd59894947c21e17659dbb0b63f67d9f465142fb2c4232094fc22faed686"
|
||||
SRC_URI[md5sum] = "cdf27e2f82b810dfb5aeed367297de5a"
|
||||
SRC_URI[sha256sum] = "7965611894fb368387ba6626f4d3b33900775031019bfb1449d120973c380720"
|
||||
SRC_URI += "file://0001-replace-try_run-by-try_compile-in-compiler-feature-c.patch"
|
||||
|
||||
# Workaround
|
||||
@@ -36,6 +36,7 @@ FILES_SOLIBSDEV = ""
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/k*5 \
|
||||
${datadir}/dbus-1 \
|
||||
${libdir}/libkactivitymanagerd_plugin.so \
|
||||
${OE_QMAKE_PATH_PLUGINS} \
|
||||
"
|
||||
|
||||
@@ -107,7 +107,7 @@ index ec117f3..93791b2 100644
|
||||
ShellManager::s_fixedShell = cliOptions.value(shellPluginOption);
|
||||
|
||||
diff --git a/xembed-sni-proxy/main.cpp b/xembed-sni-proxy/main.cpp
|
||||
index aa1d7f3..26ff777 100644
|
||||
index 1ae9b91..8a3bc39 100644
|
||||
--- a/xembed-sni-proxy/main.cpp
|
||||
+++ b/xembed-sni-proxy/main.cpp
|
||||
@@ -19,7 +19,9 @@
|
||||
@@ -120,7 +120,7 @@ index aa1d7f3..26ff777 100644
|
||||
|
||||
#include "fdoselectionmanager.h"
|
||||
|
||||
@@ -47,12 +49,13 @@ int main(int argc, char ** argv)
|
||||
@@ -49,11 +51,13 @@ int main(int argc, char ** argv)
|
||||
qFatal("xembed-sni-proxy is only useful XCB. Aborting");
|
||||
}
|
||||
|
||||
@@ -130,11 +130,10 @@ index aa1d7f3..26ff777 100644
|
||||
};
|
||||
QObject::connect(&app, &QGuiApplication::commitDataRequest, disableSessionManagement);
|
||||
QObject::connect(&app, &QGuiApplication::saveStateRequest, disableSessionManagement);
|
||||
-
|
||||
+#endif
|
||||
|
||||
app.setDesktopSettingsAware(false);
|
||||
app.setQuitOnLastWindowClosed(false);
|
||||
|
||||
--
|
||||
2.9.3
|
||||
|
||||
|
||||
@@ -10,43 +10,23 @@ Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
startkde/startplasmacompositor.cmake | 16 ++++------------
|
||||
1 file changed, 4 insertions(+), 12 deletions(-)
|
||||
startkde/startplasmacompositor.cmake | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake
|
||||
index 5bcf26a..6252d79 100644
|
||||
index 8ac47aa..d29ce16 100644
|
||||
--- a/startkde/startplasmacompositor.cmake
|
||||
+++ b/startkde/startplasmacompositor.cmake
|
||||
@@ -4,17 +4,9 @@
|
||||
@@ -3,6 +3,9 @@
|
||||
# DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ )
|
||||
#
|
||||
|
||||
# in case we have been started with full pathname spec without being in PATH
|
||||
-bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
|
||||
-if [ -n "$bindir" ]; then
|
||||
- qbindir=`qtpaths --binaries-dir`
|
||||
- qdbus=$qbindir/qdbus
|
||||
- case $PATH in
|
||||
- $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
|
||||
- *) PATH=$bindir:$PATH; export PATH;;
|
||||
- esac
|
||||
-else
|
||||
- qdbus=qdbus
|
||||
-fi
|
||||
+
|
||||
+# meta-qt5 specific
|
||||
+qdbus=@OE_QMAKE_PATH_QT_BINS@/qdbus
|
||||
|
||||
+
|
||||
# We need to create config folder so we can write startupconfigkeys
|
||||
if [ ${XDG_CONFIG_HOME} ]; then
|
||||
@@ -148,7 +140,7 @@ fi
|
||||
# better use the Autostart folder.
|
||||
|
||||
# TODO: Use GenericConfigLocation once we depend on Qt 5.4
|
||||
-scriptpath=`qtpaths --paths ConfigLocation | tr ':' '\n' | sed 's,$,/plasma-workspace,g'`
|
||||
+scriptpath=`@OE_QMAKE_PATH_QT_BINS@/qtpaths --paths ConfigLocation | tr ':' '\n' | sed 's,$,/plasma-workspace,g'`
|
||||
|
||||
# Add /env/ to the directory to locate the scripts to be sourced
|
||||
for prefix in `echo $scriptpath`; do
|
||||
configDir=$XDG_CONFIG_HOME;
|
||||
--
|
||||
2.7.4
|
||||
2.14.3
|
||||
|
||||
|
||||
@@ -40,7 +40,6 @@ DEPENDS += " \
|
||||
kwin \
|
||||
kpackage-native \
|
||||
kdoctools-native \
|
||||
kjsembed-native \
|
||||
sonnet-native \
|
||||
kdesignerplugin-native \
|
||||
kdelibs4support-native \
|
||||
@@ -49,8 +48,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "ae474cb87f328e9c1e7646e5a393c17a"
|
||||
SRC_URI[sha256sum] = "28556c8e1627ccf9f2d0c87159951b73ee2102c12f03e475498056b10da3f3c6"
|
||||
SRC_URI[md5sum] = "83b59db9049abe5122f074fa47f2deda"
|
||||
SRC_URI[sha256sum] = "d5e58c98a43eec206396cd7d3b1d3008c6edba07e9e92c593c24d321f13548b3"
|
||||
|
||||
SRC_URI += " \
|
||||
file://0001-fix-build-for-QT_NO_SESSIONMANAGER.patch \
|
||||
@@ -104,6 +103,7 @@ FILES_${PN}-dev = " \
|
||||
${libdir}/libplasma-geolocation-interface.so \
|
||||
${libdir}/libtaskmanager.so \
|
||||
${libdir}/liblegacytaskmanager.so \
|
||||
${libdir}/libcolorcorrect.so \
|
||||
"
|
||||
|
||||
# startkde/startplasmacompositor require:
|
||||
|
||||
@@ -8,7 +8,6 @@ inherit kde-plasma gettext
|
||||
|
||||
DEPENDS += " \
|
||||
kauth-native \
|
||||
kded-native \
|
||||
kcoreaddons \
|
||||
kcoreaddons-native \
|
||||
kwidgetsaddons \
|
||||
@@ -26,8 +25,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "58820e51e6671540c1d07858ca441391"
|
||||
SRC_URI[sha256sum] = "059a2372839c8687ebfbf6268dc28847000ec5993f6528ecbed40a977170ed77"
|
||||
SRC_URI[md5sum] = "558e7d9ca66ca00774978fc72fb0305e"
|
||||
SRC_URI[sha256sum] = "de009f6c440cc89cdb6ca0c16e60d49bf419b1a195a5bb49b0316275619254ee"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/bluedevilwizard \
|
||||
|
||||
@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = " \
|
||||
inherit kde-plasma
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "93bab2eac8ce342cb8a0f79ac045bb54"
|
||||
SRC_URI[sha256sum] = "1867bff15e5614d2b244a6c3938fef3c86ac09395e78da97aa391618f10b6d56"
|
||||
SRC_URI[md5sum] = "13a966613d032b6f729cf47b8e7cf8fa"
|
||||
SRC_URI[sha256sum] = "63bb840dc97e4be3fce91da4d1ac18492b7d2f969e39657e1ef2f60565465f19"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/kconf_update \
|
||||
|
||||
@@ -9,8 +9,8 @@ inherit kde-plasma
|
||||
DEPENDS += "plymouth"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "957da865be8f9664b4ec5bf19ca2ad37"
|
||||
SRC_URI[sha256sum] = "236605aa905261d6cc21b3900353c1d1a7d4c33946b8d0930cc7fe8d75ceae79"
|
||||
SRC_URI[md5sum] = "1a12b934d9ff1b1a3dfe47721d655704"
|
||||
SRC_URI[sha256sum] = "2f9c47e4121df3fb0e74cd18481981c2c8473eb911685ff96a457c24e1319fb5"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/plymouth \
|
||||
|
||||
@@ -27,8 +27,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "16784b990e3957e1a7188b7a01a1769d"
|
||||
SRC_URI[sha256sum] = "e14aa4b6b39a44b62f77bc22a486fe8f85adb1cd52ef1c98b7c4b5793bb4bc77"
|
||||
SRC_URI[md5sum] = "7f2ffab6dbe75d6557d5bbb2c7b6991c"
|
||||
SRC_URI[sha256sum] = "7272e96d1b0c81cb8384e99a334bb3c94aed90637c9b88e00241d9e0ed8470bc"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/color-schemes \
|
||||
|
||||
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = " \
|
||||
inherit kde-plasma gtk-icon-cache
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "0878b7e1ea8c313a8585de393509610c"
|
||||
SRC_URI[sha256sum] = "b4cec7b23ee43b8c6caa2cb69ebbab903ce64351d846288eeb3afb1a25b9ba7b"
|
||||
SRC_URI[md5sum] = "0eb2c15cddcf89fe4dc26cfc1a590d3c"
|
||||
SRC_URI[sha256sum] = "c20b740ce79226139fece42f5e2d9fb3407485a62e7d0a76e5709229d2cf8eaa"
|
||||
|
||||
DEPENDS += " \
|
||||
attica \
|
||||
|
||||
@@ -26,8 +26,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "0b4cf75e26cdd4d2375779b1a2b58f40"
|
||||
SRC_URI[sha256sum] = "0c5d4618a6d1cf1dd7912d9c575a1984f934cfc18f9a2ba7b7911b7c81198d34"
|
||||
SRC_URI[md5sum] = "5bfe54da343ae0a3817d68cf7d0981b5"
|
||||
SRC_URI[sha256sum] = "9e27eff6a73935b504d7a8fbf35dd8fba353943da0378df6c2f0422c07bf7288"
|
||||
|
||||
# do not move so-libs to -dev package
|
||||
FILES_SOLIBSDEV = ""
|
||||
|
||||
@@ -1,118 +0,0 @@
|
||||
From fe467f6b549ce608702ceb89696b4de59bc0d70e Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Thu, 5 Feb 2015 22:30:09 +0100
|
||||
Subject: [PATCH] fix for gtk2 only and gtk3 only 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>
|
||||
---
|
||||
CMakeLists.txt | 19 +++++++++++++++++--
|
||||
config-gtk.h.cmake | 2 ++
|
||||
gtk3proxies/CMakeLists.txt | 1 -
|
||||
gtkproxies/CMakeLists.txt | 2 --
|
||||
src/appearencegtk.cpp | 5 +++++
|
||||
5 files changed, 24 insertions(+), 5 deletions(-)
|
||||
create mode 100644 config-gtk.h.cmake
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 0605c02..48d4958 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -29,11 +29,12 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY
|
||||
# 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
|
||||
@@ -44,6 +45,16 @@ set(kcm_SRCS
|
||||
src/fontshelpers.cpp
|
||||
)
|
||||
|
||||
+if(GTK2_FOUND)
|
||||
+set(kcm_SRCS ${kcm_SRCS} src/appearancegtk2.cpp)
|
||||
+endif()
|
||||
+
|
||||
+if(GTK3_FOUND)
|
||||
+set(kcm_SRCS ${kcm_SRCS} src/appearancegtk3.cpp)
|
||||
+endif()
|
||||
+
|
||||
+configure_file(config-gtk.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-gtk.h)
|
||||
+
|
||||
ki18n_wrap_ui(kcm_SRCS
|
||||
src/ui/gui.ui
|
||||
src/ui/dialog_installer.ui
|
||||
@@ -59,8 +70,12 @@ install(TARGETS kcm_kdegtkconfig DESTINATION ${PLUGIN_INSTALL_DIR})
|
||||
install(FILES cgctheme.knsrc cgcgtk3.knsrc DESTINATION ${CONFIG_INSTALL_DIR})
|
||||
install(FILES kde-gtk-config.desktop DESTINATION ${SERVICES_INSTALL_DIR})
|
||||
|
||||
+if(GTK2_FOUND)
|
||||
add_subdirectory(gtkproxies)
|
||||
+endif()
|
||||
+if(GTK3_FOUND)
|
||||
add_subdirectory(gtk3proxies)
|
||||
+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
|
||||
--- /dev/null
|
||||
+++ b/config-gtk.h.cmake
|
||||
@@ -0,0 +1,2 @@
|
||||
+#define HAVE_GTK2 ${GTK2_FOUND}
|
||||
+#define HAVE_GTK3 ${GTK3_FOUND}
|
||||
diff --git a/gtk3proxies/CMakeLists.txt b/gtk3proxies/CMakeLists.txt
|
||||
index f22793a..6bced8c 100644
|
||||
--- a/gtk3proxies/CMakeLists.txt
|
||||
+++ b/gtk3proxies/CMakeLists.txt
|
||||
-find_package(GTK3 REQUIRED)
|
||||
-
|
||||
diff --git a/gtkproxies/CMakeLists.txt b/gtkproxies/CMakeLists.txt
|
||||
index fe8e1a0..2524567 100644
|
||||
--- a/gtkproxies/CMakeLists.txt
|
||||
+++ b/gtkproxies/CMakeLists.txt
|
||||
@@ -1,5 +1,3 @@
|
||||
-find_package(GTK2 REQUIRED)
|
||||
-
|
||||
include_directories(${GTK2_INCLUDE_DIRS})
|
||||
|
||||
add_executable(reload_gtk_apps reload.c)
|
||||
diff --git a/src/appearencegtk.cpp b/src/appearencegtk.cpp
|
||||
index 9dee2d5..51a7aac 100644
|
||||
--- a/src/appearencegtk.cpp
|
||||
+++ b/src/appearencegtk.cpp
|
||||
@@ -22,14 +22,19 @@
|
||||
|
||||
#include "appearencegtk.h"
|
||||
#include <QDirIterator>
|
||||
+#include <config-gtk.h>
|
||||
#include "abstractappearance.h"
|
||||
#include "appearancegtk2.h"
|
||||
#include "appearancegtk3.h"
|
||||
|
||||
AppearenceGTK::AppearenceGTK()
|
||||
{
|
||||
+#if HAVE_GTK2
|
||||
m_app << new AppearanceGTK2;
|
||||
+#endif
|
||||
+#if HAVE_GTK3
|
||||
m_app << new AppearanceGTK3;
|
||||
+#endif
|
||||
}
|
||||
|
||||
AppearenceGTK::~AppearenceGTK()
|
||||
--
|
||||
1.9.3
|
||||
|
||||
@@ -12,6 +12,7 @@ inherit kde-plasma distro_features_check gettext
|
||||
DEPENDS += " \
|
||||
gtk+ \
|
||||
gtk+3 \
|
||||
gsettings-desktop-schemas \
|
||||
ki18n \
|
||||
kauth-native \
|
||||
kconfig-native \
|
||||
@@ -23,10 +24,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "196dc596b29d8e483ef774cda8175728"
|
||||
SRC_URI[sha256sum] = "860690cd19868af76ccc887f656c416f6985e4178302de01f8e26e8a058a32f9"
|
||||
|
||||
SRC_URI += "file://0001-fix-for-gtk2-only-and-gtk3-only-environments.patch"
|
||||
SRC_URI[md5sum] = "bb779d08536e9cfe2b7d5ba546d1a8f6"
|
||||
SRC_URI[sha256sum] = "eaac67c464d52342c17cd36eb88ed1441f0acb17399174ea9299b7564ffdb594"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/kservices5 \
|
||||
|
||||
@@ -36,14 +36,19 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "a7043d6fe18e82de60aa338ed4cc033d"
|
||||
SRC_URI[sha256sum] = "242d78f853ed0128e062ed402bc79f4aa0dbb04d08fb9b75e131f3a2e2c9e9ee"
|
||||
SRC_URI[md5sum] = "13a375d9be77841c7124855113b8ee31"
|
||||
SRC_URI[sha256sum] = "1717f67907faee002006d4c11b95ec0100afbc6c0794aae065f1e226999fc49d"
|
||||
|
||||
FILES_SOLIBSDEV = " \
|
||||
${libdir}/libplasma*core${SOLIBSDEV} \
|
||||
"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/kwin \
|
||||
${datadir}/k*5 \
|
||||
${datadir}/plasma \
|
||||
${datadir}/icons \
|
||||
${libdir}/libplasma*private.so \
|
||||
\
|
||||
${OE_QMAKE_PATH_PLUGINS} \
|
||||
${OE_QMAKE_PATH_QML} \
|
||||
|
||||
@@ -19,8 +19,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "a5d534866dac78e68e708bb2501f3c5b"
|
||||
SRC_URI[sha256sum] = "efa55bf9cc81c8c94c1ed8d8df9f72da74f29789927ced6cc0458a6243e9749b"
|
||||
SRC_URI[md5sum] = "3bb9f80fefe3938e7e8626ddd6bf91ff"
|
||||
SRC_URI[sha256sum] = "523767048e98ceaeb7425409f692fb60a53e2e56ca8b2a99cf6fc2442c7baded"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/kgamma \
|
||||
|
||||
@@ -31,8 +31,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "29687644bb710d29c3a7700398cd305e"
|
||||
SRC_URI[sha256sum] = "70d73eba6182574060277ee7ae5cf32626fe1e057861f199f92faee226963e14"
|
||||
SRC_URI[md5sum] = "54fe5f95acee92903cdc4fc95bba1b42"
|
||||
SRC_URI[sha256sum] = "2176032215369c9c4f3b5ac6a23c7c27d7fd2fc8f9082e9d9e555ed33771365c"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/kservices5 \
|
||||
|
||||
@@ -39,8 +39,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "b68af09d43a44fbbf1029572d37a855f"
|
||||
SRC_URI[sha256sum] = "2e36ac5817ca8fbba264ae2ba0061b97ae740690525160296ba823328989a77a"
|
||||
SRC_URI[md5sum] = "4b6125ce37423a9c492851e8f0b2e969"
|
||||
SRC_URI[sha256sum] = "8001d61ad6adf705b46df3e829369e478a2803e17545e71850c84393764450de"
|
||||
SRC_URI += "file://0001-fix-build-in-x11-less-environments.patch"
|
||||
|
||||
FILES_${PN} += " \
|
||||
|
||||
@@ -29,8 +29,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "8613209fd7d4a9d3a4dd93d7e7f9dbb8"
|
||||
SRC_URI[sha256sum] = "8c4f847c7ce6dfb97094deacf2a3b84adc67826f3baf54f10bbf8a19ca840472"
|
||||
SRC_URI[md5sum] = "e305b211d3952cf55ca3ec6bf51f4ccf"
|
||||
SRC_URI[sha256sum] = "89bb3e5da54e671fd1a30b5867da3534aa5efb6d97cb558a8660ecc5f4894509"
|
||||
|
||||
# do not move so-libs to -dev package
|
||||
FILES_SOLIBSDEV = ""
|
||||
|
||||
@@ -24,8 +24,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "b8d2c7a7b6910fbf84ee1deae0c74863"
|
||||
SRC_URI[sha256sum] = "87fd9d54f760288ada59d33fcd8eca92fa761eb54d6b90424815a28d341e4261"
|
||||
SRC_URI[md5sum] = "f44a118c076e0206aaf32db6aff04855"
|
||||
SRC_URI[sha256sum] = "9b661ef8a21a4a5bfc47e76f92c62c6893da4081de12eac07e549a87c14a9cfb"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/kcm_kscreen \
|
||||
|
||||
@@ -29,8 +29,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "f8f9ecfc8c7360a81a0aae0043974306"
|
||||
SRC_URI[sha256sum] = "5f59936eba34b57068d265d823e4525cb7ab7a81c8e7b954c8b6eeda25f22b63"
|
||||
SRC_URI[md5sum] = "999596234804613587394534a6380250"
|
||||
SRC_URI[sha256sum] = "5c6002ba33e2337cfc05076bbaf58416a6f7f0a88663ccd806262e6fbb365383"
|
||||
|
||||
SRC_URI += "file://kde.pam"
|
||||
|
||||
|
||||
@@ -21,5 +21,5 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "5119a44879792c7efc4b10cc24843933"
|
||||
SRC_URI[sha256sum] = "a26e241584374fd58ca88ada2069e60388cc7e7b9f0929befec0f61483334e22"
|
||||
SRC_URI[md5sum] = "83333827bfd8c26540774345713fc0c2"
|
||||
SRC_URI[sha256sum] = "0cfc7925ca124264a7b00f3ca78c1900010071b4eaa39e66e72d79f7d52ebc50"
|
||||
|
||||
@@ -28,8 +28,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "98760ac4fe635ce66067077287ac582d"
|
||||
SRC_URI[sha256sum] = "d1a88bef03c75993eab0b422f547adab2a1e17d6eec791e7d3542ec275652b98"
|
||||
SRC_URI[md5sum] = "748965e53733a9086a860fe665f35008"
|
||||
SRC_URI[sha256sum] = "0b20c687cb5e0d2e5959e942ce05c9122e5b59f36bb05410f1d1b6a2b802746b"
|
||||
|
||||
# do not move so-libs to -dev package
|
||||
FILES_SOLIBSDEV = ""
|
||||
|
||||
@@ -14,8 +14,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "fae875d4ca60a24053db8d7b35f9fc92"
|
||||
SRC_URI[sha256sum] = "84a9b2dcb48c35287f7f71b0bb392ca2a41159c5b05a72ec139f32bebf561673"
|
||||
SRC_URI[md5sum] = "703a774c30e08417695b0825530f99b4"
|
||||
SRC_URI[sha256sum] = "4ab3ed4d673812624571d5e77c4391f0d808286aa811d33f2270d6ee42899597"
|
||||
SRC_URI += " \
|
||||
file://0001-use-pkgconfig-to-find-libgcrypt.patch \
|
||||
"
|
||||
|
||||
@@ -13,8 +13,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "5205e43b7154e54c4fc338bbacecf352"
|
||||
SRC_URI[sha256sum] = "fae66ee78655770f1c40444899398316b7509481b38d5df7b3ab425afd7f3a76"
|
||||
SRC_URI[md5sum] = "90e585f751d7a62385959e5eb81205c7"
|
||||
SRC_URI[sha256sum] = "4e0ba30eb0d37884dc0951b2c797b7ff054be34432da414346db3deaf5c42c5f"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${OE_QMAKE_PATH_PLUGINS} \
|
||||
|
||||
@@ -65,10 +65,10 @@ index 6852390..efa2e82 100644
|
||||
|
||||
void Workspace::addSessionInfo(KConfigGroup &cg)
|
||||
diff --git a/workspace.cpp b/workspace.cpp
|
||||
index 078f79f..24b3219 100644
|
||||
index 02ccf5a..3c83ec1 100644
|
||||
--- a/workspace.cpp
|
||||
+++ b/workspace.cpp
|
||||
@@ -159,10 +159,12 @@ Workspace::Workspace(const QString &sessionKey)
|
||||
@@ -152,10 +152,12 @@ Workspace::Workspace(const QString &sessionKey)
|
||||
|
||||
delayFocusTimer = 0;
|
||||
|
||||
@@ -81,8 +81,8 @@ index 078f79f..24b3219 100644
|
||||
|
||||
RuleBook::create(this)->load();
|
||||
|
||||
@@ -266,7 +268,9 @@ void Workspace::init()
|
||||
|
||||
@@ -397,7 +399,9 @@ void Workspace::initWithX11()
|
||||
// TODO: only in X11 mode
|
||||
// Extra NETRootInfo instance in Client mode is needed to get the values of the properties
|
||||
NETRootInfo client_info(connection(), NET::ActiveWindow | NET::CurrentDesktop);
|
||||
+#ifndef QT_NO_SESSIONMANAGER
|
||||
@@ -91,21 +91,19 @@ index 078f79f..24b3219 100644
|
||||
m_initialDesktop = client_info.currentDesktop();
|
||||
if (!VirtualDesktopManager::self()->setCurrent(m_initialDesktop))
|
||||
VirtualDesktopManager::self()->setCurrent(1);
|
||||
@@ -288,9 +292,10 @@ void Workspace::init()
|
||||
active_client = NULL;
|
||||
@@ -406,7 +410,9 @@ void Workspace::initWithX11()
|
||||
rootInfo->setActiveWindow(None);
|
||||
focusToNull();
|
||||
|
||||
+#ifndef QT_NO_SESSIONMANAGER
|
||||
if (!qApp->isSessionRestored())
|
||||
++block_focus; // Because it will be set below
|
||||
-
|
||||
+#endif
|
||||
{
|
||||
// Begin updates blocker block
|
||||
StackingUpdatesBlocker blocker(this);
|
||||
@@ -353,7 +358,10 @@ void Workspace::init()
|
||||
} // End updates blocker block
|
||||
++block_focus; // Because it will be set below
|
||||
|
||||
{
|
||||
@@ -472,7 +478,10 @@ void Workspace::initWithX11()
|
||||
|
||||
// TODO: only on X11?
|
||||
AbstractClient* new_active_client = nullptr;
|
||||
- if (!qApp->isSessionRestored()) {
|
||||
+#ifndef QT_NO_SESSIONMANAGER
|
||||
|
||||
@@ -11,6 +11,7 @@ inherit kde-plasma distro_features_check gettext
|
||||
|
||||
DEPENDS += " \
|
||||
libinput \
|
||||
qtsensors \
|
||||
\
|
||||
kauth-native \
|
||||
kconfig \
|
||||
@@ -55,8 +56,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "260bd4365a58a14abcb860b34c05ef5d"
|
||||
SRC_URI[sha256sum] = "9fb0db84fd13568a0dcae7d1fdd3e72e5bbb80120d374941043d4474ea167f19"
|
||||
SRC_URI[md5sum] = "1f0f4de8a67d01e2002020acd625e5a8"
|
||||
SRC_URI[sha256sum] = "73f6cec78dd3cd76caf26ba57f3d3deed94ad37458ed4aea70752eaffa5664c0"
|
||||
|
||||
SRC_URI += " \
|
||||
file://0001-fix-build-for-qtbase-without-session-management.patch \
|
||||
|
||||
@@ -16,8 +16,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "124663bcbd28d4f5640740c1888068ff"
|
||||
SRC_URI[sha256sum] = "7b69d365b39d9af4f52faddcdeeffa1c53bea9b873365b0d476b557555d8a56b"
|
||||
SRC_URI[md5sum] = "199752dc365edb0b5e0b43bb3489d168"
|
||||
SRC_URI[sha256sum] = "385e8a9f2099856527686a418f11905a78705f20764f6dd9f7fa0f5065dc822b"
|
||||
|
||||
SRC_URI += " \
|
||||
file://0001-fix-build-for-qtbase-without-session-management.patch \
|
||||
|
||||
@@ -12,8 +12,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "f1602fa8322df31489c6cf4fd0767f02"
|
||||
SRC_URI[sha256sum] = "eff3b06114777f9b237d378ab7ceeb17220a64ddaab5f01697534872fec9960d"
|
||||
SRC_URI[md5sum] = "deeaa6f31b5729a7c6e23e721b8ff585"
|
||||
SRC_URI[sha256sum] = "9b9752e7ead91982a84ff064a64836ba824919db1ac4122a5a73d2f5ba8dab73"
|
||||
|
||||
SRC_URI += " \
|
||||
file://0001-fix-configuration-build-on-x-less-systems.patch \
|
||||
|
||||
@@ -28,8 +28,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "762dd0f2ef0be5cb7b4528f90b04df68"
|
||||
SRC_URI[sha256sum] = "ae08b4652db9febfb2d9ed040999b66303351106322a5c87ebfd7e3c3ff15738"
|
||||
SRC_URI[md5sum] = "f213339a4157799529a0cd34d5b435f7"
|
||||
SRC_URI[sha256sum] = "899c35ed3f33c86286d425e54f9a0395c16bdfd8ab4a73893b359c2be2b5246c"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/dbus-1 \
|
||||
|
||||
@@ -22,8 +22,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "f6c06837b5f95dfb8fa7d5fb6a91c39c"
|
||||
SRC_URI[sha256sum] = "0aed7e0ff132646e1261b7951ed5a9145cd6e4b2a2e957c7dac76c8e8c514749"
|
||||
SRC_URI[md5sum] = "d7ffe201951a4fd98e236bf131eca595"
|
||||
SRC_URI[sha256sum] = "3c95f4e1267e3539be09ee54336097a6ca3fe2af74d0234ea54c930999739bf6"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/k*5 \
|
||||
|
||||
@@ -25,8 +25,8 @@ DEPENDS += " \
|
||||
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "9a4faa8fd81dfd9112418b4ca0f15f63"
|
||||
SRC_URI[sha256sum] = "4888902421eadfa690644f8f16b4a6b25b73bca558be947c745d0000d4c85dd8"
|
||||
SRC_URI[md5sum] = "377a3d33bf3c5b6447b7d7d42fd5294f"
|
||||
SRC_URI[sha256sum] = "0d3aee5cbb72178cf5476439ba6febe5cfd103dd4b96ec5463e98502b567245b"
|
||||
SRC_URI += "file://0001-kstyle-add-an-option-BUILD_OXYGEN_SETTINGS-disabled-.patch"
|
||||
|
||||
PACKAGECONFIG ??= ""
|
||||
|
||||
@@ -50,8 +50,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "e9927bb7a2d4caf00d510e7116a0d603"
|
||||
SRC_URI[sha256sum] = "63c10665b0c3e83f999b2fef7d9caae65ccaa995678ea8606d2a835c01d25f36"
|
||||
SRC_URI[md5sum] = "10b85c87d647562f92f5861062761dc4"
|
||||
SRC_URI[sha256sum] = "7a9f575f8d7c77c176e8bec9e3f3f41f4020055443bc25f79727c9570d494d90"
|
||||
|
||||
SRC_URI += "file://0001-Ensure-xkb_base-is-not-empty-instead-of-checking-if-.patch"
|
||||
|
||||
|
||||
@@ -26,8 +26,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "befb9b9a5f9e504ab788a3aa02ffb06e"
|
||||
SRC_URI[sha256sum] = "c14548690d918c2b1297ebe7a7982e85fb8f4a23c95a1704657867ea4044b8e6"
|
||||
SRC_URI[md5sum] = "9a96cbadb7a6bca290e3b688e5bfe186"
|
||||
SRC_URI[sha256sum] = "1d78c5de77c7884b43ffac25f9a34aa4dbc3edeeac971c54be2fbac969bbad9a"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/kconf_update \
|
||||
|
||||
@@ -48,8 +48,8 @@ DEPENDS += " \
|
||||
# MobileBroadbandProviderInfo
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "3351290f4f74e21d2b8f1e7e2076d6db"
|
||||
SRC_URI[sha256sum] = "1b6f5d9cacd0b003430c8f805e1873647f8ce6e367388aebe2e2e6d0ac119c86"
|
||||
SRC_URI[md5sum] = "feff99bf8ffd83adc0498061a82a4c51"
|
||||
SRC_URI[sha256sum] = "3856baf7899eb69aa90fc84fa60defe548183f4624b9b58f2e06d879c5a8c822"
|
||||
|
||||
# do not move so-libs to -dev package
|
||||
FILES_SOLIBSDEV = ""
|
||||
|
||||
@@ -25,8 +25,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "b4b0d80a3b61e7953cad70f6fad0dd26"
|
||||
SRC_URI[sha256sum] = "247d36d2b6cb3aefabbe9a01eaeea3336fa6780d90db92d8785307d17dfab3bd"
|
||||
SRC_URI[md5sum] = "ee31a524a991ef2460aa937a7133c9e8"
|
||||
SRC_URI[sha256sum] = "508ad16ab4260e864c4c0195ef32b11d52cf67e91995e75b964aab9e67422161"
|
||||
|
||||
FILES_SOLIBSDEV = ""
|
||||
|
||||
|
||||
@@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = " \
|
||||
inherit kde-plasma gtk-icon-cache
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "ba8031e618163ee33dff28c07e819dd1"
|
||||
SRC_URI[sha256sum] = "668379ac357033cf1335e9c96e7f6be1501111a752ea268b95966aa85c48e8dd"
|
||||
SRC_URI[md5sum] = "52555526d839cae66f08f6f5242a21e8"
|
||||
SRC_URI[sha256sum] = "04bf4ed734e3b3b6feef579eda24d2652968519ffb98f015b59605f27c40c8fd"
|
||||
|
||||
DEPENDS += " \
|
||||
kauth-native \
|
||||
|
||||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \
|
||||
inherit kde-plasma
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "33ec0b55281f967e650069de8b52923a"
|
||||
SRC_URI[sha256sum] = "f50e0a4013ef62b1a4ec64e7bc5cfbf29dfccc0497f54944ae165e72d6ba0c7e"
|
||||
SRC_URI[md5sum] = "7c15c847fa5419705e2e211531bfd8a2"
|
||||
SRC_URI[sha256sum] = "c1366566cbfff626964b05e5c8655aa456a4ada0f1614717dfb6d0f09da38e97"
|
||||
|
||||
FILES_${PN} += "${datadir}/wallpapers"
|
||||
|
||||
@@ -21,8 +21,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "18b4b6c055de39628be87863e62dd893"
|
||||
SRC_URI[sha256sum] = "c6bfdcbd0f751a00a44df371d43e3986156c41e02a05fb7a1e30c5cf8e299b2f"
|
||||
SRC_URI[md5sum] = "1379f306d81dd226b753f2f61ebe8a20"
|
||||
SRC_URI[sha256sum] = "ee4486b6678b24ba5f9eb6ac8b36b07b34cb87f84e0a3183761a75414b3c0be8"
|
||||
|
||||
SRC_URI += "file://0001-fix-build-for-QT_NO_SESSIONMANAGER.patch"
|
||||
|
||||
|
||||
@@ -30,11 +30,12 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "dc080435284f8fc11418dc462d9482e6"
|
||||
SRC_URI[sha256sum] = "1296a39ccff2b2174d8652b56872585e0ac6236f6bef4e6f911bd9a856410e4b"
|
||||
SRC_URI[md5sum] = "05ddba26835f8f6894bcab7945fd28f6"
|
||||
SRC_URI[sha256sum] = "f8f28d24c87319e2e700f62f32db873c28eb94b71288c71c706441e98a4dce71"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/k*5 \
|
||||
${datadir}/kconf_update \
|
||||
${datadir}/dbus-1 \
|
||||
${datadir}/polkit-1 \
|
||||
${OE_QMAKE_PATH_PLUGINS} \
|
||||
|
||||
@@ -23,8 +23,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "8a6bd33c8ac81f62bbc1aa6af7a0be27"
|
||||
SRC_URI[sha256sum] = "6013cc7df9e865d402a9e4114d80546aca88b13fb4bcb30c272f93603281c1d2"
|
||||
SRC_URI[md5sum] = "de3d37d990e80d886f93fb9678e8389f"
|
||||
SRC_URI[sha256sum] = "9b09d0446d96a2e2b69aee57afce7a8fbddf382a6c401f3a894f3bcc870c23fc"
|
||||
|
||||
RDEPENDS_${PN} = "sddm"
|
||||
|
||||
|
||||
@@ -32,8 +32,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "10aa28d4ceb878787197574805705948"
|
||||
SRC_URI[sha256sum] = "1e754af7d88189314b00d9af8b8f396fe323ad1da647b90222a3a0820a758d79"
|
||||
SRC_URI[md5sum] = "4f34b2198048ef7fe66c429aab6005e6"
|
||||
SRC_URI[sha256sum] = "0b6d4bca5a09b2039d52ebad1bb5f8de71698b3e3fdf6f7ad9cc5688fe8ab144"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/k*5 \
|
||||
|
||||
@@ -16,8 +16,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "e7232a8c24170579a9dc25fd135d4d57"
|
||||
SRC_URI[sha256sum] = "449f648eee7124687432ad71d510cd2eefe59ee7b2d4653ef9cc64f1422098e4"
|
||||
SRC_URI[md5sum] = "d3c84b3ee514d6f5b40552b8c0fcca6a"
|
||||
SRC_URI[sha256sum] = "9b78880cd76c45a0e4bcca1dbcaf769988b394e1fe3f666310941960df6b9622"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/kservices5 \
|
||||
|
||||
Reference in New Issue
Block a user