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 847421382C5 for ; Tue, 17 Apr 2018 22:17:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C83DBE09F7; Tue, 17 Apr 2018 22:17:03 +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 98738E09F7 for ; Tue, 17 Apr 2018 22:17:03 +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 98778335C2E for ; Tue, 17 Apr 2018 22:17:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 007FA254 for ; Tue, 17 Apr 2018 22:17:00 +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: <1524003395.967f3fe4c64207649bafe95e7aeb1851b0e88a0b.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/skrooge/, app-office/skrooge/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/skrooge/files/skrooge-2.12.0-qt-5.11.patch app-office/skrooge/skrooge-2.12.0.ebuild X-VCS-Directories: app-office/skrooge/files/ app-office/skrooge/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 967f3fe4c64207649bafe95e7aeb1851b0e88a0b X-VCS-Branch: master Date: Tue, 17 Apr 2018 22:17:00 +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: 6ce6869d-4634-4195-b38a-abffe5a458f2 X-Archives-Hash: db1d162e328025aa53b94bbbefaea283 commit: 967f3fe4c64207649bafe95e7aeb1851b0e88a0b Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Apr 17 22:16:16 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Apr 17 22:16:35 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=967f3fe4 app-office/skrooge: Fix build with Qt 5.11 (missing QHeaderView) Package-Manager: Portage-2.3.30, Repoman-2.3.9 .../skrooge/files/skrooge-2.12.0-qt-5.11.patch | 40 ++++++++++++++++++++++ app-office/skrooge/skrooge-2.12.0.ebuild | 2 ++ 2 files changed, 42 insertions(+) diff --git a/app-office/skrooge/files/skrooge-2.12.0-qt-5.11.patch b/app-office/skrooge/files/skrooge-2.12.0-qt-5.11.patch new file mode 100644 index 00000000000..e1a9bbbd328 --- /dev/null +++ b/app-office/skrooge/files/skrooge-2.12.0-qt-5.11.patch @@ -0,0 +1,40 @@ +From 38e61d2cd8a4a4b863801f8a5097b8b51b0c8e93 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Tue, 17 Apr 2018 23:49:52 +0200 +Subject: [PATCH] Fix build with Qt 5.11 (missing QHeaderView) + +Reviewers: #skrooge + +Differential Revision: https://phabricator.kde.org/D12297 +--- + plugins/skrooge/skrooge_operation/skgsplittabledelegate.cpp | 1 + + skgbasegui/skggraphicsview.cpp | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/plugins/skrooge/skrooge_operation/skgsplittabledelegate.cpp b/plugins/skrooge/skrooge_operation/skgsplittabledelegate.cpp +index aa171913c..930c4ea3e 100644 +--- a/plugins/skrooge/skrooge_operation/skgsplittabledelegate.cpp ++++ b/plugins/skrooge/skrooge_operation/skgsplittabledelegate.cpp +@@ -24,6 +24,7 @@ + #include + #include + ++#include + #include + + #include "skgbasegui_settings.h" +diff --git a/skgbasegui/skggraphicsview.cpp b/skgbasegui/skggraphicsview.cpp +index 4c4557880..7143ade3b 100644 +--- a/skgbasegui/skggraphicsview.cpp ++++ b/skgbasegui/skggraphicsview.cpp +@@ -21,6 +21,7 @@ + */ + #include "skggraphicsview.h" + ++#include + #include + #include + #include +-- +2.17.0 + diff --git a/app-office/skrooge/skrooge-2.12.0.ebuild b/app-office/skrooge/skrooge-2.12.0.ebuild index f5110fcfb09..23192a6a386 100644 --- a/app-office/skrooge/skrooge-2.12.0.ebuild +++ b/app-office/skrooge/skrooge-2.12.0.ebuild @@ -76,6 +76,8 @@ REQUIRED_USE="test? ( designer )" # hangs + installs files RESTRICT+=" test" +PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" ) + src_configure() { local mycmakeargs=( -DSKG_BUILD_TEST=$(usex test)