gentoo resync : 25.08.2020

3 files changed, 26 insertions, 49 deletions

diff --git a/net-libs/libktorrent/files/libktorrent-2.1-unused-link.patch b/net-libs/libktorrent/files/libktorrent-2.1-unused-link.patch
deleted file mode 100644
index 636c59d1b065..000000000000
--- a/net-libs/libktorrent/files/libktorrent-2.1-unused-link.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From e7c4847d9bbdc5d7c7435039aa5088d276ca5bce Mon Sep 17 00:00:00 2001
-From: Jonathan Riddell <jr@jriddell.org>
-Date: Mon, 10 Jun 2019 13:27:29 +0100
-Subject: remove unused link to kcrash, it can be used by the apps which use
- libktorrent but it needs to be initialised not just arbitrarily linked to
-
----
- src/CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index d347e07..1578bf4 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -235,7 +235,6 @@ PRIVATE
-     qca-qt5
- PUBLIC
-     KF5::Archive
--    KF5::Crash
-     KF5::KIOCore
-     KF5::KIOWidgets
-     KF5::Solid
--- 
-cgit v1.1
diff --git a/net-libs/libktorrent/files/libktorrent-2.1.1-fileops.patch b/net-libs/libktorrent/files/libktorrent-2.1.1-fileops.patch
deleted file mode 100644
index 87d25e26b7be..000000000000
--- a/net-libs/libktorrent/files/libktorrent-2.1.1-fileops.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 1e8ce6e98d7ca0088624778964b9aed4696ce030 Mon Sep 17 00:00:00 2001
-From: Christoph Feck <cfeck@kde.org>
-Date: Thu, 14 Nov 2019 14:19:42 +0100
-Subject: Fix build with XFS
-
-BUG: 414050
----
- src/util/fileops.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/util/fileops.cpp b/src/util/fileops.cpp
-index c76b0e3..cfe4d5e 100644
---- a/src/util/fileops.cpp
-+++ b/src/util/fileops.cpp
-@@ -366,7 +366,7 @@ namespace bt
- 
- 	bool XfsPreallocate(const QString & path, Uint64 size)
- 	{
--		int fd = ::open(QFile::encodeName(path), O_RDWR | O_LARGEFILE);
-+		int fd = ::open(QFile::encodeName(path).constData(), O_RDWR | O_LARGEFILE);
- 		if (fd < 0)
- 			throw Error(i18n("Cannot open %1: %2",path,strerror(errno)));
- 
--- 
-cgit v1.1
diff --git a/net-libs/libktorrent/files/libktorrent-2.2.0-fix-MultiFileCache.patch b/net-libs/libktorrent/files/libktorrent-2.2.0-fix-MultiFileCache.patch
new file mode 100644
index 000000000000..bafdbaffefa5
--- /dev/null
+++ b/net-libs/libktorrent/files/libktorrent-2.2.0-fix-MultiFileCache.patch
@@ -0,0 +1,26 @@
+From 5b0abf8378d497c5a8881771518df6a02404d031 Mon Sep 17 00:00:00 2001
+From: Alexander Trufanov <trufanovan@gmail.com>
+Date: Tue, 16 Jun 2020 13:47:42 +0300
+Subject: [PATCH] Fix a bug in MultiFileCache
+
+Differential Revision: https://phabricator.kde.org/D29852
+---
+ src/diskio/multifilecache.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/diskio/multifilecache.cpp b/src/diskio/multifilecache.cpp
+index 0a513ad..882630e 100644
+--- a/src/diskio/multifilecache.cpp
++++ b/src/diskio/multifilecache.cpp
+@@ -455,7 +455,7 @@ namespace bt
+ 			off = file_off + (piece_off - chunk_off);
+ 			len = piece_len;
+ 		}
+-		else if(piece_off >= chunk_off && piece_len < chunk_off + chunk_len)
++		else if(piece_off >= chunk_off && piece_off < chunk_off + chunk_len)
+ 		{
+ 			// The start of the piece lies partially in the current file
+ 			off = file_off + (piece_off - chunk_off);
+-- 
+GitLab
+