[gentoo-commits] repo/gentoo:master commit in: net-p2p/ktorrent/files/, net-p2p/ktorrent/
commit: 9302c07d151576ce16e25ce1956c706f9dc07134
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Aug 3 14:14:14 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Aug 3 14:14:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9302c07d
net-p2p/ktorrent: Fix tests
Upstream commit dfc063a4d1f174cd5f84b82154a58b86da334d35
Thanks-to: Frank Krömmelbein gmx.de>
Bug: https://bugs.gentoo.org/805065
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/ktorrent-21.04.3-fix-tests.patch | 38 ++
net-p2p/ktorrent/ktorrent-21.04.3.ebuild | 4 ++-
2 files changed, 41 insertions(+), 1 deletion(-)
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
new file mode 100644
index 000..a6fe5f7be70
--- /dev/null
+++ b/net-p2p/ktorrent/files/ktorrent-21.04.3-fix-tests.patch
@@ -0,0 +1,38 @@
+From dfc063a4d1f174cd5f84b82154a58b86da334d35 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20Usta?=
+Date: Tue, 18 May 2021 15:15:26 +
+Subject: [PATCH] Fix tests with new ecm sytle
+
+---
+ CMakeLists.txt| 2 ++
+ plugins/ipfilter/tests/CMakeLists.txt | 7 ++-
+ 2 files changed, 4 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
b/plugins/ipfilter/tests/CMakeLists.txt
+@@ -1,5 +1,2 @@
+-set(ipblocklisttest_SRCS ipblocklisttest.cpp ../ipblocklist.cpp)
+-add_executable(ipblocklisttest ${ipblocklisttest_SRCS})
+-add_test(ipblocklisttest ipblocklisttest)
+-ecm_mark_as_test(ipblocklisttest)
+-target_link_libraries(ipblocklisttest Qt5::Core Qt5::Network Qt5::Test ktcore)
++include(ECMAddTests)
++ecm_add_test(ipblocklisttest.cpp ../ipblocklist.cpp TEST_NAME ipblocklisttest
LINK_LIBRARIES ktcore Qt5::Core Qt5::Network KF5::Torrent Qt5::Test)
+--
+GitLab
+
diff --git a/net-p2p/ktorrent/ktorrent-21.04.3.ebuild
b/net-p2p/ktorrent/ktorrent-21.04.3.ebuild
index 2728b9034f1..d43340869df 100644
--- a/net-p2p/ktorrent/ktorrent-21.04.3.ebuild
+++ b/net-p2p/ktorrent/ktorrent-21.04.3.ebuild
@@ -21,7 +21,6 @@ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
IUSE="+bwscheduler +downloadorder +infowidget +ipfilter +kross +logviewer
+magnetgenerator
+mediaplayer rss +scanfolder +shutdown +stats +upnp +webengine +zeroconf"
-BDEPEND="sys-devel/gettext"
COMMON_DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
@@ -76,6 +75,9 @@ RDEPEND="${COMMON_DEPEND}
>=kde-frameworks/ktextwidgets-${KFMIN}:5
)
"
+BDEPEND="sys-devel/gettext"
+
+PATCHES=( "${FILESDIR}/${P}-fix-tests.patch" )
src_configure() {
local mycmakeargs=(
[gentoo-commits] repo/gentoo:master commit in: net-p2p/ktorrent/files/, net-p2p/ktorrent/
commit: 7bb914552302757ead6f9df40a5de499cc0f6bb9
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Jul 11 01:15:32 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Jul 11 01:24:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bb91455
net-p2p/ktorrent: Remove redundant show() in main, fix systray start
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../ktorrent-5.2.0-fix-start-in-systray.patch | 24 +
net-p2p/ktorrent/ktorrent-5.2.0-r1.ebuild | 103 +
2 files changed, 127 insertions(+)
diff --git a/net-p2p/ktorrent/files/ktorrent-5.2.0-fix-start-in-systray.patch
b/net-p2p/ktorrent/files/ktorrent-5.2.0-fix-start-in-systray.patch
new file mode 100644
index 000..50049afae35
--- /dev/null
+++ b/net-p2p/ktorrent/files/ktorrent-5.2.0-fix-start-in-systray.patch
@@ -0,0 +1,24 @@
+From 9747a8f524942b57e2fd42254c3de73f9d42918c Mon Sep 17 00:00:00 2001
+From: Matt Scheirer
+Date: Sun, 17 May 2020 02:36:09 -0400
+Subject: [PATCH] Fix starting in tray by removing redundant show() in main
+
+---
+ ktorrent/main.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/ktorrent/main.cpp b/ktorrent/main.cpp
+index b5866c22..8e532c9c 100644
+--- a/ktorrent/main.cpp
b/ktorrent/main.cpp
+@@ -208,7 +208,6 @@ int main(int argc, char** argv)
+ bt::InitLog(kt::DataDir(kt::CreateIfNotExists) +
QLatin1String("log"), true, true, logToStdout);
+
+ kt::GUI widget;
+-widget.show();
+
+ auto handleCmdLine = [&widget, &parser](const QStringList &arguments,
const QString &workingDirectory)
+ {
+--
+GitLab
+
diff --git a/net-p2p/ktorrent/ktorrent-5.2.0-r1.ebuild
b/net-p2p/ktorrent/ktorrent-5.2.0-r1.ebuild
new file mode 100644
index 000..1bddef4950b
--- /dev/null
+++ b/net-p2p/ktorrent/ktorrent-5.2.0-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="optional"
+KFMIN=5.64.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Powerful BitTorrent client based on KDE Frameworks"
+HOMEPAGE="https://kde.org/applications/internet/org.kde.ktorrent";
+[[ ${KDE_BUILD_TYPE} = release ]] &&
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+bwscheduler +downloadorder +infowidget +ipfilter +kross +logviewer
+magnetgenerator
++mediaplayer rss +scanfolder +search +shutdown +stats +upnp +zeroconf"
+
+BDEPEND="sys-devel/gettext"
+COMMON_DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-frameworks/kcmutils-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/knotifyconfig-${KFMIN}:5
+ >=kde-frameworks/kparts-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ >=kde-frameworks/solid-${KFMIN}:5
+ >=net-libs/libktorrent-2.2.0:5
+ infowidget? ( dev-libs/geoip )
+ kross? (
+ >=kde-frameworks/karchive-${KFMIN}:5
+ >=kde-frameworks/kitemviews-${KFMIN}:5
+ >=kde-frameworks/kross-${KFMIN}:5
+ )
+ mediaplayer? (
+ media-libs/phonon[qt5(+)]
+ >=media-libs/taglib-1.5
+ )
+ rss? (
+ >=dev-qt/qtwebengine-${QTMIN}:5
+ >=kde-frameworks/syndication-${KFMIN}:5
+ )
+ search? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
+ shutdown? ( kde-plasma/libkworkspace:5 )
+ stats? ( >=kde-frameworks/kplotting-${KFMIN}:5 )
+ upnp? ( >=kde-frameworks/kcompletion-${KFMIN}:5 )
+ zeroconf? ( >=kde-frameworks/kdnssd-${KFMIN}:5 )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/boost
+"
+RDEPEND="${COMMON_DEPEND}
+ ipfilter? (
+ app-arch/bzip2
+ app-arch/unzip
+ kde-apps/kio-extras:5
+ >=kde-frameworks/ktextwidgets-${KFMIN}:5
+ )
+"
+
+PATCHES=( "${FILESDIR}/${P}-fix-start-in-systray.patch" ) # 5.2 branch
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_BWSCHEDULER_PLUGIN=$(usex bwscheduler)
+ -DENABLE_DOWNLOADORDER_PLUGIN=$(usex downloadorder)
+ -DENABLE_INFOWIDGET_PLUGIN=$(usex infowidget)
+
[gentoo-commits] repo/gentoo:master commit in: net-p2p/ktorrent/files/, net-p2p/ktorrent/
commit: 953cdcf312d474b8e9800a23c345effa07dbd94c
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Aug 9 19:12:37 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Aug 9 19:36:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=953cdcf3
net-p2p/ktorrent: Fix missing header w/ future Frameworks
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/ktorrent-5.1.1-missing-header.patch | 24 ++
net-p2p/ktorrent/ktorrent-5.1.1-r1.ebuild | 1 +
2 files changed, 25 insertions(+)
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
new file mode 100644
index 000..b574d302824
--- /dev/null
+++ b/net-p2p/ktorrent/files/ktorrent-5.1.1-missing-header.patch
@@ -0,0 +1,24 @@
+From 909215cc912d89fbc8573f2f98e3b433472d8eae Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+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
+ #include
++#include
+
+ #include
+ #include
+--
+2.22.0
+
diff --git a/net-p2p/ktorrent/ktorrent-5.1.1-r1.ebuild
b/net-p2p/ktorrent/ktorrent-5.1.1-r1.ebuild
index 6b12108bfcf..7f7e243ef91 100644
--- a/net-p2p/ktorrent/ktorrent-5.1.1-r1.ebuild
+++ b/net-p2p/ktorrent/ktorrent-5.1.1-r1.ebuild
@@ -81,6 +81,7 @@ PATCHES=(
"${FILESDIR}/${P}-kdehig.patch"
"${FILESDIR}/${P}-singlefile-torrent.patch"
"${FILESDIR}/${P}-kcrash.patch"
+ "${FILESDIR}/${P}-missing-header.patch"
)
src_configure() {
[gentoo-commits] repo/gentoo:master commit in: net-p2p/ktorrent/files/, net-p2p/ktorrent/
commit: 2b82bca09fcef1be0d7700b46c22789cdde02e58
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Jul 15 19:04:58 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Jul 15 20:51:56 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b82bca0
net-p2p/ktorrent: EAPI-7 bump, misc upstream fixes
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner gentoo.org>
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
4 files changed, 311 insertions(+)
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 000..8beffd97b4c
--- /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 000..97115229889
--- /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 000..b2251865628
--- /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 +
+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::selec
[gentoo-commits] repo/gentoo:master commit in: net-p2p/ktorrent/files/, net-p2p/ktorrent/
commit: 6610dcce6753bb78526d1c159f8010e64aa70e4d
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Mar 18 18:32:24 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Mar 18 18:36:22 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6610dcce
net-p2p/ktorrent: Fix build with Qt 5.11
Bug: https://bugs.gentoo.org/650808
Package-Manager: Portage-2.3.24, Repoman-2.3.6
.../ktorrent/files/ktorrent-5.1.0-qt-5.11.patch| 53 ++
net-p2p/ktorrent/ktorrent-5.1.0.ebuild | 4 +-
2 files changed, 56 insertions(+), 1 deletion(-)
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
new file mode 100644
index 000..f59e074134c
--- /dev/null
+++ b/net-p2p/ktorrent/files/ktorrent-5.1.0-qt-5.11.patch
@@ -0,0 +1,53 @@
+From 4befccc3d0ebbd9235e6f10d411f139802e3871a Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+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
+ #include
+ #include
+ #include
+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
+ #include
+ #include
++#include
+ #include
+ #include
+ #include
+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
+ #include
+ #include
+ #include
+--
+2.16.2
+
diff --git a/net-p2p/ktorrent/ktorrent-5.1.0.ebuild
b/net-p2p/ktorrent/ktorrent-5.1.0.ebuild
index ee8be982898..ef67d30802d 100644
--- a/net-p2p/ktorrent/ktorrent-5.1.0.ebuild
+++ b/net-p2p/ktorrent/ktorrent-5.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -78,6 +78,8 @@ RDEPEND="${COMMON_DEPEND}
!net-p2p/ktorrent:4
"
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
+
src_configure() {
local mycmakeargs=(
-DENABLE_BWSCHEDULER_PLUGIN=$(usex bwscheduler)
[gentoo-commits] repo/gentoo:master commit in: net-p2p/ktorrent/files/, net-p2p/ktorrent/
commit: 80054c028619878721c171a81444bb515fb34192
Author: Johannes Huber gentoo org>
AuthorDate: Tue Jan 10 18:27:21 2017 +
Commit: Johannes Huber gentoo org>
CommitDate: Tue Jan 10 18:27:30 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80054c02
net-p2p/ktorrent: Drop slot 4
Package-Manager: Portage-2.3.3, Repoman-2.3.1
net-p2p/ktorrent/Manifest | 1 -
.../ktorrent/files/ktorrent-4.3.1-ipfilter.patch | 72 ---
.../files/ktorrent-4.3.1-underlinking.patch| 21 -
net-p2p/ktorrent/ktorrent-4.3.1-r1.ebuild | 101 -
net-p2p/ktorrent/metadata.xml | 5 -
5 files changed, 200 deletions(-)
diff --git a/net-p2p/ktorrent/Manifest b/net-p2p/ktorrent/Manifest
index ccc07d1..e6d6c2e 100644
--- a/net-p2p/ktorrent/Manifest
+++ b/net-p2p/ktorrent/Manifest
@@ -1,2 +1 @@
-DIST ktorrent-4.3.1.tar.bz2 2943708 SHA256
66094f6833347afb0c49e332f0ec15ec48db652cbe66476840846ffd5ca0e4a1 SHA512
bf1fa144295cb00fccce3a511afe845bc7bf42d77d70205f5893686e7b1fa78c5799c46c7e4e04435ab6fdd4bc9b3b4a25bffb2c5538a25af36302c60742900e
WHIRLPOOL
61303c19f0160bba9bdd288415d86519594f26c5c062f394cee7924093506a9cc6236fd8eedec16c6f799f71a15cb4af15c4b7c079831dccb4e498b833c2234e
DIST ktorrent-5.0.1.tar.xz 2152908 SHA256
d00feeca5dcc6a76a039d67dbe91a2d5a5e1da0f5e0bbd8da2c156d9c44879e5 SHA512
6ceced3d578e58f480ada5b71a66be244c75de726389d39b40c02c5a9445c6bb0b70573fac810abd1659c3172bff79c0c3e5cbfe1a84e0d50836b52291597bc1
WHIRLPOOL
11d59e1762b12e0c740337b05e9e678f71df1a5d43cffee6dcb1a3159afe1da00c118b62b84fdb80dbd6d98f3998250882406e8e61ad181b67b7043d350c8682
diff --git a/net-p2p/ktorrent/files/ktorrent-4.3.1-ipfilter.patch
b/net-p2p/ktorrent/files/ktorrent-4.3.1-ipfilter.patch
deleted file mode 100644
index 4572c3d..
--- a/net-p2p/ktorrent/files/ktorrent-4.3.1-ipfilter.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 3dfcbeb9765e99f9b99951134b17268eb7a617d2 Mon Sep 17 00:00:00 2001
-From: Joris Guisson
-Date: Thu, 1 Aug 2013 13:19:29 +0200
-Subject: [PATCH] Backport ipfilter extraction fixes from master branch to 4.3
- branch
-
-BUG: 315239
- ChangeLog | 3 +++
- plugins/ipfilter/downloadandconvertjob.cpp | 22 +-
- 2 files changed, 8 insertions(+), 17 deletions(-)
-
-diff --git a/ChangeLog b/ChangeLog
-index c5ae9da..42c48ff 100644
a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,6 @@
-+Changes in 4.3.2:
-+- Backport ipfilter extraction fixes from master branch (315239)
-+
- Changes in 4.3.1:
- - Fix new custom groups not appearing in add to group submenu (307230)
- - Fix crash when right clicking on some locations in the GroupView due to 0
pointer (307160)
-diff --git a/plugins/ipfilter/downloadandconvertjob.cpp
b/plugins/ipfilter/downloadandconvertjob.cpp
-index d3092ac..4080c2a 100644
a/plugins/ipfilter/downloadandconvertjob.cpp
-+++ b/plugins/ipfilter/downloadandconvertjob.cpp
-@@ -114,12 +114,13 @@ namespace kt
-
- //now determine if it's ZIP or TXT file
- KMimeType::Ptr ptr = KMimeType::findByPath(temp);
-+Out(SYS_IPF|LOG_NOTICE) << "Mimetype: " << ptr->name() << endl;
- if (ptr->name() == "application/zip")
- {
- active_job = KIO::file_move(temp,QString(kt::DataDir()
+ QLatin1String("level1.zip")),-1,KIO::HideProgressInfo|KIO::Overwrite);
-
connect(active_job,SIGNAL(result(KJob*)),this,SLOT(extract(KJob*)));
- }
-- else if (ptr->name() == "application/x-gzip" || ptr->name() ==
"application/x-bzip")
-+ else if (ptr->name() == "application/x-gzip" || ptr->name() ==
"application/x-bzip" || ptr->name() == "application/gzip")
- {
- active_job = new
bt::DecompressFileJob(temp,QString(kt::DataDir() + "level1.txt"));
-
connect(active_job,SIGNAL(result(KJob*)),this,SLOT(convert(KJob*)));
-@@ -174,23 +175,10 @@ namespace kt
- }
-
- QString destination = kt::DataDir() + "level1.txt";
-- if (zip->directory()->entries().contains("splist.txt"))
-+QStringList entries = zip->directory()->entries();
-+ if (entries.count() >= 1)
- {
-- active_job = new
bt::ExtractFileJob(zip,"splist.txt",destination);
--
connect(active_job,SIGNAL(result(KJob*)),this,SLOT(convert(KJob*)));
-- unzip = true;
-- active_job->start();
-- }
-- else if (zip->directory()->entries().contains("level1.txt"))
-- {
-- active_job = new
bt::ExtractFileJob(zip,"level1.txt",destination);
--
connect(active_job,SIGNAL(result(KJob*)),this,SLOT(convert(KJob*)));
-- unzip = true;
-
[gentoo-commits] repo/gentoo:master commit in: net-p2p/ktorrent/files/, net-p2p/ktorrent/
commit: d2ec04368e585abd931ba9e5f18bc16b9ef67e45
Author: Michael Palimaka gentoo org>
AuthorDate: Sun Jun 26 18:05:34 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sun Jun 26 18:07:11 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2ec0436
reponet-p2p/ktorrent: backport patch from upstream solving build failure
Gentoo-bug: 587048
Package-Manager: portage-2.3.0
net-p2p/ktorrent/files/ktorrent-5.0.1-build.patch | 38 +++
net-p2p/ktorrent/ktorrent-5.0.1.ebuild| 2 ++
2 files changed, 40 insertions(+)
diff --git a/net-p2p/ktorrent/files/ktorrent-5.0.1-build.patch
b/net-p2p/ktorrent/files/ktorrent-5.0.1-build.patch
new file mode 100644
index 000..58949a2
--- /dev/null
+++ b/net-p2p/ktorrent/files/ktorrent-5.0.1-build.patch
@@ -0,0 +1,38 @@
+From ac8eb6b360fbaa2588ec523bb81c380289586db6 Mon Sep 17 00:00:00 2001
+From: David Faure
+Date: Sat, 14 May 2016 11:19:34 +0200
+Subject: [PATCH] Fix compilation, KSharedConfig was not found.
+
+---
+ ktorrent/dialogs/pastedialog.h | 1 +
+ plugins/mediaplayer/mediaview.h | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/ktorrent/dialogs/pastedialog.h b/ktorrent/dialogs/pastedialog.h
+index 2446848..430ea82 100644
+--- a/ktorrent/dialogs/pastedialog.h
b/ktorrent/dialogs/pastedialog.h
+@@ -22,6 +22,7 @@
+ #define PASTEDIALOG_H
+
+ #include
++#include
+ #include "ui_pastedlgbase.h"
+
+
+diff --git a/plugins/mediaplayer/mediaview.h b/plugins/mediaplayer/mediaview.h
+index 2b9a7e6..d1959c1 100644
+--- a/plugins/mediaplayer/mediaview.h
b/plugins/mediaplayer/mediaview.h
+@@ -25,7 +25,7 @@
+ #include
+ #include
+ #include
+-#include
++#include
+ #include "mediafile.h"
+
+
+--
+2.7.3
+
diff --git a/net-p2p/ktorrent/ktorrent-5.0.1.ebuild
b/net-p2p/ktorrent/ktorrent-5.0.1.ebuild
index 978204d..cbc24f5 100644
--- a/net-p2p/ktorrent/ktorrent-5.0.1.ebuild
+++ b/net-p2p/ktorrent/ktorrent-5.0.1.ebuild
@@ -100,6 +100,8 @@ RDEPEND="${COMMON_DEPEND}
# kde5_src_prepare
# }
+PATCHES=( "${FILESDIR}/${P}-build.patch" )
+
src_prepare() {
kde5_src_prepare
