gentoo resync : 19.04.2018

4 files changed, 44 insertions, 1 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 48b96cdec5aa..34fb7c994580 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index fe908dd102c8..80d355265974 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,5 +1,6 @@
+AUX skrooge-2.12.0-qt-5.11.patch 1280 BLAKE2B cae8b90183fefa70f062355184f40e8767d357e78e4eed1901a32dae3e1b444251c37917e69201e23873d91ccb47b19268b85906cf45f36b0414751770c0e2fd SHA512 625947c334c06ed9bfd0c7cf0a7a6b0ddcf491572532d9e73e529cd4a1ef2e53939b6570df9442817269db897dc2d3c5155d318e6738ddcd4787470a8ffc85ad
 DIST skrooge-2.11.0.tar.xz 20677024 BLAKE2B d8995746a64489cf9b6c824c8d6349f2ef10a57fcc086c97db0ce1b65e31f72fa4c41994b4dd4ab85df008e2721bd84a029a9f71ea219d6203856e314895e2ef SHA512 088ef94d2eaa866a1cf3f55ed960bccf27a80e3a1138855b35fa301c799468b0d0594a03310872a9b3ce2513d1ac9a8df3fa039636517f7b2b135fda65a67e00
 DIST skrooge-2.12.0.tar.xz 20289828 BLAKE2B 999f100fffca3b8fff5e343b1137fc51e337428cdbd89f7e5eb72811e3e5e1522cc257e6be83aad57cf4ec66fefd061b685d94caaadcc27182f32da13d57014f SHA512 348262a7e86f6b3f9fa028fea324eeb73c96e03a77d16774ae9f4b554c1893aca7a002bcf3160d4055cfe8aaceeb76a364e71e7f605382cfe1a801eca1ca874f
 EBUILD skrooge-2.11.0.ebuild 2365 BLAKE2B aeaf4ffdc815569d4c124bff99bc47acd7b49b576e761e981073a86e0c2e24275696dfcbc4ca2105e3c6fa0b52149130d0a21d9910750ed15e50f9a1b99bb2c6 SHA512 fd9c100ebf80952bb209597e369ca03f88e0a122ec4fb7271ed551c72016e360e49f87f5abff85018eed0a42cf03b39806d1ecb5b973526e95e9443c255b44e8
-EBUILD skrooge-2.12.0.ebuild 2367 BLAKE2B e4045cba2290bad7f903e9ff81615f7f5f443a0c3dd42ec82a6e1e43e7e9ef421737fa06a799d76c63e1801ea2ce43cfb74fb5b1dc959ae6cf1cc96125ec2773 SHA512 9e2ceacaa2ae8e16864cf3fe4de6dea5d261ad24f42af0e6499b7f1be88afabc3c40ee178de0ff12eb8c70ac1d1d58d73d912d55ea785d2f4739dab35e1bce5c
+EBUILD skrooge-2.12.0.ebuild 2413 BLAKE2B 0906c4ba93a25911e3241d264d4a8f3b6f2fed747d24f5913a6a4d672cc582eb82df3dfadd78ccd07efe8bbeeead34a74c71ffad68709ea0dc1b71ea77c53398 SHA512 32e82aee3c6b63f2750749be6816da2a57ddcaec1d71f5f3526537aca1117849bb4bba511a0c1b44c273d2db4ce3a425f1577e45a2555140c1b25d23330196f0
 MISC metadata.xml 400 BLAKE2B b0f7a87e2c2fda05271f731d2c3a6d9a490cf94dd7a742ed60e21aa44964a50bad1218c6ebd9ad16d87a8814f34b70792f7d80bd1e03d80845bd9f1c9292a95c SHA512 50120cec8f5798f6b104c6e1fd05b831f2f280e2f3bab8aa66667a3da1bb351a955b671d16cf4e30b44b0738625424fe4a32bb8a677947d147031964e108dcb0
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)