diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-01-15 15:51:32 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-01-15 15:51:32 +0000 |
commit | 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch) | |
tree | e1810a4b135afce04b34862ef0fab2bfaeb8aeca /net-p2p/ktorrent/files | |
parent | 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff) |
gentoo resync : 15.01.2020
Diffstat (limited to 'net-p2p/ktorrent/files')
4 files changed, 0 insertions, 156 deletions
diff --git a/net-p2p/ktorrent/files/ktorrent-5.1.1-kcrash.patch b/net-p2p/ktorrent/files/ktorrent-5.1.1-kcrash.patch deleted file mode 100644 index 8beffd97b4cc..000000000000 --- a/net-p2p/ktorrent/files/ktorrent-5.1.1-kcrash.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 3ff87f67e984e514a968ddf388a4056f8aa2e723 Mon Sep 17 00:00:00 2001 -From: Aleix Pol <aleixpol@kde.org> -Date: Tue, 11 Jun 2019 22:59:15 +0200 -Subject: Fix build. Needs KCrash - ---- - ktorrent/CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/ktorrent/CMakeLists.txt b/ktorrent/CMakeLists.txt -index e8c29af..326c59a 100644 ---- a/ktorrent/CMakeLists.txt -+++ b/ktorrent/CMakeLists.txt -@@ -110,6 +110,7 @@ target_link_libraries(ktorrent_app - KF5::WidgetsAddons - KF5::WindowSystem - KF5::XmlGui -+ KF5::Crash - ) - - install(TARGETS ktorrent_app ${INSTALL_TARGETS_DEFAULT_ARGS}) --- -cgit v1.1 diff --git a/net-p2p/ktorrent/files/ktorrent-5.1.1-kdehig.patch b/net-p2p/ktorrent/files/ktorrent-5.1.1-kdehig.patch deleted file mode 100644 index 971152298895..000000000000 --- a/net-p2p/ktorrent/files/ktorrent-5.1.1-kdehig.patch +++ /dev/null @@ -1,40 +0,0 @@ -From c77b09fe37ac00c86e6ac43db5e43b325fa4d8a1 Mon Sep 17 00:00:00 2001 -From: Carl Schwan <schwancarl@protonmail.com> -Date: Thu, 14 Mar 2019 23:24:27 +0100 -Subject: Follow KDE HIG by using ellipis - -Summary: -See https://hig.kde.org/style/writing/placeholder.html#actions - -@stikonas I add you as reviewer because I saw that you are last contributor to KTorrent :D - -Test Plan: Build and run - -Reviewers: #vdg, stikonas, ngraham - -Reviewed By: #vdg, stikonas, ngraham - -Subscribers: stikonas - -Maniphest Tasks: T10258 - -Differential Revision: https://phabricator.kde.org/D19772 ---- - ktorrent/view/torrentsearchbar.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ktorrent/view/torrentsearchbar.cpp b/ktorrent/view/torrentsearchbar.cpp -index 045d695..2e9c428 100644 ---- a/ktorrent/view/torrentsearchbar.cpp -+++ b/ktorrent/view/torrentsearchbar.cpp -@@ -46,7 +46,7 @@ namespace kt - - search_bar = new QLineEdit(this); - search_bar->setClearButtonEnabled(true); -- search_bar->setPlaceholderText(i18n("Torrent filter")); -+ search_bar->setPlaceholderText(i18n("Filter...")); - connect(search_bar, SIGNAL(textChanged(QString)), view, SLOT(setFilterString(QString))); - connect(this, SIGNAL(filterBarShown(QString)), view, SLOT(setFilterString(QString))); - --- -cgit v1.1 diff --git a/net-p2p/ktorrent/files/ktorrent-5.1.1-missing-header.patch b/net-p2p/ktorrent/files/ktorrent-5.1.1-missing-header.patch deleted file mode 100644 index b574d3028249..000000000000 --- a/net-p2p/ktorrent/files/ktorrent-5.1.1-missing-header.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 909215cc912d89fbc8573f2f98e3b433472d8eae Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Fri, 9 Aug 2019 20:54:52 +0200 -Subject: [PATCH] Add missing QVector - ---- - libktcore/plugin/pluginmanager.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libktcore/plugin/pluginmanager.h b/libktcore/plugin/pluginmanager.h -index 50eaa768..3a04a729 100644 ---- a/libktcore/plugin/pluginmanager.h -+++ b/libktcore/plugin/pluginmanager.h -@@ -23,6 +23,7 @@ - - #include <QList> - #include <QStringList> -+#include <QVector> - - #include <KPluginInfo> - #include <KPluginMetaData> --- -2.22.0 - diff --git a/net-p2p/ktorrent/files/ktorrent-5.1.1-scanfolder-memcorruption.patch b/net-p2p/ktorrent/files/ktorrent-5.1.1-scanfolder-memcorruption.patch deleted file mode 100644 index 4c41a6af11db..000000000000 --- a/net-p2p/ktorrent/files/ktorrent-5.1.1-scanfolder-memcorruption.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 2d73d5f25a1a364a2115fb1d3262377f7fdf99cd Mon Sep 17 00:00:00 2001 -From: Valeriy Malov <jazzvoid@gmail.com> -Date: Wed, 5 Sep 2018 20:43:51 +0300 -Subject: Fix memory corruption in ScanFolder plugin - -Summary: -Reasoning behind this patch is kinda dubious because I don't fully understand what happens, but it shouldn't make the matters worse either - -Seems like deletion of KDirWatch objects from scan_folder in ~ScanThread(), after said QThread has been stopped, causes memory corruption. - -Preemptively deleting scan_folder contents before we stop the thread resolves this. - -also mark booleans shared across main thread and KDirWatch callbacks as atomic - -Test Plan: -Without this patch unloading ScanFolder plugin sometimes crashes ktorrent, including unloading on exit -Doesn't happen anymore with this patch - -Reviewers: stikonas - -Reviewed By: stikonas - -Differential Revision: https://phabricator.kde.org/D15265 ---- - plugins/scanfolder/scanthread.cpp | 5 +++++ - plugins/scanfolder/scanthread.h | 5 +++-- - 2 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/plugins/scanfolder/scanthread.cpp b/plugins/scanfolder/scanthread.cpp -index 0e62768..d7b13e0 100644 ---- a/plugins/scanfolder/scanthread.cpp -+++ b/plugins/scanfolder/scanthread.cpp -@@ -156,6 +156,11 @@ namespace kt - void ScanThread::stop() - { - stop_requested = true; -+ -+ // XXX seems like deleting KDirWatch object(s) created in scan_folders -+ // in destructor of this QThread after it has been stopped -+ // causes memory corruption, so we delete them early -+ scan_folders.clear(); - exit(); - wait(); - } -diff --git a/plugins/scanfolder/scanthread.h b/plugins/scanfolder/scanthread.h -index d13ca08..fb214a4 100644 ---- a/plugins/scanfolder/scanthread.h -+++ b/plugins/scanfolder/scanthread.h -@@ -29,6 +29,7 @@ - #include <util/ptrmap.h> - #include "scanfolder.h" - -+#include <atomic> - - class QDir; - -@@ -88,8 +89,8 @@ namespace kt - private: - QMutex mutex; - QStringList folders; -- bool stop_requested; -- bool recursive; -+ std::atomic<bool> stop_requested; -+ std::atomic<bool> recursive; - bt::PtrMap<QString, ScanFolder> scan_folders; - }; - --- -cgit v0.11.2 |