plasma55.plasma-workspace: update patches
This commit is contained in:
parent
2d586b99cc
commit
1a7d7c1c28
@ -1,4 +1,4 @@
|
||||
From 1b95c8c95fb8ea097bb5236b19962c7feff9f333 Mon Sep 17 00:00:00 2001
|
||||
From ec91088ec46358f39a0374b910cd776993c63acf Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@gmail.com>
|
||||
Date: Mon, 19 Oct 2015 18:55:36 -0500
|
||||
Subject: [PATCH 1/2] qt-5.5 QML import paths
|
||||
@ -80,7 +80,7 @@ index a086581..6e1e8be 100755
|
||||
Item {
|
||||
id: batterymonitor
|
||||
diff --git a/applets/lock_logout/contents/ui/lockout.qml b/applets/lock_logout/contents/ui/lockout.qml
|
||||
index d32e7b7..828c5fb 100644
|
||||
index 80e7e53..0083cf0 100644
|
||||
--- a/applets/lock_logout/contents/ui/lockout.qml
|
||||
+++ b/applets/lock_logout/contents/ui/lockout.qml
|
||||
@@ -23,7 +23,7 @@ import org.kde.plasma.plasmoid 2.0
|
||||
|
@ -1,6 +1,6 @@
|
||||
From 8e5cf662d55415a838ce8c53f854202257e9feb4 Mon Sep 17 00:00:00 2001
|
||||
From e5c11a5efc4f8e8ba4e89e0172220da921df38c6 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@gmail.com>
|
||||
Date: Sun, 22 Nov 2015 08:31:42 -0600
|
||||
Date: Wed, 9 Dec 2015 13:20:02 -0600
|
||||
Subject: [PATCH 2/2] startkde NixOS patches
|
||||
|
||||
---
|
||||
@ -8,7 +8,7 @@ Subject: [PATCH 2/2] startkde NixOS patches
|
||||
1 file changed, 89 insertions(+), 122 deletions(-)
|
||||
|
||||
diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
|
||||
index 41a8975..130578e 100644
|
||||
index 37ab5cd..130578e 100644
|
||||
--- a/startkde/startkde.cmake
|
||||
+++ b/startkde/startkde.cmake
|
||||
@@ -1,8 +1,31 @@
|
||||
@ -121,7 +121,7 @@ index 41a8975..130578e 100644
|
||||
- }
|
||||
-
|
||||
- oxygenDir=$fontsDir/oxygen
|
||||
- prefixDir="@@KDE_INSTALL_FULL_DATADIR@/fonts/oxygen"
|
||||
- prefixDir="@KDE_INSTALL_FULL_DATADIR@/fonts/oxygen"
|
||||
-
|
||||
- # if the oxygen dir doesn't exist, create a symlink to be sure that the
|
||||
- # Oxygen font is available to the user
|
||||
|
@ -49,7 +49,6 @@ plasmaPackage rec {
|
||||
wrapQtProgram "$out/bin/kcheckrunning"
|
||||
wrapQtProgram "$out/bin/systemmonitor"
|
||||
wrapQtProgram "$out/bin/kstartupconfig5"
|
||||
wrapQtProgram "$out/bin/startplasmacompositor"
|
||||
wrapQtProgram "$out/bin/kdostartupconfig5"
|
||||
wrapQtProgram "$out/bin/klipper"
|
||||
wrapQtProgram "$out/bin/kuiserver5"
|
||||
@ -57,6 +56,9 @@ plasmaPackage rec {
|
||||
wrapQtProgram "$out/bin/plasmashell"
|
||||
|
||||
wrapQtProgram "$out/lib/libexec/drkonqi"
|
||||
|
||||
rm "$out/bin/startplasmacompositor"
|
||||
rm "$out/lib/libexec/startplasma"
|
||||
rm -r "$out/share/wayland-sessions"
|
||||
'';
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user