grantlee: 5.1.0 -> 5.2.0 (#84621)

pkgs/development/libraries/grantlee/5/default.nix

@@ -2,12 +2,12 @@
 
 mkDerivation rec {
   pname = "grantlee";
-  version = "5.1.0";
+  version = "5.2.0";
   grantleePluginPrefix = "lib/grantlee/${lib.versions.majorMinor version}";
 
   src = fetchurl {
     url = "https://github.com/steveire/grantlee/archive/v${version}.tar.gz";
-    sha256 = "1lf9rkv0i0kd7fvpgg5l8jb87zw8dzcwd1liv6hji7g4wlpmfdiq";
+    sha256 = "02lrdbnvaz19hkawbbj2psww1m04qsbhvv172ggpp5bbfkjwx6hk";
     name = "${pname}-${version}.tar.gz";
   };
 

pkgs/development/libraries/grantlee/5/grantlee-cxx11.patch

@@ -1,24 +0,0 @@
-From 3a5fc7662da3261be6496611900c095844e56ab1 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Sat, 20 Jul 2019 17:35:30 +0200
-Subject: [PATCH] Fix compile with newer Qt/cmake combination
-
-Without this i get huge errors about Qt needing C++11 support
----
- CMakeLists.txt | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6d51110..0859788 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -11,6 +11,9 @@ endif()
- 
- project(Grantlee)
- 
-+set (CMAKE_CXX_STANDARD 11)
-+set (CMAKE_CXX_EXTENSIONS OFF)
-+
- # Workaround for http://public.kitware.com/Bug/view.php?id=12301
- if (MINGW)
-   if(NOT CMAKE_BUILD_TYPE)

pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch

@@ -2,17 +2,17 @@ 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
+@@ -142,10 +142,6 @@ Template FileSystemTemplateLoader::loadByName(const QString &fileName,
                       + QLatin1Char('/') + fileName);
      const QFileInfo fi(file);
- 
+
 -    if (file.exists()
 -        && !fi.canonicalFilePath().contains(
--               QDir(d->m_templateDirs.at(i)).canonicalPath()))
+-            QDir(d->m_templateDirs.at(i)).canonicalPath()))
 -      return Template();
      ++i;
    }
- 
+
 @@ -173,11 +169,6 @@ FileSystemTemplateLoader::getMediaUri(co
                       + QLatin1Char('/') + fileName);
  

pkgs/development/libraries/grantlee/5/series

@@ -1,3 +1,2 @@
 grantlee-nix-profiles.patch
 grantlee-no-canonicalize-filepath.patch
-grantlee-cxx11.patch