From e76d31616c971a890feae377ec932726c9f7e391 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 14 Oct 2015 06:32:29 -0500 Subject: [PATCH] kservice: update patches --- .../0001-qdiriterator-follow-symlinks.patch | 25 +++++++++++++++++++ .../kservice/0002-no-canonicalize-path.patch | 25 +++++++++++++++++++ .../kde-frameworks-5.15/kservice/default.nix | 4 +-- ...service-kbuildsycoca-follow-symlinks.patch | 13 ---------- ...ce-kbuildsycoca-no-canonicalize-path.patch | 13 ---------- 5 files changed, 52 insertions(+), 28 deletions(-) create mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kservice/0001-qdiriterator-follow-symlinks.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kservice/0002-no-canonicalize-path.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kservice/kservice-kbuildsycoca-follow-symlinks.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kservice/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.15/kservice/0001-qdiriterator-follow-symlinks.patch new file mode 100644 index 000000000000..3d8397d8ee2d --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/kservice/0001-qdiriterator-follow-symlinks.patch @@ -0,0 +1,25 @@ +From ae8919eb81abad369e4a26ffcd845b140983398d Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Wed, 14 Oct 2015 06:28:57 -0500 +Subject: [PATCH 1/2] qdiriterator follow symlinks + +--- + src/sycoca/kbuildsycoca.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/sycoca/kbuildsycoca.cpp b/src/sycoca/kbuildsycoca.cpp +index 1deae14..250baa8 100644 +--- a/src/sycoca/kbuildsycoca.cpp ++++ b/src/sycoca/kbuildsycoca.cpp +@@ -208,7 +208,7 @@ bool KBuildSycoca::build() + QStringList relFiles; + const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, m_resourceSubdir, QStandardPaths::LocateDirectory); + Q_FOREACH (const QString &dir, dirs) { +- QDirIterator it(dir, QDirIterator::Subdirectories); ++ QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); + while (it.hasNext()) { + const QString filePath = it.next(); + Q_ASSERT(filePath.startsWith(dir)); // due to the line below... +-- +2.5.2 + diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kservice/0002-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.15/kservice/0002-no-canonicalize-path.patch new file mode 100644 index 000000000000..685c68526119 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/kservice/0002-no-canonicalize-path.patch @@ -0,0 +1,25 @@ +From 46d124da602d84b7611a7ff0ac0862168d451cdb Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +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 + diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kservice/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/kservice/default.nix index ba1bd03f9df6..ab017ce402ab 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kservice/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kservice/default.nix @@ -9,8 +9,8 @@ kdeFramework { buildInputs = [ kcoreaddons kcrash kdbusaddons ]; propagatedBuildInputs = [ kconfig ki18n kwindowsystem ]; patches = [ - ./kservice-kbuildsycoca-follow-symlinks.patch - ./kservice-kbuildsycoca-no-canonicalize-path.patch + ./0001-qdiriterator-follow-symlinks.patch + ./0002-no-canonicalize-path.patch ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kservice/kservice-kbuildsycoca-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.15/kservice/kservice-kbuildsycoca-follow-symlinks.patch deleted file mode 100644 index e9bc418544ab..000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kservice/kservice-kbuildsycoca-follow-symlinks.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/kbuildsycoca/kbuildsycoca.cpp b/src/kbuildsycoca/kbuildsycoca.cpp -index 69b1427..9c37a49 100644 ---- a/src/kbuildsycoca/kbuildsycoca.cpp -+++ b/src/kbuildsycoca/kbuildsycoca.cpp -@@ -227,7 +227,7 @@ bool KBuildSycoca::build() - QStringList relFiles; - const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, g_resourceSubdir, QStandardPaths::LocateDirectory); - Q_FOREACH (const QString &dir, dirs) { -- QDirIterator it(dir, QDirIterator::Subdirectories); -+ QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - const QString filePath = it.next(); - Q_ASSERT(filePath.startsWith(dir)); // due to the line below... diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.15/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch deleted file mode 100644 index 7e21ebfe86f2..000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/kbuildsycoca/vfolder_menu.cpp b/src/kbuildsycoca/vfolder_menu.cpp -index 2eb1275..e39a36f 100644 ---- a/src/kbuildsycoca/vfolder_menu.cpp -+++ b/src/kbuildsycoca/vfolder_menu.cpp -@@ -412,7 +412,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; - }