media-gfx/krita: Drop obsolete header, fix build with Qt-5.9

Reported-by: Vasco Gervasi <[email protected]> Gentoo-bug: 621420 Package-Manager: Portage-2.3.6, Repoman-2.3.1
johu · Jul 1, 2017 · a9d8eda · a9d8eda
1 parent d744fb4
commit a9d8eda
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/media-gfx/krita/files/krita-3.1.4-qt-5.9.patch b/media-gfx/krita/files/krita-3.1.4-qt-5.9.patch
@@ -0,0 +1,24 @@
+From 2f59d0d1d91e3f79342c20d0df68aa9a51817e8d Mon Sep 17 00:00:00 2001
+From: Luca Beltrame <[email protected]>
+Date: Sat, 6 May 2017 16:00:21 +0200
+Subject: [PATCH] Drop QForeachContainer include and fix Qt 5.9 build
+
+It's not used anywhere.
+
+Acked by boud.
+---
+ libs/ui/KisResourceBundleManifest.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/libs/ui/KisResourceBundleManifest.cpp b/libs/ui/KisResourceBundleManifest.cpp
+index e4f94ca788..83761657d8 100644
+--- a/libs/ui/KisResourceBundleManifest.cpp
++++ b/libs/ui/KisResourceBundleManifest.cpp
+@@ -22,7 +22,6 @@
+ #include <QDomElement>
+ #include <QDomNode>
+ #include <QDomNodeList>
+-#include <QForeachContainer>
+
+ #include <KoXmlNS.h>
+ #include <KoXmlReader.h>
diff --git a/media-gfx/krita/krita-3.1.4.ebuild b/media-gfx/krita/krita-3.1.4.ebuild
@@ -72,7 +72,10 @@ RDEPEND="${COMMON_DEPEND}
 	!app-office/calligra-l10n:4[calligra_features_krita(+)]
 "
 
-PATCHES=( "${FILESDIR}"/${PN}-vc-fix-gcc49-abi.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-vc-fix-gcc49-abi.patch
+	"${FILESDIR}"/${P}-qt-5.9.patch
+)
 
 src_configure() {
 	local mycmakeargs=(