diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-05-12 11:01:31 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-08-21 06:51:17 -0500 |
| commit | 58cf19a98ac96f650f0b8dee28e02a71d6ce6d9b (patch) | |
| tree | bcc92016711e0e6501eec2a952ab3d6c23194634 /pkgs/development/libraries/grantlee | |
| parent | e6b42d7403cc0802c1264952fb19044eba8475e8 (diff) | |
| download | nixpkgs-58cf19a98ac96f650f0b8dee28e02a71d6ce6d9b.tar nixpkgs-58cf19a98ac96f650f0b8dee28e02a71d6ce6d9b.tar.gz nixpkgs-58cf19a98ac96f650f0b8dee28e02a71d6ce6d9b.tar.bz2 nixpkgs-58cf19a98ac96f650f0b8dee28e02a71d6ce6d9b.tar.lz nixpkgs-58cf19a98ac96f650f0b8dee28e02a71d6ce6d9b.tar.xz nixpkgs-58cf19a98ac96f650f0b8dee28e02a71d6ce6d9b.tar.zst nixpkgs-58cf19a98ac96f650f0b8dee28e02a71d6ce6d9b.zip | |
grantlee: don't canonicalize template paths
Diffstat (limited to 'pkgs/development/libraries/grantlee')
| -rw-r--r-- | pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch | 27 | ||||
| -rw-r--r-- | pkgs/development/libraries/grantlee/5/series | 1 |
2 files changed, 28 insertions, 0 deletions
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 00000000000..d78ef74ce35 --- /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 16f04d44562..9c4015a1c19 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 |