* [PR PATCH] grantlee5: update to 5.2.0.
@ 2020-01-11 23:23 voidlinux-github
2020-01-12 18:23 ` [PR PATCH] [Merged]: " voidlinux-github
0 siblings, 1 reply; 2+ messages in thread
From: voidlinux-github @ 2020-01-11 23:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 314 bytes --]
There is a new pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages grantlee5
https://github.com/void-linux/void-packages/pull/18255
grantlee5: update to 5.2.0.
A patch file from https://github.com/void-linux/void-packages/pull/18255.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-grantlee5-18255.patch --]
[-- Type: text/x-diff, Size: 5759 bytes --]
From d8be8c8c8bcc8954ec1b1bc01c9b55eb0248eac0 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens04@gmail.com>
Date: Sat, 11 Jan 2020 16:59:00 -0600
Subject: [PATCH] grantlee5: update to 5.2.0.
---
srcpkgs/grantlee5/patches/ansi.patch | 14 -----
.../patches/fix-gcc7-qt580-qcwarning.patch | 54 -------------------
srcpkgs/grantlee5/patches/fix-qt513.patch | 12 -----
srcpkgs/grantlee5/template | 6 +--
4 files changed, 3 insertions(+), 83 deletions(-)
delete mode 100644 srcpkgs/grantlee5/patches/ansi.patch
delete mode 100644 srcpkgs/grantlee5/patches/fix-gcc7-qt580-qcwarning.patch
delete mode 100644 srcpkgs/grantlee5/patches/fix-qt513.patch
diff --git a/srcpkgs/grantlee5/patches/ansi.patch b/srcpkgs/grantlee5/patches/ansi.patch
deleted file mode 100644
index 40d3551fb4b..00000000000
--- a/srcpkgs/grantlee5/patches/ansi.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-The -ansi flag here is wrong, it disables C++11 features on modern setups
-which completely breaks compilation of everything (Qt needs C++11).
-
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -56,7 +56,7 @@ endif()
-
- if (CMAKE_COMPILER_IS_GNUCXX)
- set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
-- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-check-new -fno-common ")
-+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-check-new -fno-common ")
-
- if (CMAKE_BUILD_TYPE MATCHES TestCocoon)
- # Needed on 64 bit
diff --git a/srcpkgs/grantlee5/patches/fix-gcc7-qt580-qcwarning.patch b/srcpkgs/grantlee5/patches/fix-gcc7-qt580-qcwarning.patch
deleted file mode 100644
index 68c8246f8e3..00000000000
--- a/srcpkgs/grantlee5/patches/fix-gcc7-qt580-qcwarning.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- templates/lib/customtyperegistry.cpp 2016-04-19 08:33:17.000000000 +0200
-+++ templates/lib/customtyperegistry.cpp 2017-12-18 17:59:07.377687292 +0100
-@@ -57,16 +57,16 @@
-
- {
- if (!types.contains(id)) {
-- qCWarning(GRANTLEE_CUSTOMTYPE) << "Don't know how to handle metatype"
-- << QMetaType::typeName(id);
-+ qCWarning(GRANTLEE_CUSTOMTYPE, "Don't know how to handle metatype %s",
-+ QMetaType::typeName(id));
- // :TODO: Print out error message
- return QVariant();
- }
-
- const CustomTypeInfo &info = types[id];
- if (!info.lookupFunction) {
-- qCWarning(GRANTLEE_CUSTOMTYPE) << "No lookup function for metatype"
-- << QMetaType::typeName(id);
-+ qCWarning(GRANTLEE_CUSTOMTYPE, "No lookup function for metatype %s",
-+ QMetaType::typeName(id));
- lf = 0;
- // :TODO: Print out error message
- return QVariant();
---- templates/lib/template.cpp 2016-04-19 08:33:17.000000000 +0200
-+++ templates/lib/template.cpp 2017-12-18 18:03:59.522681407 +0100
-@@ -66,7 +66,7 @@
- d->m_nodeList = d->compileString(templateString);
- d->setError(NoError, QString());
- } catch (Grantlee::Exception &e) {
-- qCWarning(GRANTLEE_TEMPLATE) << e.what();
-+ qCWarning(GRANTLEE_TEMPLATE, "%s", qPrintable(e.what()));
- d->setError(e.errorCode(), e.what());
- }
- }
-@@ -92,7 +92,7 @@
- d->m_nodeList.render(stream, c);
- d->setError(NoError, QString());
- } catch (Grantlee::Exception &e) {
-- qCWarning(GRANTLEE_TEMPLATE) << e.what();
-+ qCWarning(GRANTLEE_TEMPLATE, "%s", qPrintable(e.what()));
- d->setError(e.errorCode(), e.what());
- }
-
---- templates/lib/qtlocalizer.cpp 2016-04-19 08:33:17.000000000 +0200
-+++ templates/lib/qtlocalizer.cpp 2017-12-18 18:04:50.501680381 +0100
-@@ -67,7 +67,7 @@
- {
- Q_ASSERT(!m_locales.isEmpty());
- if (m_locales.isEmpty()) {
-- qCWarning(GRANTLEE_LOCALIZER) << "Invalid Locale";
-+ qCWarning(GRANTLEE_LOCALIZER, "Invalid Locale");
- return QLocale();
- }
- return m_locales.last()->locale;
diff --git a/srcpkgs/grantlee5/patches/fix-qt513.patch b/srcpkgs/grantlee5/patches/fix-qt513.patch
deleted file mode 100644
index 37bdd38a17a..00000000000
--- a/srcpkgs/grantlee5/patches/fix-qt513.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- templates/lib/lexer_p.h 2016-04-19 08:33:17.000000000 +0200
-+++ templates/lib/lexer_p.h 2019-07-17 18:59:09.532287091 +0200
-@@ -23,8 +23,7 @@
-
- #include "textprocessingmachine_p.h"
- #include "token.h"
--
--template <typename T> class QList;
-+#include <QList>
-
- namespace Grantlee
- {
diff --git a/srcpkgs/grantlee5/template b/srcpkgs/grantlee5/template
index 8b1e0338918..8fcb984ebb8 100644
--- a/srcpkgs/grantlee5/template
+++ b/srcpkgs/grantlee5/template
@@ -1,7 +1,7 @@
# Template file for 'grantlee5'
pkgname=grantlee5
-version=5.1.0
-revision=4
+version=5.2.0
+revision=1
wrksrc=${pkgname%5}-${version}
build_style=cmake
makedepends="qt5-script-devel qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://github.com/steveire/grantlee"
distfiles="${homepage}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3836572fe5e49d28a1d99186c6d96f88ff839644b4bc77b73b6d8208f6ccc9d1
+checksum=139acee5746b957bdf1327ec0d97c604d4c0b9be42aec5d584297cb5ed6a990a
if [ -n "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-host-tools qt5-tools-devel"
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-01-12 18:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-11 23:23 [PR PATCH] grantlee5: update to 5.2.0 voidlinux-github
2020-01-12 18:23 ` [PR PATCH] [Merged]: " voidlinux-github
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).