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 CB97D138334 for ; Sun, 15 Jul 2018 10:38:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DC838E082D; Sun, 15 Jul 2018 10:38:48 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 AFB93E082D for ; Sun, 15 Jul 2018 10:38:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 918D0335C07 for ; Sun, 15 Jul 2018 10:38:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E52E935E for ; Sun, 15 Jul 2018 10:38:44 +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: <1531651099.005aebaa26b159d7c4a755c719bf2c5bb2b8d490.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/, app-office/calligra/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/calligra/calligra-3.1.0-r2.ebuild app-office/calligra/files/calligra-3.1.0-stage-qt-5.11.patch X-VCS-Directories: app-office/calligra/files/ app-office/calligra/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 005aebaa26b159d7c4a755c719bf2c5bb2b8d490 X-VCS-Branch: master Date: Sun, 15 Jul 2018 10:38:44 +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-Archives-Salt: e03c7208-8e67-4918-b469-517676ae9594 X-Archives-Hash: d32851b367e51162bce18b05fe8e96ec commit: 005aebaa26b159d7c4a755c719bf2c5bb2b8d490 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jul 15 10:01:56 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jul 15 10:38:19 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=005aebaa app-office/calligra: Fix build with Qt-5.11 Closes: https://bugs.gentoo.org/661222 Package-Manager: Portage-2.3.41, Repoman-2.3.9 app-office/calligra/calligra-3.1.0-r2.ebuild | 1 + .../files/calligra-3.1.0-stage-qt-5.11.patch | 23 ++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/app-office/calligra/calligra-3.1.0-r2.ebuild b/app-office/calligra/calligra-3.1.0-r2.ebuild index 0389b5b7c9d..e2a76aa73c6 100644 --- a/app-office/calligra/calligra-3.1.0-r2.ebuild +++ b/app-office/calligra/calligra-3.1.0-r2.ebuild @@ -142,6 +142,7 @@ PATCHES=( "${FILESDIR}"/${P}-no-arch-detection.patch "${FILESDIR}"/${P}-doc.patch "${FILESDIR}"/${P}-qt-5.11.patch + "${FILESDIR}"/${P}-stage-qt-5.11.patch ) pkg_pretend() { diff --git a/app-office/calligra/files/calligra-3.1.0-stage-qt-5.11.patch b/app-office/calligra/files/calligra-3.1.0-stage-qt-5.11.patch new file mode 100644 index 00000000000..120864e11d4 --- /dev/null +++ b/app-office/calligra/files/calligra-3.1.0-stage-qt-5.11.patch @@ -0,0 +1,23 @@ +From ee83e0f2c251072e47a2799619cdc79efe67e651 Mon Sep 17 00:00:00 2001 +From: David Faure +Date: Tue, 3 Apr 2018 00:31:19 +0200 +Subject: Fix compilation with Qt 5.11 (missing include) + +--- + stage/part/KPrPresentationTool.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/stage/part/KPrPresentationTool.cpp b/stage/part/KPrPresentationTool.cpp +index ae743da..3007f91 100644 +--- a/stage/part/KPrPresentationTool.cpp ++++ b/stage/part/KPrPresentationTool.cpp +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + #include + #include +-- +cgit v0.11.2