diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2017-07-01 15:36:20 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2017-07-01 15:36:20 +0200 |
| commit | a9d8edad93cd754f53112207483258f467ce1e27 (patch) | |
| tree | 67f2c3ca73789a09cc3f0952a2b98eaaf1caf7cc /media-gfx | |
| parent | dev-python/xapp: update python dep (diff) | |
| download | gentoo-a9d8edad93cd754f53112207483258f467ce1e27.tar.gz gentoo-a9d8edad93cd754f53112207483258f467ce1e27.tar.bz2 gentoo-a9d8edad93cd754f53112207483258f467ce1e27.zip | |
media-gfx/krita: Drop obsolete header, fix build with Qt-5.9
Reported-by: Vasco Gervasi <yellowhat46@gmail.com>
Gentoo-bug: 621420
Package-Manager: Portage-2.3.6, Repoman-2.3.1
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/krita/files/krita-3.1.4-qt-5.9.patch | 24 | ||||
| -rw-r--r-- | media-gfx/krita/krita-3.1.4.ebuild | 5 |
2 files changed, 28 insertions, 1 deletions
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 new file mode 100644 index 000000000000..6bda9ddd2062 --- /dev/null +++ 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 <lbeltrame@kde.org> +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 index 0b60191a36ab..371f0260e9b5 100644 --- 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=( |