summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-04-18 00:16:16 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2018-04-18 00:16:35 +0200
commit967f3fe4c64207649bafe95e7aeb1851b0e88a0b (patch)
tree97aaeda51000080bc5d84498e809072fe9ae827c /app-office
parentnet-misc/youtube-viewer: x86 stable (bug #653282) (diff)
downloadgentoo-967f3fe4c64207649bafe95e7aeb1851b0e88a0b.tar.gz
gentoo-967f3fe4c64207649bafe95e7aeb1851b0e88a0b.tar.bz2
gentoo-967f3fe4c64207649bafe95e7aeb1851b0e88a0b.zip
app-office/skrooge: Fix build with Qt 5.11 (missing QHeaderView)
Package-Manager: Portage-2.3.30, Repoman-2.3.9
Diffstat (limited to 'app-office')
-rw-r--r--app-office/skrooge/files/skrooge-2.12.0-qt-5.11.patch40
-rw-r--r--app-office/skrooge/skrooge-2.12.0.ebuild2
2 files changed, 42 insertions, 0 deletions
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 000000000000..e1a9bbbd3282
--- /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 <asturm@gentoo.org>
+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 <ksqueezedtextlabel.h>
+ #include <kformat.h>
+
++#include <QHeaderView>
+ #include <qpainter.h>
+
+ #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 <QHeaderView>
+ #include <qmenu.h>
+ #include <qdesktopservices.h>
+ #include <qprinter.h>
+--
+2.17.0
+
diff --git a/app-office/skrooge/skrooge-2.12.0.ebuild b/app-office/skrooge/skrooge-2.12.0.ebuild
index f5110fcfb096..23192a6a386c 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)