From a6b201fd2cd248c3d16984f31e2c714014020853 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 14 Oct 2015 07:06:08 -0500 Subject: [PATCH] kwin: update patches --- ...h => 0001-qdiriterator-follow-symlinks.patch} | 16 ++++++++++++++-- pkgs/desktops/plasma-5.4/kwin/default.nix | 2 +- 2 files changed, 15 insertions(+), 3 deletions(-) rename pkgs/desktops/plasma-5.4/kwin/{kwin-import-plugin-follow-symlinks.patch => 0001-qdiriterator-follow-symlinks.patch} (59%) diff --git a/pkgs/desktops/plasma-5.4/kwin/kwin-import-plugin-follow-symlinks.patch b/pkgs/desktops/plasma-5.4/kwin/0001-qdiriterator-follow-symlinks.patch similarity index 59% rename from pkgs/desktops/plasma-5.4/kwin/kwin-import-plugin-follow-symlinks.patch rename to pkgs/desktops/plasma-5.4/kwin/0001-qdiriterator-follow-symlinks.patch index fd1f35d717e..797a32fc5f8 100644 --- a/pkgs/desktops/plasma-5.4/kwin/kwin-import-plugin-follow-symlinks.patch +++ b/pkgs/desktops/plasma-5.4/kwin/0001-qdiriterator-follow-symlinks.patch @@ -1,8 +1,17 @@ +From 78a4b554187c18fd86b62089f7730c4273fadd4c Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Wed, 14 Oct 2015 07:05:22 -0500 +Subject: [PATCH] qdiriterator follow symlinks + +--- + clients/aurorae/src/aurorae.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + diff --git a/clients/aurorae/src/aurorae.cpp b/clients/aurorae/src/aurorae.cpp -index 26b44a9..d14e226 100644 +index 781c960..ad5f420 100644 --- a/clients/aurorae/src/aurorae.cpp +++ b/clients/aurorae/src/aurorae.cpp -@@ -73,7 +73,7 @@ void AuroraeFactory::init() +@@ -211,7 +211,7 @@ void Helper::init() // so let's try to locate our plugin: QString pluginPath; for (const QString &path : m_engine->importPathList()) { @@ -11,3 +20,6 @@ index 26b44a9..d14e226 100644 while (it.hasNext()) { it.next(); QFileInfo fileInfo = it.fileInfo(); +-- +2.5.2 + diff --git a/pkgs/desktops/plasma-5.4/kwin/default.nix b/pkgs/desktops/plasma-5.4/kwin/default.nix index 626859e6e23..6afdf33e1bb 100644 --- a/pkgs/desktops/plasma-5.4/kwin/default.nix +++ b/pkgs/desktops/plasma-5.4/kwin/default.nix @@ -23,7 +23,7 @@ plasmaPackage { kactivities kdeclarative kglobalaccel ki18n kio kwindowsystem plasma-framework qtdeclarative qtx11extras ]; - patches = [ ./kwin-import-plugin-follow-symlinks.patch ]; + patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; postInstall = '' wrapKDEProgram "$out/bin/kwin_x11" wrapKDEProgram "$out/bin/kwin_wayland"