[arch-commits] Commit in grantlee/trunk (3 files)

[Antonio Rojas]

    Date: Thursday, December 19, 2019 @ 06:48:00
  Author: arojas
Revision: 371673

Update to 5.2.0

Modified:
  grantlee/trunk/PKGBUILD
Deleted:
  grantlee/trunk/grantlee-c++11.patch
  grantlee/trunk/grantlee-qt-5.13.patch

------------------------+
 PKGBUILD               |   17 +++++------------
 grantlee-c++11.patch   |   24 ------------------------
 grantlee-qt-5.13.patch |   27 ---------------------------
 3 files changed, 5 insertions(+), 63 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-12-19 06:47:57 UTC (rev 371672)
+++ PKGBUILD	2019-12-19 06:48:00 UTC (rev 371673)
@@ -3,8 +3,8 @@
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 
 pkgname=grantlee
-pkgver=5.1.0
-pkgrel=4
+pkgver=5.2.0
+pkgrel=1
 pkgdesc="A string template engine based on the Django template system and written in Qt5"
 arch=(x86_64)
 url="https://github.com/steveire/grantlee"
@@ -11,20 +11,13 @@
 license=(LGPL2.1)
 depends=(qt5-script)
 makedepends=(cmake doxygen graphviz)
-source=("http://downloads.grantlee.org/grantlee-$pkgver.tar.gz"{,.asc}
-        grantlee-c++11.patch grantlee-qt-5.13.patch)
-sha256sums=('ea2e402466c74bb533eee2c7252209ec61cd93a5d236fecd625b4a0eb13a1478'
-            'SKIP'
-            'a14257e61489ee46c9236cc21af06e0eee5084c1563992d5a470153c7f318999'
-            '60226562926c881cc617f236936d611a85e841865095e215f0f470d1eb945b77')
+source=("http://downloads.grantlee.org/grantlee-$pkgver.tar.gz"{,.asc})
+sha256sums=('d6cd04de39a073a787c9ab8e72a0888e40779d21b83fbc788a1b36d31ac659d5'
+            'SKIP')
 validpgpkeys=(FCA530E51EE4331C2DF16637D264C7B1D02D6509) # Stephen Kelly <steveire at gmail.com>
 
 prepare() {
   mkdir -p build
-
-  cd $pkgname-$pkgver
-  patch -p1 -i ../grantlee-c++11.patch # Fix build with new gcc/Qt combinations
-  patch -p1 -i ../grantlee-qt-5.13.patch # Fix build with Qt 5.13
 }
 
 build() {

Deleted: grantlee-c++11.patch
===================================================================
--- grantlee-c++11.patch	2019-12-19 06:47:57 UTC (rev 371672)
+++ grantlee-c++11.patch	2019-12-19 06:48:00 UTC (rev 371673)
@@ -1,24 +0,0 @@
-From 3a5fc7662da3261be6496611900c095844e56ab1 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid at 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)

Deleted: grantlee-qt-5.13.patch
===================================================================
--- grantlee-qt-5.13.patch	2019-12-19 06:47:57 UTC (rev 371672)
+++ grantlee-qt-5.13.patch	2019-12-19 06:48:00 UTC (rev 371673)
@@ -1,27 +0,0 @@
-From 0cee029ee03ab4906c6d19b57458b5036852b0f8 Mon Sep 17 00:00:00 2001
-From: Michael Pyne <mpyne at 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.
-
-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 <typename T> class QList;
-+#include <QList>
- 
- namespace Grantlee
- {