From bbf6a00f29ec73bb0b95c58f0821f412e9fe939d Mon Sep 17 00:00:00 2001 From: q66 Date: Fri, 16 Aug 2019 16:01:17 +0200 Subject: [PATCH] grantlee5: patch out -ansi from CXXFLAGS Also fix license. --- srcpkgs/grantlee5/patches/ansi.patch | 14 ++++++++++++++ srcpkgs/grantlee5/template | 4 ++-- 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/grantlee5/patches/ansi.patch diff --git a/srcpkgs/grantlee5/patches/ansi.patch b/srcpkgs/grantlee5/patches/ansi.patch new file mode 100644 index 00000000000..40d3551fb4b --- /dev/null +++ b/srcpkgs/grantlee5/patches/ansi.patch @@ -0,0 +1,14 @@ +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/template b/srcpkgs/grantlee5/template index a19c1a02db2..aece2dde0b7 100644 --- a/srcpkgs/grantlee5/template +++ b/srcpkgs/grantlee5/template @@ -1,13 +1,13 @@ # Template file for 'grantlee5' pkgname=grantlee5 version=5.1.0 -revision=3 +revision=4 wrksrc=${pkgname%5}-${version} build_style=cmake makedepends="qt5-script-devel qt5-tools-devel" short_desc="Qt5 string template engine based on the Django template system" maintainer="Juan RP " -license="LGPL-3" +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