From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 552CC138334 for ; Sun, 17 Feb 2019 13:04:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 732FDE09C3; Sun, 17 Feb 2019 13:04:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 50238E09C3 for ; Sun, 17 Feb 2019 13:04:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C1039335D04 for ; Sun, 17 Feb 2019 13:04:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1FC9D517 for ; Sun, 17 Feb 2019 13:04:47 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1550408676.cb0b10d7fea3b70322551676b92e42fa0b2692b5.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/grantlee/files/, dev-libs/grantlee/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/grantlee/files/grantlee-5.1.0-qt-5.13.patch dev-libs/grantlee/grantlee-5.1.0.ebuild X-VCS-Directories: dev-libs/grantlee/ dev-libs/grantlee/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: cb0b10d7fea3b70322551676b92e42fa0b2692b5 X-VCS-Branch: master Date: Sun, 17 Feb 2019 13:04:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0bfa4784-1590-40ae-9dc3-9a2c3c267722 X-Archives-Hash: aa3e7b5a0564fe80c26847352bfc921a commit: cb0b10d7fea3b70322551676b92e42fa0b2692b5 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Feb 17 13:04:15 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Feb 17 13:04:36 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb0b10d7 dev-libs/grantlee: Fix build with Qt 5.13 Package-Manager: Portage-2.3.60, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> .../grantlee/files/grantlee-5.1.0-qt-5.13.patch | 27 ++++++++++++++++++++++ dev-libs/grantlee/grantlee-5.1.0.ebuild | 5 ++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dev-libs/grantlee/files/grantlee-5.1.0-qt-5.13.patch b/dev-libs/grantlee/files/grantlee-5.1.0-qt-5.13.patch new file mode 100644 index 00000000000..67a92c1f869 --- /dev/null +++ b/dev-libs/grantlee/files/grantlee-5.1.0-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/dev-libs/grantlee/grantlee-5.1.0.ebuild b/dev-libs/grantlee/grantlee-5.1.0.ebuild index 21f665921e5..328ce49c302 100644 --- a/dev-libs/grantlee/grantlee-5.1.0.ebuild +++ b/dev-libs/grantlee/grantlee-5.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -29,7 +29,8 @@ DOCS=( AUTHORS CHANGELOG README.md ) PATCHES=( "${FILESDIR}/${PN}-0.3.0-nonfatal-warnings.patch" - "${FILESDIR}/${PN}-5.1.0-slot.patch" + "${FILESDIR}/${P}-slot.patch" + "${FILESDIR}/${P}-qt-5.13.patch" ) src_prepare() {