From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/
Date: Sat, 1 Jul 2017 13:41:00 +0000 (UTC) [thread overview]
Message-ID: <1498916180.a9d8edad93cd754f53112207483258f467ce1e27.asturm@gentoo> (raw)
commit: a9d8edad93cd754f53112207483258f467ce1e27
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 1 13:36:20 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 1 13:36:20 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9d8edad
media-gfx/krita: Drop obsolete header, fix build with Qt-5.9
Reported-by: Vasco Gervasi <yellowhat46 <AT> gmail.com>
Gentoo-bug: 621420
Package-Manager: Portage-2.3.6, Repoman-2.3.1
media-gfx/krita/files/krita-3.1.4-qt-5.9.patch | 24 ++++++++++++++++++++++++
media-gfx/krita/krita-3.1.4.ebuild | 5 ++++-
2 files changed, 28 insertions(+), 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
new file mode 100644
index 00000000000..6bda9ddd206
--- /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 0b60191a36a..371f0260e9b 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=(
next reply other threads:[~2017-07-01 13:41 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-01 13:41 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-09-08 21:00 [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/ Johannes Huber
2018-08-29 16:48 Andreas Sturmlechner
2018-08-29 16:48 Andreas Sturmlechner
2018-09-01 19:31 Andreas Sturmlechner
2018-11-09 18:54 Andreas Sturmlechner
2018-12-28 17:48 Andreas Sturmlechner
2019-01-14 16:04 Andreas Sturmlechner
2019-07-31 9:45 Andreas Sturmlechner
2020-04-03 14:57 Andreas Sturmlechner
2020-06-18 23:03 Andreas Sturmlechner
2020-12-17 10:23 Andreas Sturmlechner
2021-06-20 8:33 Andreas Sturmlechner
2021-08-10 18:14 Andreas Sturmlechner
2021-11-15 13:37 Andreas Sturmlechner
2021-12-29 16:34 Andreas Sturmlechner
2022-06-15 17:18 Andreas Sturmlechner
2022-12-20 19:00 Andreas Sturmlechner
2023-12-26 8:59 Andreas Sturmlechner
2024-02-05 20:26 Andreas Sturmlechner
2024-07-13 18:02 Sam James
2024-07-13 19:59 Andreas Sturmlechner
2024-08-26 23:37 Sam James
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1498916180.a9d8edad93cd754f53112207483258f467ce1e27.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox