grantlee-qt5: update to 5.2.0

* Increase CMake requirement to version 3.5
* Port scriptable extensions to QJSEngine provided by QtQml
* Support reading properties from Q_GADGETS
* Remove TestCocoon integration
* Clean up documentation to clarify introspection requirements
* Fix mixing of {% include %} and {% extends %} tags
* Fix various bugs discovered by fuzzing
* Remove use of TR1 library features from unit tests
* Remove obsolete build options
* Document that loading templates from Qt Resources is possible

5 files changed, 14 insertions, 62 deletions

diff --git a/devel/grantlee-qt5/Makefile b/devel/grantlee-qt5/Makefile
index eef2f130b4e..16e963777f8 100644
--- a/devel/grantlee-qt5/Makefile
+++ b/devel/grantlee-qt5/Makefile
@@ -1,24 +1,19 @@
-# $NetBSD: Makefile,v 1.29 2020/06/02 08:22:35 adam Exp $
+# $NetBSD: Makefile,v 1.30 2020/06/07 01:46:52 markd Exp $
 #
 
-DISTNAME=	grantlee-5.1.0
+DISTNAME=	grantlee-5.2.0
 PKGNAME=	${DISTNAME:S/-/-qt5-/}
-PKGREVISION=	27
 CATEGORIES=	devel
 MASTER_SITES=	http://downloads.grantlee.org/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-#HOMEPAGE=	http://www.gitorious.org/grantlee/pages/Home
+HOMEPAGE=	https://github.com/steveire/grantlee
 COMMENT=	String template engine in QT5 based on Django template system
-LICENSE=	gnu-lgpl-v3
+LICENSE=	gnu-lgpl-v2.1
 
 USE_LANGUAGES=	c c++
 USE_CMAKE=	yes
 
-# Unbreak nested templates https://github.com/steveire/grantlee/issues/27
-post-patch:
-	cd ${WRKSRC}; find . -type f -name '*.h' -exec sed -e 's|>>|> >|g' -i {} \;
-
 .include "../../x11/qt5-qtscript/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/grantlee-qt5/PLIST b/devel/grantlee-qt5/PLIST
index b36e6292ab7..cbe6e336332 100644
--- a/devel/grantlee-qt5/PLIST
+++ b/devel/grantlee-qt5/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2016/05/08 11:21:40 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/06/07 01:46:52 markd Exp $
 include/grantlee/abstractlocalizer.h
 include/grantlee/abstractmarkupbuilder.h
 include/grantlee/bbcodebuilder.h
@@ -36,10 +36,10 @@ lib/cmake/Grantlee5/Grantlee5ConfigVersion.cmake
 lib/cmake/Grantlee5/GrantleeMacros.cmake
 lib/cmake/Grantlee5/GrantleeTargets-noconfig.cmake
 lib/cmake/Grantlee5/GrantleeTargets.cmake
-lib/grantlee/5.1/grantlee_defaultfilters.so
-lib/grantlee/5.1/grantlee_defaulttags.so
-lib/grantlee/5.1/grantlee_i18ntags.so
-lib/grantlee/5.1/grantlee_loadertags.so
+lib/grantlee/5.2/grantlee_defaultfilters.so
+lib/grantlee/5.2/grantlee_defaulttags.so
+lib/grantlee/5.2/grantlee_i18ntags.so
+lib/grantlee/5.2/grantlee_loadertags.so
 lib/libGrantlee_Templates.so
 lib/libGrantlee_Templates.so.5
 lib/libGrantlee_Templates.so.${PKGVERSION}
diff --git a/devel/grantlee-qt5/distinfo b/devel/grantlee-qt5/distinfo
index d67bf47d08d..9c14ca42153 100644
--- a/devel/grantlee-qt5/distinfo
+++ b/devel/grantlee-qt5/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.2 2019/08/27 06:26:19 markd Exp $
+$NetBSD: distinfo,v 1.3 2020/06/07 01:46:52 markd Exp $
 
-SHA1 (grantlee-5.1.0.tar.gz) = 98429f252d850ac3ad673a1c49a0e833bafe5d3c
-RMD160 (grantlee-5.1.0.tar.gz) = 7ebd801276dd2aa257f2fd5717ddf4537551d810
-SHA512 (grantlee-5.1.0.tar.gz) = 2b806a0770b9c6d02f207d5b4939ae8cae325de4fa01901320ffef5c8442ef0f1c10dd799966d0bf0d223e6541f93db8568aaf922ea1b334bcb2f85f6373a936
-Size (grantlee-5.1.0.tar.gz) = 1175380 bytes
-SHA1 (patch-CMakeLists.txt) = 22dab41e1a0c62bdf578efd2c44b80b8b4737e72
-SHA1 (patch-templates_lib_lexer_p.h) = 72ba688ce9ad33016cadfbb022ce90a17b926a6a
+SHA1 (grantlee-5.2.0.tar.gz) = 2140f8a6c7c96724d587828464a8ad2e19836dda
+RMD160 (grantlee-5.2.0.tar.gz) = b21b4b27fe5b3d916ca46cbc87de45bc65dee52a
+SHA512 (grantlee-5.2.0.tar.gz) = 94b53d103aa775e6d45357d44d5634a5214d12ea7178d251fda30c5a88ddc2682ae44501ee8b7dc475793b84fa0998eb0bc13eea3f2e10ab29b1489db6ea60bd
+Size (grantlee-5.2.0.tar.gz) = 1166467 bytes
diff --git a/devel/grantlee-qt5/patches/patch-CMakeLists.txt b/devel/grantlee-qt5/patches/patch-CMakeLists.txt
deleted file mode 100644
index 5464556bd9c..00000000000
--- a/devel/grantlee-qt5/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2019/08/27 06:26:19 markd Exp $
-
-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.orig	2019-08-25 11:37:40.489318446 +0000
-+++ CMakeLists.txt
-@@ -7,6 +7,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)
diff --git a/devel/grantlee-qt5/patches/patch-templates_lib_lexer_p.h b/devel/grantlee-qt5/patches/patch-templates_lib_lexer_p.h
deleted file mode 100644
index e0f47e2c83b..00000000000
--- a/devel/grantlee-qt5/patches/patch-templates_lib_lexer_p.h
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-templates_lib_lexer_p.h,v 1.1 2019/08/27 06:26:19 markd Exp $
-
-From: Michael Pyne <mpyne@kde.org>
-Date: Tue, 18 Dec 2018 17:47:21 -0500
-Subject: [PATCH] Fix build with Qt 5.13 / GCC 8.2.
-
-At this point Grantlee doesn't build for me because QList is an
-incomplete type. I think the compiler is right to complain, so I fix by
-including the appropriate header.
-
---- templates/lib/lexer_p.h.orig	2019-08-25 11:37:32.228371777 +0000
-+++ templates/lib/lexer_p.h
-@@ -24,7 +24,7 @@
- #include "textprocessingmachine_p.h"
- #include "token.h"
- 
--template <typename T> class QList;
-+#include <QList>
- 
- namespace Grantlee
- {