[gentoo-commits] repo/gentoo:master commit in: net-p2p/ktorrent/files/

[gentoo-commits] repo/gentoo:master commit in: net-p2p/ktorrent/files/

[Michael Palimaka]

commit:     c4e5eb72336024e5caff2999ce96791051aca64f
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  8 14:31:29 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Mar  8 14:34:21 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4e5eb72

net-p2p/ktorrent: remove unused patch

Package-Manager: portage-2.2.27

 .../files/ktorrent-4.3.0-mountedstoragecheck.patch | 25 ----------------------
 1 file changed, 25 deletions(-)

diff --git a/net-p2p/ktorrent/files/ktorrent-4.3.0-mountedstoragecheck.patch b/net-p2p/ktorrent/files/ktorrent-4.3.0-mountedstoragecheck.patch
deleted file mode 100644
index bdb494c..0000000
--- a/net-p2p/ktorrent/files/ktorrent-4.3.0-mountedstoragecheck.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/ktorrent/core.cpp
-+++ b/ktorrent/core.cpp
-@@ -1206,6 +1206,10 @@
- 
- 	bool Core::checkMissingFiles(TorrentInterface* tc)
- 	{
-+        QStringList missing;
-+        if(!tc->hasMissingFiles(missing))
-+            return true;
-+        
- 		QStringList not_mounted;
- 		while(!tc->isStorageMounted(not_mounted))
- 		{
-@@ -1226,10 +1230,6 @@
- 			}
- 		}
- 
--		QStringList missing;
--		if(!tc->hasMissingFiles(missing))
--			return true;
--
- 		if(tc->getStats().multi_file_torrent)
- 		{
- 			QString msg = i18n(
-

[gentoo-commits] repo/gentoo:master commit in: net-p2p/ktorrent/files/

[Andreas Sturmlechner]

commit:     7473dc374b8ad1db1aa352b42e9bafa8e3a39e0b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 21 15:59:14 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 21 16:35:39 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7473dc37

net-p2p/ktorrent: Fix build with USE=rss and Qt 5.11

Closes: https://bugs.gentoo.org/661736
Package-Manager: Portage-2.3.43, Repoman-2.3.10

 .../ktorrent/files/ktorrent-5.1.0-qt-5.11.patch    | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/net-p2p/ktorrent/files/ktorrent-5.1.0-qt-5.11.patch b/net-p2p/ktorrent/files/ktorrent-5.1.0-qt-5.11.patch
index f59e074134c..f0d69b82c89 100644
--- a/net-p2p/ktorrent/files/ktorrent-5.1.0-qt-5.11.patch
+++ b/net-p2p/ktorrent/files/ktorrent-5.1.0-qt-5.11.patch
@@ -50,4 +50,27 @@ index 667e7a82..4be6cd5c 100644
  #include <QInputDialog>
 -- 
 2.16.2
+From c66233cd9f5b87f9e265beae0a16839d3a5645a3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil@kde.org>
+Date: Fri, 4 May 2018 00:33:44 +0200
+Subject: Fix build against Qt 5.11 (missing includes)
+
+---
+ plugins/syndication/syndicationactivity.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/plugins/syndication/syndicationactivity.cpp b/plugins/syndication/syndicationactivity.cpp
+index 61e8039..5736d52 100644
+--- a/plugins/syndication/syndicationactivity.cpp
++++ b/plugins/syndication/syndicationactivity.cpp
+@@ -21,6 +21,7 @@
+ #include <QHBoxLayout>
+ #include <QInputDialog>
+ #include <QToolButton>
++#include <QAction>
+ 
+ #include <KMainWindow>
+ #include <KMessageBox>
+-- 
+cgit v0.11.2
 

[gentoo-commits] repo/gentoo:master commit in: net-p2p/ktorrent/files/

[Andreas Sturmlechner]

commit:     44cf2e4d492dc94aea62cececcbd3abfee2b9a8b
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Jan  6 10:34:29 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan  6 12:06:23 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44cf2e4d

net-p2p/ktorrent: remove unused patches

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../ktorrent/files/ktorrent-5.1.0-cmake-3.11.patch | 13 ----
 .../ktorrent/files/ktorrent-5.1.0-qt-5.11.patch    | 76 ----------------------
 2 files changed, 89 deletions(-)

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
deleted file mode 100644
index c0b9167636a..00000000000
--- a/net-p2p/ktorrent/files/ktorrent-5.1.0-cmake-3.11.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://docs.freebsd.org/cgi/getmsg.cgi?fetch=4423635+0+/usr/local/www/mailindex/archive/2018/svn-ports-all/20180415.svn-ports-all
-
---- ktorrent-5.1.0/ktorrent/dialogs/torrentcreatordlg.h
-+++ ktorrent-5.1.0/ktorrent/dialogs/torrentcreatordlg.h
-@@ -23,6 +23,8 @@
- #define KT_TORRENTCREATORDLG_HH
- 
- #include <QDialog>
-+#include <QTimer>
-+
- #include "ui_torrentcreatordlg.h"
- #include <torrent/torrentcreator.h>
- 

diff --git a/net-p2p/ktorrent/files/ktorrent-5.1.0-qt-5.11.patch b/net-p2p/ktorrent/files/ktorrent-5.1.0-qt-5.11.patch
deleted file mode 100644
index f0d69b82c89..00000000000
--- a/net-p2p/ktorrent/files/ktorrent-5.1.0-qt-5.11.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 4befccc3d0ebbd9235e6f10d411f139802e3871a Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 18 Mar 2018 19:13:26 +0100
-Subject: [PATCH] Fix build with Qt 5.11 (missing headers)
-
-Reviewers: stikonas
-
-Differential Revision: https://phabricator.kde.org/D11456
----
- ktorrent/dialogs/fileselectdlg.cpp | 1 +
- ktorrent/groups/groupview.cpp      | 1 +
- plugins/search/searchprefpage.cpp  | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/ktorrent/dialogs/fileselectdlg.cpp b/ktorrent/dialogs/fileselectdlg.cpp
-index 139b4752..ec7d8ede 100644
---- a/ktorrent/dialogs/fileselectdlg.cpp
-+++ b/ktorrent/dialogs/fileselectdlg.cpp
-@@ -20,6 +20,7 @@
- 
- #include "fileselectdlg.h"
- 
-+#include <QButtonGroup>
- #include <QMenu>
- #include <QPushButton>
- #include <QTextCodec>
-diff --git a/ktorrent/groups/groupview.cpp b/ktorrent/groups/groupview.cpp
-index 990ed0d3..76208144 100644
---- a/ktorrent/groups/groupview.cpp
-+++ b/ktorrent/groups/groupview.cpp
-@@ -23,6 +23,7 @@
- #include <QAction>
- #include <QDragEnterEvent>
- #include <QDropEvent>
-+#include <QHeaderView>
- #include <QInputDialog>
- #include <QMenu>
- #include <QTreeWidgetItemIterator>
-diff --git a/plugins/search/searchprefpage.cpp b/plugins/search/searchprefpage.cpp
-index 667e7a82..4be6cd5c 100644
---- a/plugins/search/searchprefpage.cpp
-+++ b/plugins/search/searchprefpage.cpp
-@@ -21,6 +21,7 @@
- 
- #include "searchprefpage.h"
- 
-+#include <QButtonGroup>
- #include <QCheckBox>
- #include <QFile>
- #include <QInputDialog>
--- 
-2.16.2
-From c66233cd9f5b87f9e265beae0a16839d3a5645a3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil@kde.org>
-Date: Fri, 4 May 2018 00:33:44 +0200
-Subject: Fix build against Qt 5.11 (missing includes)
-
----
- plugins/syndication/syndicationactivity.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/plugins/syndication/syndicationactivity.cpp b/plugins/syndication/syndicationactivity.cpp
-index 61e8039..5736d52 100644
---- a/plugins/syndication/syndicationactivity.cpp
-+++ b/plugins/syndication/syndicationactivity.cpp
-@@ -21,6 +21,7 @@
- #include <QHBoxLayout>
- #include <QInputDialog>
- #include <QToolButton>
-+#include <QAction>
- 
- #include <KMainWindow>
- #include <KMessageBox>
--- 
-cgit v0.11.2
-

[gentoo-commits] repo/gentoo:master commit in: net-p2p/ktorrent/files/

[Andreas Sturmlechner]

commit:     2ce4db60d003a96cf7d9319f2016a593953d8f22
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  4 14:55:17 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug  4 14:56:07 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ce4db60

net-p2p/ktorrent: Fix upstream patch

Upstream commit c8701e6a9ff52c04c364e8f5dd8f32f44bfeaa93

Closes: https://bugs.gentoo.org/806390
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 net-p2p/ktorrent/files/ktorrent-21.04.3-fix-tests.patch | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/net-p2p/ktorrent/files/ktorrent-21.04.3-fix-tests.patch b/net-p2p/ktorrent/files/ktorrent-21.04.3-fix-tests.patch
index a6fe5f7be70..fc644bd80b8 100644
--- a/net-p2p/ktorrent/files/ktorrent-21.04.3-fix-tests.patch
+++ b/net-p2p/ktorrent/files/ktorrent-21.04.3-fix-tests.patch
@@ -3,24 +3,11 @@ From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20Usta?= <omerusta@gmail.com>
 Date: Tue, 18 May 2021 15:15:26 +0000
 Subject: [PATCH] Fix tests with new ecm sytle
 
+* asturm 2021-08-04: Merged w/ c8701e6a9ff52c04c364e8f5dd8f32f44bfeaa93
 ---
- CMakeLists.txt                        | 2 ++
  plugins/ipfilter/tests/CMakeLists.txt | 7 ++-----
- 2 files changed, 4 insertions(+), 5 deletions(-)
+ 1 file changed, 2 insertions(+), 5 deletions(-)
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e0f67a93..edc64983 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -17,6 +17,8 @@ set (KF5_MIN_VERSION "5.82")
- set (LIBKTORRENT_MIN_VERSION "20.11.70")
- set (Boost_MIN_VERSION "1.71.0")
- 
-+cmake_policy(SET CMP0115 OLD)
-+
- find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
- set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH})
- 
 diff --git a/plugins/ipfilter/tests/CMakeLists.txt b/plugins/ipfilter/tests/CMakeLists.txt
 index ec839aac..6c34b2d0 100644
 --- a/plugins/ipfilter/tests/CMakeLists.txt