Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/files/, media-gfx/kphotoalbum/
Date: Sun, 19 Aug 2018 08:26:59
Message-Id: 1534667204.a335e6425c364c07fafda12eea999ed1d30a3dbb.asturm@gentoo
1 commit: a335e6425c364c07fafda12eea999ed1d30a3dbb
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 19 08:20:47 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 19 08:26:44 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a335e642
7
8 media-gfx/kphotoalbum: Fix build with GCC-8
9
10 Package-Manager: Portage-2.3.47, Repoman-2.3.10
11
12 .../kphotoalbum/files/kphotoalbum-5.3-gcc8.patch | 29 ++++++++++++++++++++++
13 media-gfx/kphotoalbum/kphotoalbum-5.3.ebuild | 2 ++
14 2 files changed, 31 insertions(+)
15
16 diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.3-gcc8.patch b/media-gfx/kphotoalbum/files/kphotoalbum-5.3-gcc8.patch
17 new file mode 100644
18 index 00000000000..ce52589b23c
19 --- /dev/null
20 +++ b/media-gfx/kphotoalbum/files/kphotoalbum-5.3-gcc8.patch
21 @@ -0,0 +1,29 @@
22 +From 47f4c00adaa442cd03b02d44517b5503718f2813 Mon Sep 17 00:00:00 2001
23 +From: Christophe Giboudeaux <christophe@××××.fr>
24 +Date: Tue, 12 Jun 2018 22:52:06 +0200
25 +Subject: Fix build with Qt 5.11.
26 +
27 +Summary: 'id' is an int, it doesn't need qPrintable.
28 +
29 +Reviewers: johanneszarl
30 +
31 +Differential Revision: https://phabricator.kde.org/D13329
32 +---
33 + RemoteControl/RemoteConnection.cpp | 2 +-
34 + 1 file changed, 1 insertion(+), 1 deletion(-)
35 +
36 +diff --git a/RemoteControl/RemoteConnection.cpp b/RemoteControl/RemoteConnection.cpp
37 +index 1dacb72..8bc18d0 100644
38 +--- a/RemoteControl/RemoteConnection.cpp
39 ++++ b/RemoteControl/RemoteConnection.cpp
40 +@@ -105,7 +105,7 @@ void RemoteConnection::dataReceived()
41 + std::unique_ptr<RemoteCommand> command = RemoteCommand::create(static_cast<CommandType>(id));
42 + command->decode(stream);
43 + protocolDebug() << qPrintable(QTime::currentTime().toString(QString::fromUtf8("hh:mm:ss.zzz")))
44 +- << ": Received " << qPrintable(id);
45 ++ << ": Received " << id;
46 +
47 + emit gotCommand(*command);
48 + }
49 +--
50 +cgit v0.11.2
51
52 diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.3.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.3.ebuild
53 index ad95715accd..c5416d5f9a7 100644
54 --- a/media-gfx/kphotoalbum/kphotoalbum-5.3.ebuild
55 +++ b/media-gfx/kphotoalbum/kphotoalbum-5.3.ebuild
56 @@ -52,6 +52,8 @@ RDEPEND="${COMMON_DEPEND}
57
58 DOCS=( ChangeLog README )
59
60 +PATCHES=( "${FILESDIR}/${P}-gcc8.patch" )
61 +
62 src_configure() {
63 append-ldflags -fuse-ld=gold #bug #623566