Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-misc/ktoshiba/files/, kde-misc/ktoshiba/
Date: Wed, 24 Oct 2018 18:19:06
Message-Id: 1540404927.cc4b5436d6e45bf56c6b08f726b810254851c50e.asturm@gentoo
1 commit: cc4b5436d6e45bf56c6b08f726b810254851c50e
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Oct 24 18:15:27 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Oct 24 18:15:27 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc4b5436
7
8 kde-misc/ktoshiba: Fix build with Qt 5.11
9
10 Closes: https://bugs.gentoo.org/669518
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12 Package-Manager: Portage-2.3.51, Repoman-2.3.11
13
14 kde-misc/ktoshiba/files/ktoshiba-5.3.1-qt-5.11.patch | 10 ++++++++++
15 kde-misc/ktoshiba/ktoshiba-5.3.1.ebuild | 5 +++--
16 2 files changed, 13 insertions(+), 2 deletions(-)
17
18 diff --git a/kde-misc/ktoshiba/files/ktoshiba-5.3.1-qt-5.11.patch b/kde-misc/ktoshiba/files/ktoshiba-5.3.1-qt-5.11.patch
19 new file mode 100644
20 index 00000000000..c7ec51226ad
21 --- /dev/null
22 +++ b/kde-misc/ktoshiba/files/ktoshiba-5.3.1-qt-5.11.patch
23 @@ -0,0 +1,10 @@
24 +--- a/src/fnactions.cpp 2016-06-06 17:41:50.425121940 +0200
25 ++++ b/src/fnactions.cpp 2018-10-24 20:10:45.872718660 +0200
26 +@@ -17,6 +17,7 @@
27 + */
28 +
29 + #include <QDesktopWidget>
30 ++#include <QIcon>
31 + #include <QTimer>
32 +
33 + #include <KLocalizedString>
34
35 diff --git a/kde-misc/ktoshiba/ktoshiba-5.3.1.ebuild b/kde-misc/ktoshiba/ktoshiba-5.3.1.ebuild
36 index 4295ad18882..6bfd01a7e52 100644
37 --- a/kde-misc/ktoshiba/ktoshiba-5.3.1.ebuild
38 +++ b/kde-misc/ktoshiba/ktoshiba-5.3.1.ebuild
39 @@ -1,4 +1,4 @@
40 -# Copyright 1999-2016 Gentoo Foundation
41 +# Copyright 1999-2018 Gentoo Authors
42 # Distributed under the terms of the GNU General Public License v2
43
44 EAPI=6
45 @@ -28,11 +28,12 @@ RDEPEND="
46 $(add_qt_dep qtwidgets)
47 net-libs/libmnl
48 "
49 -
50 DEPEND="${RDEPEND}
51 sys-devel/gettext
52 "
53
54 +PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
55 +
56 src_configure() {
57 local mycmakeargs=(
58 -DLIBMNL_INCLUDE_DIRS=/usr/include/libmnl