diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2016-01-10 14:10:59 -0600 |
---|---|---|
committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-01-10 14:10:59 -0600 |
commit | 521817fd76531f1987b135ccee367470ea48cae8 (patch) | |
tree | f32cec2b0048946813a5c0dcce1376bf0751eb22 /pkgs/development/libraries/kde-frameworks-5.18/kservice/0002-no-canonicalize-path.patch | |
parent | 6fc1c0832482e8015b66fb41880531aafef69a0a (diff) | |
parent | f807f159427d578963457ef5b5fcea7ad72568dd (diff) | |
download | nixlib-521817fd76531f1987b135ccee367470ea48cae8.tar nixlib-521817fd76531f1987b135ccee367470ea48cae8.tar.gz nixlib-521817fd76531f1987b135ccee367470ea48cae8.tar.bz2 nixlib-521817fd76531f1987b135ccee367470ea48cae8.tar.lz nixlib-521817fd76531f1987b135ccee367470ea48cae8.tar.xz nixlib-521817fd76531f1987b135ccee367470ea48cae8.tar.zst nixlib-521817fd76531f1987b135ccee367470ea48cae8.zip |
Merge branch 'kde-frameworks-5.18'
Diffstat (limited to 'pkgs/development/libraries/kde-frameworks-5.18/kservice/0002-no-canonicalize-path.patch')
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.18/kservice/0002-no-canonicalize-path.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kservice/0002-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.18/kservice/0002-no-canonicalize-path.patch new file mode 100644 index 000000000000..685c68526119 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.18/kservice/0002-no-canonicalize-path.patch @@ -0,0 +1,25 @@ +From 46d124da602d84b7611a7ff0ac0862168d451cdb Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <ttuegel@gmail.com> +Date: Wed, 14 Oct 2015 06:31:29 -0500 +Subject: [PATCH 2/2] no canonicalize path + +--- + src/sycoca/vfolder_menu.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/sycoca/vfolder_menu.cpp b/src/sycoca/vfolder_menu.cpp +index d3e31c3..d15d743 100644 +--- a/src/sycoca/vfolder_menu.cpp ++++ b/src/sycoca/vfolder_menu.cpp +@@ -415,7 +415,7 @@ VFolderMenu::absoluteDir(const QString &_dir, const QString &baseDir, bool keepR + } + + if (!relative) { +- QString resolved = QDir(dir).canonicalPath(); ++ QString resolved = QDir::cleanPath(dir); + if (!resolved.isEmpty()) { + dir = resolved; + } +-- +2.5.2 + |