CVS commit: pkgsrc/devel/grantlee-qt5

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Tue Aug 27 06:26:19 UTC 2019

Modified Files:
        pkgsrc/devel/grantlee-qt5: Makefile distinfo
Added Files:
        pkgsrc/devel/grantlee-qt5/patches: patch-CMakeLists.txt
            patch-templates_lib_lexer_p.h

Log Message:
grantlee-qt5: fix build with Qt 5.13


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/devel/grantlee-qt5/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/grantlee-qt5/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/grantlee-qt5/patches/patch-CMakeLists.txt \
    pkgsrc/devel/grantlee-qt5/patches/patch-templates_lib_lexer_p.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/grantlee-qt5/Makefile
diff -u pkgsrc/devel/grantlee-qt5/Makefile:1.21 pkgsrc/devel/grantlee-qt5/Makefile:1.22
--- pkgsrc/devel/grantlee-qt5/Makefile:1.21     Wed Apr  3 00:32:35 2019
+++ pkgsrc/devel/grantlee-qt5/Makefile  Tue Aug 27 06:26:19 2019
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2019/04/03 00:32:35 ryoon Exp $
+# $NetBSD: Makefile,v 1.22 2019/08/27 06:26:19 markd Exp $
 #
 
 DISTNAME=      grantlee-5.1.0
 PKGNAME=       ${DISTNAME:S/-/-qt5-/}
-PKGREVISION=   20
+PKGREVISION=   21
 CATEGORIES=    devel
 MASTER_SITES=  http://downloads.grantlee.org/
 

Index: pkgsrc/devel/grantlee-qt5/distinfo
diff -u pkgsrc/devel/grantlee-qt5/distinfo:1.1 pkgsrc/devel/grantlee-qt5/distinfo:1.2
--- pkgsrc/devel/grantlee-qt5/distinfo:1.1      Sun May  8 11:21:40 2016
+++ pkgsrc/devel/grantlee-qt5/distinfo  Tue Aug 27 06:26:19 2019
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.1 2016/05/08 11:21:40 markd Exp $
+$NetBSD: distinfo,v 1.2 2019/08/27 06:26:19 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

Added files:

Index: pkgsrc/devel/grantlee-qt5/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/devel/grantlee-qt5/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Tue Aug 27 06:26:19 2019
+++ pkgsrc/devel/grantlee-qt5/patches/patch-CMakeLists.txt      Tue Aug 27 06:26:19 2019
@@ -0,0 +1,20 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2019/08/27 06:26:19 markd Exp $
+
+From: Albert Astals Cid <aacid%kde.org@localhost>
+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)
Index: pkgsrc/devel/grantlee-qt5/patches/patch-templates_lib_lexer_p.h
diff -u /dev/null pkgsrc/devel/grantlee-qt5/patches/patch-templates_lib_lexer_p.h:1.1
--- /dev/null   Tue Aug 27 06:26:19 2019
+++ pkgsrc/devel/grantlee-qt5/patches/patch-templates_lib_lexer_p.h     Tue Aug 27 06:26:19 2019
@@ -0,0 +1,21 @@
+$NetBSD: patch-templates_lib_lexer_p.h,v 1.1 2019/08/27 06:26:19 markd Exp $
+
+From: Michael Pyne <mpyne%kde.org@localhost>
+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
+ {