From 58cf19a98ac96f650f0b8dee28e02a71d6ce6d9b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 12 May 2017 11:01:31 -0500 Subject: [PATCH] grantlee: don't canonicalize template paths --- .../5/grantlee-no-canonicalize-filepath.patch | 27 +++++++++++++++++++ pkgs/development/libraries/grantlee/5/series | 1 + 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch diff --git a/pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch b/pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch new file mode 100644 index 000000000000..d78ef74ce352 --- /dev/null +++ b/pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch @@ -0,0 +1,27 @@ +Index: grantlee-5.1.0/templates/lib/templateloader.cpp +=================================================================== +--- grantlee-5.1.0.orig/templates/lib/templateloader.cpp ++++ grantlee-5.1.0/templates/lib/templateloader.cpp +@@ -141,10 +141,6 @@ Template FileSystemTemplateLoader::loadB + + QLatin1Char('/') + fileName); + const QFileInfo fi(file); + +- if (file.exists() +- && !fi.canonicalFilePath().contains( +- QDir(d->m_templateDirs.at(i)).canonicalPath())) +- return Template(); + ++i; + } + +@@ -173,11 +169,6 @@ FileSystemTemplateLoader::getMediaUri(co + + QLatin1Char('/') + fileName); + + const QFileInfo fi(file); +- if (!fi.canonicalFilePath().contains( +- QDir(d->m_templateDirs.at(i)).canonicalPath())) { +- ++i; +- continue; +- } + + if (file.exists()) { + auto path = fi.absoluteFilePath(); diff --git a/pkgs/development/libraries/grantlee/5/series b/pkgs/development/libraries/grantlee/5/series index 16f04d445622..9c4015a1c197 100644 --- a/pkgs/development/libraries/grantlee/5/series +++ b/pkgs/development/libraries/grantlee/5/series @@ -1 +1,2 @@ grantlee-nix-profiles.patch +grantlee-no-canonicalize-filepath.patch