From 121ed4eec41fbf03e1998d09eede1bf449da63b9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 19 Jul 2019 22:05:27 +0100 Subject: gentoo resync : 19.07.2019 --- net-p2p/ktorrent/Manifest | 4 + 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-singlefile-torrent.patch | 140 +++++++++++++++++++++ net-p2p/ktorrent/ktorrent-5.1.1-r1.ebuild | 108 ++++++++++++++++ 5 files changed, 315 insertions(+) create mode 100644 net-p2p/ktorrent/files/ktorrent-5.1.1-kcrash.patch create mode 100644 net-p2p/ktorrent/files/ktorrent-5.1.1-kdehig.patch create mode 100644 net-p2p/ktorrent/files/ktorrent-5.1.1-singlefile-torrent.patch create mode 100644 net-p2p/ktorrent/ktorrent-5.1.1-r1.ebuild (limited to 'net-p2p/ktorrent') diff --git a/net-p2p/ktorrent/Manifest b/net-p2p/ktorrent/Manifest index 703971029f63..f1258979ec8d 100644 --- a/net-p2p/ktorrent/Manifest +++ b/net-p2p/ktorrent/Manifest @@ -1,4 +1,8 @@ +AUX ktorrent-5.1.1-kcrash.patch 616 BLAKE2B 3293f03911337f447b56ec7bfff36dbdfc4bfa1ed39b06f58522c3a1d31cb87d1df47fec689090eb77927cb14956df3e127d70a8b633013d75ddd6ac2db5ed96 SHA512 c4b2ce42fc2e9048ec1137d522b22d5be8a96e2e73e6b2506d1e9c640403f3fb7ef67c54881975d90907b8324cb04e8a8518a4de4840299ed54f81b415b2d4c8 +AUX ktorrent-5.1.1-kdehig.patch 1320 BLAKE2B b34d97f8e55358e97a898c6c4e0b88040a4965a11b3d0ca3904e51d529912265887cdfc4c57200f793fca41495d2ec31511ef1bce987c9ff3ac0579ea9ab7527 SHA512 fbfedc1fc9d17cc4705f66b03853e749b693d6a9477981d6564735a6cf3711b7ff237c0728a300ac8c63378c3085073318ae89da8cfb7f56c854910bdcc90fca AUX ktorrent-5.1.1-scanfolder-memcorruption.patch 2244 BLAKE2B 53efe0320124f954adff60144981d740e5cdf45ed4712fa43f112bb6133fb24b4303e6f969d9a73598525dea4f6706c22e57d2e5c7378c69e494dd924360a307 SHA512 8d3868a6f75e2f53fa11762378a676736df09e14e6fbde04f0dcfb45eb56e8b739d17b3ea96af4be21edb22edad610982865b33508847f07ac2eba744f62ae5e +AUX ktorrent-5.1.1-singlefile-torrent.patch 4654 BLAKE2B 8bef064068df9db5b82eb16e5ca04bb618378c94a5d218654aabb5e49dcc5db1a8b8fd92a4ed6e3e922f8a2eebdf23f4d460261fd396b7a7b8319cc102dce9f8 SHA512 e74632a86967440733ed0d3da9249a04dfe401d3966bc385581b5ba5e50e864b288fb0ca4e1ac17b754289fd8aeb70119f8c1981e9478afff434e17138beb151 DIST ktorrent-5.1.1.tar.xz 2049392 BLAKE2B 09ad841e1b6d7f332b19e2a660130b1f2b998cd6839614800cde7c99c8ec7f119f2adbdc3d9e06c8525e2dde534d73dab521c7df1d01b2fd0eb6b11fbb868d8f SHA512 bbe744853018380e30efc6ef95916a9b6f0ebec812d70d7970e5e7183d860d147b0693dd0107b146a5987aa27f30cd335fad73c8967839d53eee1c5b63a53c06 +EBUILD ktorrent-5.1.1-r1.ebuild 3153 BLAKE2B 36142410cd22854d9fe87e47c754f4e2c7b8b5a08627a297f80a81d0c15cc0373c1e04e35590c91586b9308286592d92fb698c24cc48b1ad11dae7d69bd28a4e SHA512 bdcac9fc162b65fa51872f4ede375fd91a6a66bc356b97e834612bed063305fd3374715efa14dae06431caee68a9e2eb8013f5d38e236d2b94586b52df732559 EBUILD ktorrent-5.1.1.ebuild 3083 BLAKE2B a0fbf718816b1bf154f01dad9ff914fd7e3c9e1e620be3a825f49d03c3af4600ac5e7413e6b743df3477275e227628bbf999144122da2c20ce96d0753d339649 SHA512 e699da98a02493847f71011008311a37555293e5878986489114b7a1f0999c1a6f1ab76c6874babd9d4ba2adae39b2be880b2eb1a4c3ce4689a91593145f3a09 MISC metadata.xml 1341 BLAKE2B 91b9b58b6df009f42960708b09f926b3bdf6849ebffd8d46114c28c7f2df2c0972a8b5460333ac6758f138729a7c689f6a61d4a58494bc44af2e364d1dbc3e05 SHA512 dfff24b08dba8615c983c1360fe10efcb60744651d5484a8bd1a7a731697b9dd4a10126b8d66276f96a8524352b1e4ba99b28b773d292362b3f7506a45da5a80 diff --git a/net-p2p/ktorrent/files/ktorrent-5.1.1-kcrash.patch b/net-p2p/ktorrent/files/ktorrent-5.1.1-kcrash.patch new file mode 100644 index 000000000000..8beffd97b4cc --- /dev/null +++ b/net-p2p/ktorrent/files/ktorrent-5.1.1-kcrash.patch @@ -0,0 +1,23 @@ +From 3ff87f67e984e514a968ddf388a4056f8aa2e723 Mon Sep 17 00:00:00 2001 +From: Aleix Pol +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 new file mode 100644 index 000000000000..971152298895 --- /dev/null +++ b/net-p2p/ktorrent/files/ktorrent-5.1.1-kdehig.patch @@ -0,0 +1,40 @@ +From c77b09fe37ac00c86e6ac43db5e43b325fa4d8a1 Mon Sep 17 00:00:00 2001 +From: Carl Schwan +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-singlefile-torrent.patch b/net-p2p/ktorrent/files/ktorrent-5.1.1-singlefile-torrent.patch new file mode 100644 index 000000000000..b22518656288 --- /dev/null +++ b/net-p2p/ktorrent/files/ktorrent-5.1.1-singlefile-torrent.patch @@ -0,0 +1,140 @@ +From dab5abcd2172155c511e0666d867c37382829226 Mon Sep 17 00:00:00 2001 +From: Jiva Totin +Date: Sun, 17 Feb 2019 20:00:11 +0000 +Subject: Allow creating torrent for a single file. + +Added 2 new radio buttons. One for choosing directory and the other one for +choosing files. + +BUG: 384452 +Differential Revision: https://phabricator.kde.org/D11728 +--- + ktorrent/dialogs/torrentcreatordlg.cpp | 18 ++++++++++- + ktorrent/dialogs/torrentcreatordlg.h | 3 ++ + ktorrent/dialogs/torrentcreatordlg.ui | 56 +++++++++++++++++++++++----------- + 3 files changed, 58 insertions(+), 19 deletions(-) + +diff --git a/ktorrent/dialogs/torrentcreatordlg.cpp b/ktorrent/dialogs/torrentcreatordlg.cpp +index bb3710d..b46b291 100644 +--- a/ktorrent/dialogs/torrentcreatordlg.cpp ++++ b/ktorrent/dialogs/torrentcreatordlg.cpp +@@ -54,12 +54,17 @@ namespace kt + adjustSize(); + loadGroups(); + +- m_url->setMode(KFile::File | KFile::ExistingOnly | KFile::LocalOnly | KFile::Directory); ++ m_url->setMode(KFile::ExistingOnly | KFile::LocalOnly | KFile::Directory); ++ m_selectDirectory->setChecked(true); ++ + m_dht_tab->setEnabled(false); + + connect(m_buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept); + connect(m_buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject); + ++ connect(m_selectDirectory, &QRadioButton::clicked, this, &TorrentCreatorDlg::selectDirectory); ++ connect(m_selectFile, &QRadioButton::clicked, this, &TorrentCreatorDlg::selectFile); ++ + connect(m_dht, &QCheckBox::toggled, this, &TorrentCreatorDlg::dhtToggled); + + // tracker box stuff +@@ -428,4 +433,15 @@ namespace kt + m_progress->setValue(mktor->getCurrentChunk()); + } + ++ void TorrentCreatorDlg::selectFile() ++ { ++ m_url->setMode(KFile::File | KFile::ExistingOnly | KFile::LocalOnly); ++ } ++ ++ void TorrentCreatorDlg::selectDirectory() ++ { ++ m_url->setMode(KFile::ExistingOnly | KFile::LocalOnly | KFile::Directory); ++ } ++ ++ + } +diff --git a/ktorrent/dialogs/torrentcreatordlg.h b/ktorrent/dialogs/torrentcreatordlg.h +index 12a1a43..b59d880 100644 +--- a/ktorrent/dialogs/torrentcreatordlg.h ++++ b/ktorrent/dialogs/torrentcreatordlg.h +@@ -73,6 +73,9 @@ namespace kt + void accept() override; + void reject() override; + ++ void selectFile();// required for radio button for new torrent creation ++ void selectDirectory(); ++ + private: + void loadGroups(); + void loadCompleterData(); +diff --git a/ktorrent/dialogs/torrentcreatordlg.ui b/ktorrent/dialogs/torrentcreatordlg.ui +index b954aed..02bf390 100644 +--- a/ktorrent/dialogs/torrentcreatordlg.ui ++++ b/ktorrent/dialogs/torrentcreatordlg.ui +@@ -15,26 +15,46 @@ + + + +- +- ++ ++ + File or directory to create torrent from: + +- +- +- +- +- +- +- 0 +- 0 +- +- +- +- +- 0 +- 0 +- +- ++ ++ ++ ++ ++ ++ 0 ++ 0 ++ ++ ++ ++ ++ 0 ++ 0 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ Select Directory ++ ++ ++ ++ ++ ++ ++ Select File ++ ++ ++ ++ ++ ++ + + + +-- +cgit v1.1 diff --git a/net-p2p/ktorrent/ktorrent-5.1.1-r1.ebuild b/net-p2p/ktorrent/ktorrent-5.1.1-r1.ebuild new file mode 100644 index 000000000000..11e0303caeca --- /dev/null +++ b/net-p2p/ktorrent/ktorrent-5.1.1-r1.ebuild @@ -0,0 +1,108 @@ +# 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" +) + +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-utils_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 +} -- cgit v1.2.3