pyrox.dev
grantlee: 5.1.0 -> 5.2.0 (#84621)
+2
-2
pkgs/development/libraries/grantlee/5/default.nix
+2
-2
pkgs/development/libraries/grantlee/5/default.nix
···
2
2
3
3
mkDerivation rec {
4
4
pname = "grantlee";
5
-
version = "5.1.0";
5
+
version = "5.2.0";
6
6
grantleePluginPrefix = "lib/grantlee/${lib.versions.majorMinor version}";
7
7
8
8
src = fetchurl {
9
9
url = "https://github.com/steveire/grantlee/archive/v${version}.tar.gz";
10
-
sha256 = "1lf9rkv0i0kd7fvpgg5l8jb87zw8dzcwd1liv6hji7g4wlpmfdiq";
10
+
sha256 = "02lrdbnvaz19hkawbbj2psww1m04qsbhvv172ggpp5bbfkjwx6hk";
11
11
name = "${pname}-${version}.tar.gz";
12
12
};
13
13
-24
pkgs/development/libraries/grantlee/5/grantlee-cxx11.patch
-24
pkgs/development/libraries/grantlee/5/grantlee-cxx11.patch
···
1
-
From 3a5fc7662da3261be6496611900c095844e56ab1 Mon Sep 17 00:00:00 2001
2
-
From: Albert Astals Cid <aacid@kde.org>
3
-
Date: Sat, 20 Jul 2019 17:35:30 +0200
4
-
Subject: [PATCH] Fix compile with newer Qt/cmake combination
5
-
6
-
Without this i get huge errors about Qt needing C++11 support
7
-
---
8
-
CMakeLists.txt | 3 +++
9
-
1 file changed, 3 insertions(+)
10
-
11
-
diff --git a/CMakeLists.txt b/CMakeLists.txt
12
-
index 6d51110..0859788 100644
13
-
--- a/CMakeLists.txt
14
-
+++ b/CMakeLists.txt
15
-
@@ -11,6 +11,9 @@ endif()
16
-
17
-
project(Grantlee)
18
-
19
-
+set (CMAKE_CXX_STANDARD 11)
20
-
+set (CMAKE_CXX_EXTENSIONS OFF)
21
-
+
22
-
# Workaround for http://public.kitware.com/Bug/view.php?id=12301
23
-
if (MINGW)
24
-
if(NOT CMAKE_BUILD_TYPE)
+4
-4
pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch
+4
-4
pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch
···
2
2
===================================================================
3
3
--- grantlee-5.1.0.orig/templates/lib/templateloader.cpp
4
4
+++ grantlee-5.1.0/templates/lib/templateloader.cpp
5
-
@@ -141,10 +141,6 @@ Template FileSystemTemplateLoader::loadB
5
+
@@ -142,10 +142,6 @@ Template FileSystemTemplateLoader::loadByName(const QString &fileName,
6
6
+ QLatin1Char('/') + fileName);
7
7
const QFileInfo fi(file);
8
-
8
+
9
9
- if (file.exists()
10
10
- && !fi.canonicalFilePath().contains(
11
-
- QDir(d->m_templateDirs.at(i)).canonicalPath()))
11
+
- QDir(d->m_templateDirs.at(i)).canonicalPath()))
12
12
- return Template();
13
13
++i;
14
14
}
15
-
15
+
16
16
@@ -173,11 +169,6 @@ FileSystemTemplateLoader::getMediaUri(co
17
17
+ QLatin1Char('/') + fileName);
18
18