diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-03-14 19:50:54 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-03-14 19:54:49 +0100 |
| commit | 04066403aef0fe8c1b8123f862ed9f58f04583f7 (patch) | |
| tree | 03d846ff09b5b1b2634df18c51ee8a88b62d18e2 /pkgs/desktops/plasma-5 | |
| parent | 5767c18d99a035aa642286d1390698ff40d5d231 (diff) | |
| parent | c22922e25148220a423ef628bb564c7cd18d54d2 (diff) | |
| download | nixpkgs-04066403aef0fe8c1b8123f862ed9f58f04583f7.tar nixpkgs-04066403aef0fe8c1b8123f862ed9f58f04583f7.tar.gz nixpkgs-04066403aef0fe8c1b8123f862ed9f58f04583f7.tar.bz2 nixpkgs-04066403aef0fe8c1b8123f862ed9f58f04583f7.tar.lz nixpkgs-04066403aef0fe8c1b8123f862ed9f58f04583f7.tar.xz nixpkgs-04066403aef0fe8c1b8123f862ed9f58f04583f7.tar.zst nixpkgs-04066403aef0fe8c1b8123f862ed9f58f04583f7.zip | |
Merge branch 'master' into staging-next
Lots of rebuilds from master, apparently. Hydra nixpkgs: ?compare=1509577
Diffstat (limited to 'pkgs/desktops/plasma-5')
| -rw-r--r-- | pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch index 4fac5645d1c..139c2fcbd1f 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch +++ b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch @@ -81,7 +81,7 @@ index b68f0c68..a18efd96 100644 fi # Boot sequence: -@@ -33,62 +42,134 @@ fi +@@ -33,61 +42,142 @@ fi # # * Then ksmserver is started which takes control of the rest of the startup sequence @@ -102,6 +102,15 @@ index b68f0c68..a18efd96 100644 +# See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html +rm -fv $HOME/.cache/icon-cache.kcache + ++# xdg-desktop-settings generates this empty file but ++# it makes kbuildsyscoca5 fail silently. To fix this ++# remove that menu if it exists. ++rm -fv $HOME/.config/menus/applications-merged/xdg-desktop-menu-dummy.menu ++ ++# Remove the kbuildsyscoca5 cache. It will be regenerated immediately after. ++# This is necessary for kbuildsyscoca5 to recognize that software that has been removed. ++rm -fv $HOME/.cache/ksycoca* ++ +# Qt writes a weird ‘libraryPath’ line to +# ~/.config/Trolltech.conf that causes the KDE plugin +# paths of previous KDE invocations to be searched. @@ -632,7 +641,7 @@ diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacomposit index dcb473a4..48dbf465 100644 --- a/startkde/startplasmacompositor.cmake +++ b/startkde/startplasmacompositor.cmake -@@ -1,118 +1,165 @@ +@@ -1,118 +1,174 @@ #!/bin/sh # -# DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ ) @@ -660,6 +669,15 @@ index dcb473a4..48dbf465 100644 +# See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html +rm -fv $HOME/.cache/icon-cache.kcache + ++# xdg-desktop-settings generates this empty file but ++# it makes kbuildsyscoca5 fail silently. To fix this ++# remove that menu if it exists. ++rm -fv $HOME/.config/menus/applications-merged/xdg-desktop-menu-dummy.menu ++ ++# Remove the kbuildsyscoca5 cache. It will be regenerated immediately after. ++# This is necessary for kbuildsyscoca5 to recognize that software that has been removed. ++rm -fv $HOME/.cache/ksycoca* ++ +# Qt writes a weird ‘libraryPath’ line to +# ~/.config/Trolltech.conf that causes the KDE plugin +# paths of previous KDE invocations to be searched. |