public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

plasma-workspace: upgrade patches

Browse Source 
Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
This commit is contained in:
Yaroslav Bolyukin 2021-01-22 22:52:13 +03:00
parent 46804ad8ef
commit b5762d6e04
No known key found for this signature in database
GPG Key ID: 40B5D6948143175F
2 changed files with 49 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch
View File

@ -1,4 +1,4 @@
From d653bc84c8aed33072237ed858194a8a73b6a2e7 Mon Sep 17 00:00:00 2001 From 65ed69a38a9ffee21f0eb36de1f7a3f152111cad Mon Sep 17 00:00:00 2001
From: Tom Hall <tahall256@protonmail.ch> From: Tom Hall <tahall256@protonmail.ch>
Date: Mon, 7 Sep 2020 18:09:52 +0100 Date: Mon, 7 Sep 2020 18:09:52 +0100
Subject: [PATCH] startkde Subject: [PATCH] startkde
@ -7,14 +7,14 @@ Subject: [PATCH] startkde
startkde/plasma-session/startup.cpp | 2 +- startkde/plasma-session/startup.cpp | 2 +-
startkde/startplasma-waylandsession.cpp | 2 +- startkde/startplasma-waylandsession.cpp | 2 +-
startkde/startplasma-x11.cpp | 2 +- startkde/startplasma-x11.cpp | 2 +-
startkde/startplasma.cpp | 22 +++++++++------------- startkde/startplasma.cpp | 16 ++++++++--------
4 files changed, 12 insertions(+), 16 deletions(-) 4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/startkde/plasma-session/startup.cpp b/startkde/plasma-session/startup.cpp diff --git a/startkde/plasma-session/startup.cpp b/startkde/plasma-session/startup.cpp
index 89cc144ba..8ca9e81d2 100644 index c3e77d4..88cb0e9 100644
--- a/startkde/plasma-session/startup.cpp --- a/startkde/plasma-session/startup.cpp
+++ b/startkde/plasma-session/startup.cpp +++ b/startkde/plasma-session/startup.cpp
@@ -211,7 +211,7 @@ Startup::Startup(QObject *parent): @@ -223,7 +223,7 @@ Startup::Startup(QObject *parent)
upAndRunning(QStringLiteral("ksmserver")); upAndRunning(QStringLiteral("ksmserver"));
const AutoStart autostart; const AutoStart autostart;
@ -24,10 +24,10 @@ index 89cc144ba..8ca9e81d2 100644
KJob *phase1; KJob *phase1;
QProcessEnvironment kdedProcessEnv; QProcessEnvironment kdedProcessEnv;
diff --git a/startkde/startplasma-waylandsession.cpp b/startkde/startplasma-waylandsession.cpp diff --git a/startkde/startplasma-waylandsession.cpp b/startkde/startplasma-waylandsession.cpp
index f59654d18..5e3a93db0 100644 index 4fbfe18..6ba916c 100644
--- a/startkde/startplasma-waylandsession.cpp --- a/startkde/startplasma-waylandsession.cpp
+++ b/startkde/startplasma-waylandsession.cpp +++ b/startkde/startplasma-waylandsession.cpp
@@ -61,7 +61,7 @@ int main(int argc, char** argv) @@ -65,7 +65,7 @@ int main(int argc, char **argv)
waitForKonqi(); waitForKonqi();
out << "startplasma-waylandsession: Shutting down...\n"; out << "startplasma-waylandsession: Shutting down...\n";
@ -37,7 +37,7 @@ index f59654d18..5e3a93db0 100644
cleanupX11(); cleanupX11();
out << "startplasma-waylandsession: Done.\n"; out << "startplasma-waylandsession: Done.\n";
diff --git a/startkde/startplasma-x11.cpp b/startkde/startplasma-x11.cpp diff --git a/startkde/startplasma-x11.cpp b/startkde/startplasma-x11.cpp
index ae1c4d101..0df24b5be 100644 index 4ddf9f8..e0e59cd 100644
--- a/startkde/startplasma-x11.cpp --- a/startkde/startplasma-x11.cpp
+++ b/startkde/startplasma-x11.cpp +++ b/startkde/startplasma-x11.cpp
@@ -110,7 +110,7 @@ int main(int argc, char **argv) @@ -110,7 +110,7 @@ int main(int argc, char **argv)
@ -50,10 +50,10 @@ index ae1c4d101..0df24b5be 100644
cleanupPlasmaEnvironment(); cleanupPlasmaEnvironment();
cleanupX11(); cleanupX11();
diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp
index a055d5635..62afb1513 100644 index 9809197..1250e3e 100644
--- a/startkde/startplasma.cpp --- a/startkde/startplasma.cpp
+++ b/startkde/startplasma.cpp +++ b/startkde/startplasma.cpp
@@ -41,7 +41,7 @@ QTextStream out(stderr); @@ -46,7 +46,7 @@ QTextStream out(stderr);
void messageBox(const QString &text) void messageBox(const QString &text)
{ {
out << text; out << text;
@ -62,17 +62,27 @@ index a055d5635..62afb1513 100644
} }
QStringList allServices(const QLatin1String &prefix) QStringList allServices(const QLatin1String &prefix)
@@ -262,15 +262,15 @@ void setupX11() @@ -267,8 +267,8 @@ void setupX11()
// If the user has overwritten fonts, the cursor font may be different now // If the user has overwritten fonts, the cursor font may be different now
// so don't move this up. // so don't move this up.
- runSync(QStringLiteral("xsetroot"), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")}); - runSync(QStringLiteral("xsetroot"), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")});
- runSync(QStringLiteral("xprop"), {QStringLiteral("-root"), QStringLiteral("-f"), QStringLiteral("KDE_FULL_SESSION"), QStringLiteral("8t"), QStringLiteral("-set"), QStringLiteral("KDE_FULL_SESSION"), QStringLiteral("true")}); - runSync(QStringLiteral("xprop"),
- runSync(QStringLiteral("xprop"), {QStringLiteral("-root"), QStringLiteral("-f"), QStringLiteral("KDE_SESSION_VERSION"), QStringLiteral("32c"), QStringLiteral("-set"), QStringLiteral("KDE_SESSION_VERSION"), QStringLiteral("5")});
+ runSync(QStringLiteral(NIXPKGS_XSETROOT), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")}); + runSync(QStringLiteral(NIXPKGS_XSETROOT), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")});
+ runSync(QStringLiteral(NIXPKGS_XPROP), {QStringLiteral("-root"), QStringLiteral("-f"), QStringLiteral("KDE_FULL_SESSION"), QStringLiteral("8t"), QStringLiteral("-set"), QStringLiteral("KDE_FULL_SESSION"), QStringLiteral("true")}); + runSync(QStringLiteral(NIXPKGS_XPROP),
+ runSync(QStringLiteral(NIXPKGS_XPROP), {QStringLiteral("-root"), QStringLiteral("-f"), QStringLiteral("KDE_SESSION_VERSION"), QStringLiteral("32c"), QStringLiteral("-set"), QStringLiteral("KDE_SESSION_VERSION"), QStringLiteral("5")}); {QStringLiteral("-root"),
} QStringLiteral("-f"),
QStringLiteral("KDE_FULL_SESSION"),
@@ -276,7 +276,7 @@ void setupX11()
QStringLiteral("-set"),
QStringLiteral("KDE_FULL_SESSION"),
QStringLiteral("true")});
- runSync(QStringLiteral("xprop"),
+ runSync(QStringLiteral(NIXPKGS_XPROP),
{QStringLiteral("-root"),
QStringLiteral("-f"),
QStringLiteral("KDE_SESSION_VERSION"),
@@ -288,8 +288,8 @@ void setupX11()
void cleanupX11() void cleanupX11()
{ {
@ -83,7 +93,7 @@ index a055d5635..62afb1513 100644
} }
// TODO: Check if Necessary // TODO: Check if Necessary
@@ -306,7 +302,7 @@ void setupFontDpi() @@ -321,7 +321,7 @@ void setupFontDpi()
// TODO port to c++? // TODO port to c++?
const QByteArray input = "Xft.dpi: " + QByteArray::number(fontsCfg.readEntry("forceFontDPI", 0)); const QByteArray input = "Xft.dpi: " + QByteArray::number(fontsCfg.readEntry("forceFontDPI", 0));
QProcess p; QProcess p;
@ -92,7 +102,7 @@ index a055d5635..62afb1513 100644
p.setProcessChannelMode(QProcess::ForwardedChannels); p.setProcessChannelMode(QProcess::ForwardedChannels);
p.write(input); p.write(input);
p.closeWriteChannel(); p.closeWriteChannel();
@@ -328,7 +324,7 @@ QProcess* setupKSplash() @@ -343,7 +343,7 @@ QProcess *setupKSplash()
KConfigGroup ksplashCfg = cfg.group("KSplash"); KConfigGroup ksplashCfg = cfg.group("KSplash");
if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) { if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) {
p = new QProcess; p = new QProcess;
@ -102,5 +112,5 @@ index a055d5635..62afb1513 100644
} }
return p; return p;
-- --
2.28.0 2.30.0

12
pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch
View File

@ -1,23 +1,23 @@
From f43f15870f14b8fa17ba0765c0d7e2b225fafc3f Mon Sep 17 00:00:00 2001 From 914d2ec5e669ecf8771cc1308028990f733fb8cc Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org> From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 5 Feb 2020 05:03:11 -0600 Date: Wed, 5 Feb 2020 05:03:11 -0600
Subject: [PATCH 2/2] absolute-wallpaper-install-dir Subject: [PATCH] absolute-wallpaper-install-dir
--- ---
sddm-theme/theme.conf.cmake | 2 +- sddm-theme/theme.conf.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sddm-theme/theme.conf.cmake b/sddm-theme/theme.conf.cmake diff --git a/sddm-theme/theme.conf.cmake b/sddm-theme/theme.conf.cmake
index 8494a5c8a..f723c1e1b 100644 index a560da3..f723c1e 100644
--- a/sddm-theme/theme.conf.cmake --- a/sddm-theme/theme.conf.cmake
+++ b/sddm-theme/theme.conf.cmake +++ b/sddm-theme/theme.conf.cmake
@@ -4,5 +4,5 @@ logo=${KDE_INSTALL_FULL_DATADIR}/sddm/themes/breeze/default-logo.svg @@ -4,5 +4,5 @@ logo=${KDE_INSTALL_FULL_DATADIR}/sddm/themes/breeze/default-logo.svg
type=image type=image
color=#1d99f3 color=#1d99f3
fontSize=10 fontSize=10
-background=${KDE_INSTALL_FULL_WALLPAPERDIR}/Next/contents/images/5120x2880.jpg -background=${KDE_INSTALL_FULL_WALLPAPERDIR}/Next/contents/images/5120x2880.png
+background=${NIXPKGS_BREEZE_WALLPAPERS}/Next/contents/images/5120x2880.jpg +background=${NIXPKGS_BREEZE_WALLPAPERS}/Next/contents/images/5120x2880.png
needsFullUserModel=false needsFullUserModel=false
-- --
2.25.1 2.30.0