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

plasma-workspace: kapplymousetheme moved to plasma-desktop

Browse Source
This commit is contained in:
Thomas Tuegel 2015-10-27 19:39:58 -05:00
parent 0054a12772
commit beaca8e3b7
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/desktops/plasma-5.4/plasma-workspace/0001-startkde-NixOS-patches.patch
View File

@ -1,14 +1,14 @@
From 3d837f48853987d5adaf69a9498c4cf116368a18 Mon Sep 17 00:00:00 2001 From 35efc2ce92ed698abb21a79aa6e6670e844ea776 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com> From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 27 Aug 2015 20:36:39 -0500 Date: Thu, 27 Aug 2015 20:36:39 -0500
Subject: [PATCH 1/2] startkde NixOS patches Subject: [PATCH 1/2] startkde NixOS patches
--- ---
startkde/startkde.cmake | 219 ++++++++++++++++++++---------------------------- startkde/startkde.cmake | 217 ++++++++++++++++++++----------------------------
1 file changed, 89 insertions(+), 130 deletions(-) 1 file changed, 88 insertions(+), 129 deletions(-)
diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
index 2c4c315..d418253 100644 index 2c4c315..7733721 100644
--- a/startkde/startkde.cmake --- a/startkde/startkde.cmake
+++ b/startkde/startkde.cmake +++ b/startkde/startkde.cmake
@@ -1,8 +1,31 @@ @@ -1,8 +1,31 @@
@ -94,7 +94,7 @@ index 2c4c315..d418253 100644
#This is basically setting defaults so we can use them with kstartupconfig5 #This is basically setting defaults so we can use them with kstartupconfig5
cat >$configDir/startupconfigkeys <<EOF cat >$configDir/startupconfigkeys <<EOF
@@ -101,55 +106,21 @@ XftSubPixel=none @@ -101,53 +106,19 @@ XftSubPixel=none
EOF EOF
} }
@ -150,11 +150,8 @@ index 2c4c315..d418253 100644
if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
- @EXPORT_XCURSOR_PATH@ - @EXPORT_XCURSOR_PATH@
- kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize" kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
+ @out@/bin/kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
if test $? -eq 10; then if test $? -eq 10; then
XCURSOR_THEME=breeze_cursors
export XCURSOR_THEME
@@ -163,21 +134,39 @@ if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" @@ -163,21 +134,39 @@ if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize"
fi fi
fi fi
@ -400,5 +397,5 @@ index 2c4c315..d418253 100644
echo 'startkde: Done.' 1>&2 echo 'startkde: Done.' 1>&2
-- --
2.5.2 2.6.2

4
pkgs/desktops/plasma-5.4/plasma-workspace/0002-qt-5.5-QML-import-paths.patch
View File

@ -1,4 +1,4 @@
From 709fe8bff26c9680de13be5e8e5bc587c25a9b2e Mon Sep 17 00:00:00 2001 From 033d3560d26ceabbd6da6310d326fec7a473df82 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com> From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 19 Oct 2015 18:55:36 -0500 Date: Mon, 19 Oct 2015 18:55:36 -0500
Subject: [PATCH 2/2] qt-5.5 QML import paths Subject: [PATCH 2/2] qt-5.5 QML import paths
@ -119,5 +119,5 @@ index 2e26455..864c9c5 100644
Item { Item {
id: root id: root
-- --
2.5.2 2.6.2