Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libktorrent/, net-libs/libktorrent/files/
Date: Thu, 14 Nov 2019 17:32:06
Message-Id: 1573752699.a51bb03daa7f2c74449464ce7d7f1d95aef88151.asturm@gentoo
1 commit: a51bb03daa7f2c74449464ce7d7f1d95aef88151
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Nov 14 17:30:12 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Nov 14 17:31:39 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a51bb03d
7
8 net-libs/libktorrent: Fix build
9
10 Broken all of a sudden by... who knows what.
11
12 Closes: https://bugs.gentoo.org/700090
13 Package-Manager: Portage-2.3.79, Repoman-2.3.18
14 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
15
16 .../files/libktorrent-2.1.1-fileops.patch | 25 ++++++++++++++++++++++
17 net-libs/libktorrent/libktorrent-2.1.1.ebuild | 5 ++++-
18 2 files changed, 29 insertions(+), 1 deletion(-)
19
20 diff --git a/net-libs/libktorrent/files/libktorrent-2.1.1-fileops.patch b/net-libs/libktorrent/files/libktorrent-2.1.1-fileops.patch
21 new file mode 100644
22 index 00000000000..87d25e26b7b
23 --- /dev/null
24 +++ b/net-libs/libktorrent/files/libktorrent-2.1.1-fileops.patch
25 @@ -0,0 +1,25 @@
26 +From 1e8ce6e98d7ca0088624778964b9aed4696ce030 Mon Sep 17 00:00:00 2001
27 +From: Christoph Feck <cfeck@×××.org>
28 +Date: Thu, 14 Nov 2019 14:19:42 +0100
29 +Subject: Fix build with XFS
30 +
31 +BUG: 414050
32 +---
33 + src/util/fileops.cpp | 2 +-
34 + 1 file changed, 1 insertion(+), 1 deletion(-)
35 +
36 +diff --git a/src/util/fileops.cpp b/src/util/fileops.cpp
37 +index c76b0e3..cfe4d5e 100644
38 +--- a/src/util/fileops.cpp
39 ++++ b/src/util/fileops.cpp
40 +@@ -366,7 +366,7 @@ namespace bt
41 +
42 + bool XfsPreallocate(const QString & path, Uint64 size)
43 + {
44 +- int fd = ::open(QFile::encodeName(path), O_RDWR | O_LARGEFILE);
45 ++ int fd = ::open(QFile::encodeName(path).constData(), O_RDWR | O_LARGEFILE);
46 + if (fd < 0)
47 + throw Error(i18n("Cannot open %1: %2",path,strerror(errno)));
48 +
49 +--
50 +cgit v1.1
51
52 diff --git a/net-libs/libktorrent/libktorrent-2.1.1.ebuild b/net-libs/libktorrent/libktorrent-2.1.1.ebuild
53 index 34a552aa1dc..9399cfd161b 100644
54 --- a/net-libs/libktorrent/libktorrent-2.1.1.ebuild
55 +++ b/net-libs/libktorrent/libktorrent-2.1.1.ebuild
56 @@ -36,7 +36,10 @@ RDEPEND="${COMMON_DEPEND}
57 !dev-libs/botan[gmp(-)]
58 "
59
60 -PATCHES=( "${FILESDIR}/${PN}-2.1-unused-link.patch" ) # git master
61 +PATCHES=(
62 + "${FILESDIR}/${P}-fileops.patch" # bug 700090
63 + "${FILESDIR}/${PN}-2.1-unused-link.patch" # git master
64 +)
65
66 src_prepare() {
67 kde5_src_prepare