plasma-workspace: refresh patches

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2018-03-20 18:20:42 +01:00
parent 41baeedcf1
commit 89616fec7d
6 changed files with 17 additions and 11 deletions

View File

@@ -9,12 +9,13 @@ Content-Transfer-Encoding: 8bit
Upstream-Status: pending
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
klipper/main.cpp | 4 ++++
krunner/main.cpp | 4 ++++
shell/main.cpp | 4 ++++
xembed-sni-proxy/main.cpp | 5 ++++-
4 files changed, 16 insertions(+), 1 deletion(-)
xembed-sni-proxy/main.cpp | 4 ++++
4 files changed, 16 insertions(+)
diff --git a/klipper/main.cpp b/klipper/main.cpp
index 58a0778..a1d1312 100644
@@ -90,7 +91,7 @@ index ec117f3..93791b2 100644
#include <QDebug>
#include <QMessageBox>
@@ -110,6 +112,7 @@ int main(int argc, char *argv[])
@@ -108,6 +110,7 @@ int main(int argc, char *argv[])
cliOptions.process(app);
aboutData.processCommandLine(&cliOptions);
@@ -98,7 +99,7 @@ index ec117f3..93791b2 100644
QGuiApplication::setFallbackSessionManagementEnabled(false);
auto disableSessionManagement = [](QSessionManager &sm) {
@@ -117,6 +120,7 @@ int main(int argc, char *argv[])
@@ -115,6 +118,7 @@ int main(int argc, char *argv[])
};
QObject::connect(&app, &QGuiApplication::commitDataRequest, disableSessionManagement);
QObject::connect(&app, &QGuiApplication::saveStateRequest, disableSessionManagement);

View File

@@ -9,6 +9,7 @@ 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(+)
@@ -18,7 +19,7 @@ index 046543e..2663348 100644
--- a/startkde/startkde.cmake
+++ b/startkde/startkde.cmake
@@ -3,6 +3,9 @@
# DEFAULT KDE STARTUP SCRIPT ( @PROJECT_VERSION@ )
# DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ )
#
+# meta-qt5 specific

View File

@@ -11,6 +11,7 @@ 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(+)
@@ -19,8 +20,8 @@ diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
index 891c21e..cbb7063 100644
--- a/startkde/startkde.cmake
+++ b/startkde/startkde.cmake
@@ -66,6 +66,11 @@ fi
@@ -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

View File

@@ -9,6 +9,7 @@ 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(-)
@@ -17,8 +18,8 @@ diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
index 24e5c1b..0c5f569 100644
--- a/startkde/startkde.cmake
+++ b/startkde/startkde.cmake
@@ -37,8 +37,10 @@ if test $kcheckrunning_result -eq 0 ; then
xmessage -geometry 500x100 "KDE seems to be already running on this display." > /dev/null 2>/dev/null
@@ -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."

View File

@@ -9,6 +9,7 @@ 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(-)

View File

@@ -9,6 +9,7 @@ Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
startkde/startplasma.cmake | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
@@ -17,7 +18,7 @@ diff --git a/startkde/startplasma.cmake b/startkde/startplasma.cmake
index 59dc7b7..edd400b 100644
--- a/startkde/startplasma.cmake
+++ b/startkde/startplasma.cmake
@@ -127,7 +127,7 @@ if test $? -ne 0; then
@@ -140,7 +140,7 @@ if test $? -ne 0; then
exit 1
fi
@@ -26,7 +27,7 @@ index 59dc7b7..edd400b 100644
# finally, give the session control to the session manager
# see kdebase/ksmserver for the description of the rest of the startup sequence
@@ -156,13 +156,13 @@ if test x"$wait_drkonqi"x = x"true"x ; then
@@ -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