commit: 2dea5212306d8c29b31d70dc1cda898e4c17e648 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Jan 4 13:54:13 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Jan 4 13:55:34 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dea5212
net-p2p/ktorrent: Drop 5.1.1-r1 Dropping x86 after stable timeout. Closes: https://bugs.gentoo.org/696858 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> net-p2p/ktorrent/Manifest | 1 - net-p2p/ktorrent/files/ktorrent-5.1.1-kcrash.patch | 23 ----- net-p2p/ktorrent/files/ktorrent-5.1.1-kdehig.patch | 40 -------- .../files/ktorrent-5.1.1-missing-header.patch | 24 ----- .../ktorrent-5.1.1-scanfolder-memcorruption.patch | 69 ------------- net-p2p/ktorrent/ktorrent-5.1.1-r1.ebuild | 109 --------------------- 6 files changed, 266 deletions(-) diff --git a/net-p2p/ktorrent/Manifest b/net-p2p/ktorrent/Manifest index d1df2f1290e..175ffedfbec 100644 --- a/net-p2p/ktorrent/Manifest +++ b/net-p2p/ktorrent/Manifest @@ -1,2 +1 @@ -DIST ktorrent-5.1.1.tar.xz 2049392 BLAKE2B 09ad841e1b6d7f332b19e2a660130b1f2b998cd6839614800cde7c99c8ec7f119f2adbdc3d9e06c8525e2dde534d73dab521c7df1d01b2fd0eb6b11fbb868d8f SHA512 bbe744853018380e30efc6ef95916a9b6f0ebec812d70d7970e5e7183d860d147b0693dd0107b146a5987aa27f30cd335fad73c8967839d53eee1c5b63a53c06 DIST ktorrent-5.1.2.tar.xz 2048604 BLAKE2B 761df1e0aab5c4457311ae821a47ebf7b5b82b2839b4bf238491231caa213370cc649a1c0cafd332b42bbb84230f4a313e5172db722ff3c7af81c0daba450a98 SHA512 b62d05650216721299dc9db23da1a2d6ae5d3b77583ad4bd99ac032d7b135cce567feff3b66d27ac001d77e30517112e4e8c8bf8e83c1106a79509ec45498621 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 8beffd97b4c..00000000000 --- 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 <aleix...@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 97115229889..00000000000 --- 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 <schwanc...@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 b574d302824..00000000000 --- 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 <ast...@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 4c41a6af11d..00000000000 --- 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 <jazzv...@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 diff --git a/net-p2p/ktorrent/ktorrent-5.1.1-r1.ebuild b/net-p2p/ktorrent/ktorrent-5.1.1-r1.ebuild deleted file mode 100644 index fe3574adf3d..00000000000 --- a/net-p2p/ktorrent/ktorrent-5.1.1-r1.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KDE_HANDBOOK="optional" -KDE_TEST="optional" -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="Powerful BitTorrent client based on KDE Frameworks" -HOMEPAGE="https://kde.org/applications/internet/ktorrent/"; -[[ ${KDE_BUILD_TYPE} = release ]] && SRC_URI="mirror://kde/stable/${PN}/${PV/%.0}/${P}.tar.xz" - -LICENSE="GPL-2" -KEYWORDS="amd64 x86" -IUSE="+bwscheduler +downloadorder +infowidget +ipfilter +kross +logviewer +magnetgenerator -+mediaplayer rss +scanfolder +search +shutdown +stats +upnp +zeroconf" - -BDEPEND="sys-devel/gettext" -COMMON_DEPEND=" - $(add_frameworks_dep kcmutils) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep knotifyconfig) - $(add_frameworks_dep kparts) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep solid) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - >=net-libs/libktorrent-2.1:5 - infowidget? ( dev-libs/geoip ) - kross? ( - $(add_frameworks_dep karchive) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep kross) - ) - mediaplayer? ( - media-libs/phonon[qt5(+)] - >=media-libs/taglib-1.5 - ) - rss? ( - $(add_frameworks_dep kdewebkit) - $(add_frameworks_dep syndication) - ) - search? ( - $(add_frameworks_dep kdewebkit) - >=dev-qt/qtwebkit-5.212.0_pre20180120:5 - ) - shutdown? ( $(add_plasma_dep plasma-workspace) ) - stats? ( $(add_frameworks_dep kplotting) ) - upnp? ( $(add_frameworks_dep kcompletion) ) - zeroconf? ( $(add_frameworks_dep kdnssd) ) -" -DEPEND="${COMMON_DEPEND} - dev-libs/boost -" -RDEPEND="${COMMON_DEPEND} - ipfilter? ( - app-arch/bzip2 - app-arch/unzip - $(add_frameworks_dep ktextwidgets) - $(add_kdeapps_dep kio-extras) - ) -" - -PATCHES=( - "${FILESDIR}/${P}-scanfolder-memcorruption.patch" - "${FILESDIR}/${P}-kdehig.patch" - "${FILESDIR}/${P}-singlefile-torrent.patch" - "${FILESDIR}/${P}-kcrash.patch" - "${FILESDIR}/${P}-missing-header.patch" -) - -src_configure() { - local mycmakeargs=( - -DENABLE_BWSCHEDULER_PLUGIN=$(usex bwscheduler) - -DENABLE_DOWNLOADORDER_PLUGIN=$(usex downloadorder) - -DENABLE_INFOWIDGET_PLUGIN=$(usex infowidget) - -DWITH_SYSTEM_GEOIP=$(usex infowidget) - -DENABLE_IPFILTER_PLUGIN=$(usex ipfilter) - -DENABLE_SCRIPTING_PLUGIN=$(usex kross) - -DENABLE_LOGVIEWER_PLUGIN=$(usex logviewer) - -DENABLE_MAGNETGENERATOR_PLUGIN=$(usex magnetgenerator) - -DENABLE_MEDIAPLAYER_PLUGIN=$(usex mediaplayer) - $(cmake_use_find_package rss KF5Syndication) - -DENABLE_SCANFOLDER_PLUGIN=$(usex scanfolder) - -DENABLE_SEARCH_PLUGIN=$(usex search) - -DENABLE_SHUTDOWN_PLUGIN=$(usex shutdown) - -DENABLE_STATS_PLUGIN=$(usex stats) - -DENABLE_UPNP_PLUGIN=$(usex upnp) - -DENABLE_ZEROCONF_PLUGIN=$(usex zeroconf) - ) -# add back when ported -# -DENABLE_WEBINTERFACE_PLUGIN=$(usex webinterface) - kde5_src_configure -}
