Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/ktorrent/, net-p2p/ktorrent/files/
Date: Tue, 24 Apr 2018 08:49:00
Message-Id: 1524559729.1968a7bbb830347f73a27c1b98eca3cd8bca9c1d.polynomial-c@gentoo
1 commit: 1968a7bbb830347f73a27c1b98eca3cd8bca9c1d
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Tue Apr 24 08:48:14 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue Apr 24 08:48:49 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1968a7bb
7
8 net-p2p/ktorrent: Fixed compilation with cmake-3.11
9
10 commit permission kindly granted by asturm
11
12 Closes: https://bugs.gentoo.org/650808
13 Package-Manager: Portage-2.3.31, Repoman-2.3.9
14
15 net-p2p/ktorrent/files/ktorrent-5.1.0-cmake-3.11.patch | 13 +++++++++++++
16 net-p2p/ktorrent/ktorrent-5.1.0.ebuild | 5 ++++-
17 2 files changed, 17 insertions(+), 1 deletion(-)
18
19 diff --git a/net-p2p/ktorrent/files/ktorrent-5.1.0-cmake-3.11.patch b/net-p2p/ktorrent/files/ktorrent-5.1.0-cmake-3.11.patch
20 new file mode 100644
21 index 00000000000..c0b9167636a
22 --- /dev/null
23 +++ b/net-p2p/ktorrent/files/ktorrent-5.1.0-cmake-3.11.patch
24 @@ -0,0 +1,13 @@
25 +https://docs.freebsd.org/cgi/getmsg.cgi?fetch=4423635+0+/usr/local/www/mailindex/archive/2018/svn-ports-all/20180415.svn-ports-all
26 +
27 +--- ktorrent-5.1.0/ktorrent/dialogs/torrentcreatordlg.h
28 ++++ ktorrent-5.1.0/ktorrent/dialogs/torrentcreatordlg.h
29 +@@ -23,6 +23,8 @@
30 + #define KT_TORRENTCREATORDLG_HH
31 +
32 + #include <QDialog>
33 ++#include <QTimer>
34 ++
35 + #include "ui_torrentcreatordlg.h"
36 + #include <torrent/torrentcreator.h>
37 +
38
39 diff --git a/net-p2p/ktorrent/ktorrent-5.1.0.ebuild b/net-p2p/ktorrent/ktorrent-5.1.0.ebuild
40 index ef67d30802d..567c2e977b4 100644
41 --- a/net-p2p/ktorrent/ktorrent-5.1.0.ebuild
42 +++ b/net-p2p/ktorrent/ktorrent-5.1.0.ebuild
43 @@ -78,7 +78,10 @@ RDEPEND="${COMMON_DEPEND}
44 !net-p2p/ktorrent:4
45 "
46
47 -PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
48 +PATCHES=(
49 + "${FILESDIR}/${P}-qt-5.11.patch"
50 + "${FILESDIR}/${P}-cmake-3.11.patch" #650808
51 +)
52
53 src_configure() {
54 local mycmakeargs=(