diff --git a/programming/misc/grantlee-qt5/files/grantlee-c++11.patch b/programming/misc/grantlee-qt5/files/grantlee-c++11.patch new file mode 100644 index 0000000000..d049d6c96f --- /dev/null +++ b/programming/misc/grantlee-qt5/files/grantlee-c++11.patch @@ -0,0 +1,24 @@ +From 3a5fc7662da3261be6496611900c095844e56ab1 Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid +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) diff --git a/programming/misc/grantlee-qt5/files/grantlee-qt-5.13.patch b/programming/misc/grantlee-qt5/files/grantlee-qt-5.13.patch new file mode 100644 index 0000000000..67a92c1f86 --- /dev/null +++ b/programming/misc/grantlee-qt5/files/grantlee-qt-5.13.patch @@ -0,0 +1,27 @@ +From 0cee029ee03ab4906c6d19b57458b5036852b0f8 Mon Sep 17 00:00:00 2001 +From: Michael Pyne +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. + +Fixes issue #47. +--- + templates/lib/lexer_p.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/templates/lib/lexer_p.h b/templates/lib/lexer_p.h +index 275aeea..1ae451a 100644 +--- a/templates/lib/lexer_p.h ++++ b/templates/lib/lexer_p.h +@@ -24,7 +24,7 @@ + #include "textprocessingmachine_p.h" + #include "token.h" + +-template class QList; ++#include + + namespace Grantlee + { diff --git a/programming/misc/grantlee-qt5/pspec.xml b/programming/misc/grantlee-qt5/pspec.xml index b0e196eab4..f4d992eb3a 100644 --- a/programming/misc/grantlee-qt5/pspec.xml +++ b/programming/misc/grantlee-qt5/pspec.xml @@ -20,6 +20,10 @@ cmake + + grantlee-c++11.patch + grantlee-qt-5.13.patch + @@ -50,6 +54,13 @@ + + 2019-09-28 + 5.1.0 + Rebuild. + Kamil Atlı + suvari@pisilinux.org + 2018-12-25 5.1.0