rpm/ktorrent
SHA256
1
0
Fork 0
forked from pool/ktorrent
Code Pull Requests Activity

Accepting request 390358 from KDE:Extra

Browse Source 
Update to Ktorrent 5.0.  This should go together with the update of libktorrent !!

OBS-URL: https://build.opensuse.org/request/show/390358
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ktorrent?expand=0&rev=102
This commit is contained in:
Dominique Leuenberger 2016-04-22 14:17:02 +00:00 committed by Git OBS Bridge
parent 57ff9d3a36
commit cf6e6b155f
11 changed files with 151 additions and 256 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
icons.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:776c2483b42a6e233e8312c00ba891d3ca1ba497fd167bcb526c7233965cf99d
size 33203

8
initial-preference.diff
View File

@ -1,9 +1,9 @@
--- ktorrent/ktorrent.desktop.orig 2011-03-14 19:48:22.000000000 +0200 --- ktorrent/org.kde.ktorrent.desktop.orig 2011-03-14 19:48:22.000000000 +0200
+++ ktorrent/ktorrent.desktop 2011-03-16 00:26:00.162000025 +0200 +++ ktorrent/org.kde.ktorrent.desktop 2011-03-16 00:26:00.162000025 +0200
@@ -106,6 +106,7 @@ @@ -120,6 +120,7 @@
Type=Application Type=Application
X-DocPath=ktorrent/index.html X-DocPath=ktorrent/index.html
MimeType=application/x-bittorrent;application/x-torrent; MimeType=application/x-bittorrent;application/x-torrent;x-scheme-handler/magnet;
+InitialPreference=5 +InitialPreference=5
X-DBUS-StartupType=Unique X-DBUS-StartupType=Unique
X-DBUS-ServiceName=org.ktorrent.ktorrent X-DBUS-ServiceName=org.ktorrent.ktorrent

54
ipfilter_bugfix.diff
View File

@ -1,54 +0,0 @@
commit 3dfcbeb9765e99f9b99951134b17268eb7a617d2
Author: Joris Guisson <joris.guisson@gmail.com>
Date: Thu Aug 1 13:19:29 2013 +0200
Backport ipfilter extraction fixes from master branch to 4.3 branch
BUG: 315239
diff --git a/plugins/ipfilter/downloadandconvertjob.cpp b/plugins/ipfilter/downloadandconvertjob.cpp
index d3092ac..4080c2a 100644
--- plugins/ipfilter/downloadandconvertjob.cpp
+++ 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;
- active_job->start();
- }
- else if (zip->directory()->entries().contains("ipfilter.dat"))
- {
- active_job = new bt::ExtractFileJob(zip,"ipfilter.dat",destination);
+ active_job = new bt::ExtractFileJob(zip,entries.front(),destination);
connect(active_job,SIGNAL(result(KJob*)),this,SLOT(convert(KJob*)));
unzip = true;
active_job->start();

3
ktorrent-4.3.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:66094f6833347afb0c49e332f0ec15ec48db652cbe66476840846ffd5ca0e4a1
size 2943708

3
ktorrent-5.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:78aefd4660a57e7d512f68db08a0f01e29dc4500242e58cbe7fac4592e24afec
size 2153772

21
ktorrent.changes
View File

@ -1,3 +1,24 @@
-------------------------------------------------------------------
Sat Apr 16 11:37:50 UTC 2016 - tittiatcoke@gmail.com
- Update to version 5.0
* Qt5/KF5 port
* QHttp-based tracker communication was dropped in favour of
KIO-based one
* fix issues found by Coverity static analyzer
* improve naming of few UI items
* initiate sequential download of media content automatically
when it is opened from filelist view
- Drop upstream patches
* ipfilter_bugfix.diff
* properly-support-x-scheme-handler-magnet-mimetype.patch
- Drop patch no longer needed:
* remove-plasma.diff
* icons.tar.bz2
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 8 21:11:46 UTC 2016 - bwiedemann@suse.com Tue Mar 8 21:11:46 UTC 2016 - bwiedemann@suse.com

126
ktorrent.spec
View File

@ -17,15 +17,13 @@
Name: ktorrent Name: ktorrent
Version: 4.3.1 Version: 5.0
Release: 0 Release: 0
Summary: KDE BitTorrent Client Summary: KDE BitTorrent Client
License: GPL-2.0+ License: GPL-2.0+
Group: Productivity/Networking/File-Sharing Group: Productivity/Networking/File-Sharing
Url: http://ktorrent.org/ Url: http://ktorrent.org/
Source0: http://ktorrent.org/downloads/%{version}/%{name}-%{version}.tar.bz2 Source0: http://download.kde.org/stable/ktorrent/%{version}/%{name}-%{version}.tar.xz
# Mimetype icons
Source1: icons.tar.bz2
Source2: ktorrent.1 Source2: ktorrent.1
Source3: ktupnptest.1 Source3: ktupnptest.1
# PATCH-FIX-OPENSUSE remove-links.diff adrian@suse.de -- Remove links to some search engine with maybe legal problems # PATCH-FIX-OPENSUSE remove-links.diff adrian@suse.de -- Remove links to some search engine with maybe legal problems
@ -34,37 +32,38 @@ Patch0: remove-links.diff
Patch1: suse-dht-warning.diff Patch1: suse-dht-warning.diff
# PATCH-FIX-OPENSUSE initial-preference.diff cmorve69@yahoo.es -- InitialPreference to set it as the default torrent downloader # PATCH-FIX-OPENSUSE initial-preference.diff cmorve69@yahoo.es -- InitialPreference to set it as the default torrent downloader
Patch2: initial-preference.diff Patch2: initial-preference.diff
# PATCH-FIX-UPSTREAM ipfilter_bugfix.diff -- Fix gzip not working in ipfilter plugin due to wrong mimetype, kde#315239 BuildRequires: boost-devel
Patch3: ipfilter_bugfix.diff BuildRequires: extra-cmake-modules
# PATCH-FIX-UPSTREAM properly-support-x-scheme-handler-magnet-mimetype.patch -- make ktorrent support magnet mimetype outside KDE4
Patch4: properly-support-x-scheme-handler-magnet-mimetype.patch
# PATCH-FIX-OPENSUSE remove-plasma.diff -- disable building the Plasma applet
Patch5: remove-plasma.diff
BuildRequires: ImageMagick
BuildRequires: fdupes BuildRequires: fdupes
%if 0%{?suse_version} <= 1320 && ! 0%{?is_opensuse} BuildRequires: gmp-devel
BuildRequires: kdebase4-workspace-devel BuildRequires: kcmutils-devel
%endif BuildRequires: kconfig-devel
BuildRequires: libkdepimlibs4-devel BuildRequires: kcoreaddons-devel
BuildRequires: libktorrent-devel >= 1.3.0 BuildRequires: kcrash-devel
%if %suse_version > 1200 BuildRequires: kdbusaddons-devel
BuildRequires: pkgconfig(taglib) BuildRequires: kdelibs4support-devel
%else BuildRequires: kdewebkit-devel
BuildRequires: taglib-devel BuildRequires: kdoctools-devel
%endif BuildRequires: ki18n-devel
%if 0%{?suse_version} BuildRequires: kio-devel
BuildRequires: knotifications-devel
BuildRequires: knotifyconfig-devel
BuildRequires: kross-devel
BuildRequires: kxmlgui-devel
BuildRequires: libktorrent-devel >= 2.0
BuildRequires: libqca-qt5-devel
BuildRequires: phonon4qt5-devel
BuildRequires: plasma5-workspace-devel
BuildRequires: solid-devel
BuildRequires: sonnet-devel
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
%endif BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5DBus)
BuildRequires: pkgconfig(Qt5Script)
BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(taglib)
Recommends: %{name}-lang = %{version} Recommends: %{name}-lang = %{version}
# ktorrent-devel was last used in openSUSE 11.4
Provides: ktorrent-devel = %{version}
Obsoletes: ktorrent-devel < %{version}
# libktcore12 was last used in openSUSE 11.4
Provides: libktcore12 = %{version}
Obsoletes: libktcore12 < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%kde4_pimlibs_requires
%kde4_runtime_requires
%description %description
KTorrent is a bittorrent application for KDE which allows you to download files KTorrent is a bittorrent application for KDE which allows you to download files
@ -80,28 +79,16 @@ for BitTorrent.
%patch1 %patch1
%endif %endif
%patch2 %patch2
tar jxf %{SOURCE1}
%patch3
%patch4 -p1
%if 0%{?suse_version} > 1320 || 0%{?is_opensuse}
%patch5 -p1
%endif
%build %build
%cmake_kde4 -d build %cmake_kf5 -d build
%make_jobs %make_jobs
%install %install
%kde4_makeinstall -C build %kf5_makeinstall -C build
# Not needed, fix "devel-file-in-non-devel-package" rpmlint warning # Not needed, fix "devel-file-in-non-devel-package" rpmlint warning
rm -f %{buildroot}%{_kde4_libdir}/libktcore.so rm -f %{buildroot}%{_libdir}/libktcore.so
# patch image with wrong dimensions - fix rpmlint warning "wrong-icon-size"
mogrify -strip -extent 16x16 -background transparent -gravity center %{buildroot}%{_kde4_iconsdir}/hicolor/22x22/actions/kt-encrypted.png
rm -f %{buildroot}%{_kde4_iconsdir}/hicolor/22x22/actions/kt-encrypted.png~
mogrify -strip -scale 22x22 -background transparent %{buildroot}%{_kde4_iconsdir}/hicolor/22x22/actions/kt-encrypted.png
rm -f %{buildroot}%{_kde4_iconsdir}/hicolor/22x22/actions/kt-encrypted.png~
# Add man pages from help2man edited. # Add man pages from help2man edited.
mkdir -p %{buildroot}%{_mandir}/man1 mkdir -p %{buildroot}%{_mandir}/man1
@ -114,24 +101,12 @@ then break;
else chmod -f 0755 `find %{buildroot} -name *.py -perm 0644 -print0|xargs -0r grep -l '#!'`; \ else chmod -f 0755 `find %{buildroot} -name *.py -perm 0644 -print0|xargs -0r grep -l '#!'`; \
fi fi
%if 0%{?suse_version} %suse_update_desktop_file -r org.kde.ktorrent Qt KDE Network P2P
%suse_update_desktop_file -r %{name} Qt KDE Network P2P
%endif
# Remove unneeded locales
%if 0%{?suse_version} && 0%{?suse_version} < 1140
rm -rf %{buildroot}%{_datadir}/locale/ast/
rm -rf %{buildroot}%{_datadir}/locale/hne/
rm -rf %{buildroot}%{_datadir}/locale/sr@ijekavian/
rm -rf %{buildroot}%{_datadir}/locale/sr@ijekavianlatin/
%endif
%fdupes -s %{buildroot} %fdupes -s %{buildroot}
%find_lang %{name} %find_lang %{name}
%kde_post_install
%post -p /sbin/ldconfig %post -p /sbin/ldconfig
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
@ -139,31 +114,22 @@ rm -rf %{buildroot}%{_datadir}/locale/sr@ijekavianlatin/
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc COPYING ChangeLog RoadMap %doc COPYING ChangeLog RoadMap
%{_kde4_bindir}/ktmagnetdownloader
%{_kde4_bindir}/ktorrent
%{_kde4_bindir}/ktupnptest
%{_kde4_modulesdir}/kt*.so
%if 0%{?suse_version} <= 1320 && ! 0%{?is_opensuse}
%{_kde4_modulesdir}/plasma_applet_ktorrent.so
%{_kde4_modulesdir}/plasma_engine_ktorrent.so
%endif
%{_kde4_libdir}/libktcore.so.*
%{_kde4_applicationsdir}/ktorrent.desktop
%{_kde4_iconsdir}/hicolor/*/actions/kt-*.*
%{_kde4_iconsdir}/hicolor/*/apps/ktorrent.*
%{_kde4_iconsdir}/hicolor/*/mimetypes/torrent.*
%{_kde4_appsdir}/ktorrent/
%{_kde4_servicesdir}/kt*.desktop
%{_kde4_servicetypesdir}/ktorrentplugin.desktop
%if 0%{?suse_version} <= 1320 && ! 0%{?is_opensuse}
%{_kde4_servicesdir}/plasma-applet-ktorrent.desktop
%{_kde4_servicesdir}/plasma-dataengine-ktorrent.desktop
%endif
%doc %{_mandir}/man1/ktorrent.1%{ext_man} %doc %{_mandir}/man1/ktorrent.1%{ext_man}
%doc %{_mandir}/man1/ktupnptest.1%{ext_man} %doc %{_mandir}/man1/ktupnptest.1%{ext_man}
%_bindir/ktorrent
%_libdir/libktcore.so.*
%_kf5_plugindir/
%_kf5_applicationsdir/org.kde.ktorrent.desktop
%_kf5_iconsdir/hicolor/*/*/*.png
%_kf5_iconsdir/hicolor/*/*/*.svgz
%_kf5_notifydir/ktorrent.notifyrc
%_kf5_kxmlguidir/ktorrent/
%_kf5_htmldir/en/ktorrent/
%files lang -f %{name}.lang %files lang -f %{name}.lang
%defattr(-,root,root,-) %defattr(-,root,root,-)
%_kf5_htmldir/*/ktorrent/
%dir %_kf5_htmldir/pt_BR
%exclude %_kf5_htmldir/en/ktorrent/
%changelog %changelog

37
properly-support-x-scheme-handler-magnet-mimetype.patch
View File

@ -1,37 +0,0 @@
commit f090d11e8837d944dedb40f873713abe4e15d4b4
Author: Joris Guisson <joris.guisson@gmail.com>
Date: Sat Nov 8 12:35:09 2014 +0100
Properly support x-scheme-handler/magnet mimetype, and drop old hard-coded magnet.protocol.
Patch from Rex Dieter
Review: 108648
diff --git a/ktorrent/CMakeLists.txt b/ktorrent/CMakeLists.txt
index 3d61cfd..3e64bc1 100644
--- a/ktorrent/CMakeLists.txt
+++ b/ktorrent/CMakeLists.txt
@@ -94,9 +94,5 @@
install(FILES ktorrent.notifyrc DESTINATION ${DATA_INSTALL_DIR}/ktorrent )
install(FILES dhttip DESTINATION ${DATA_INSTALL_DIR}/ktorrent)
-if (NOT ${ENABLE_KIO_MAGNET})
- install(FILES magnet.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
-endif (NOT ${ENABLE_KIO_MAGNET})
-
add_subdirectory(icons)
diff --git a/ktorrent/ktorrent.desktop b/ktorrent/ktorrent.desktop
index d326f63..dff843f 100755
--- a/ktorrent/ktorrent.desktop
+++ b/ktorrent/ktorrent.desktop
@@ -118,7 +118,7 @@ Exec=ktorrent %i -caption "%c" %u
Icon=ktorrent
Type=Application
X-DocPath=ktorrent/index.html
-MimeType=application/x-bittorrent;application/x-torrent;
+MimeType=application/x-bittorrent;application/x-torrent;x-scheme-handler/magnet;
InitialPreference=5
X-DBUS-StartupType=Unique
X-DBUS-ServiceName=org.ktorrent.ktorrent

23
remove-links.diff
View File

@ -1,15 +1,16 @@
--- plugins/search/searchenginelist.cpp diff -urNB ktorrent-5.0/plugins/search/searchenginelist.cpp new/plugins/search/searchenginelist.cpp
+++ plugins/search/searchenginelist.cpp --- plugins/search/searchenginelist.cpp 2016-03-30 11:25:13.000000000 +0200
@@ -41,10 +41,13 @@ namespace kt +++ plugins/search/searchenginelist.cpp 2016-04-16 18:46:41.622344264 +0200
default_opensearch_urls << KUrl("http://www.torrentz.com") << KUrl("http://isohunt.com"); @@ -41,10 +41,13 @@
default_urls << KUrl("http://www.ktorrents.com") default_opensearch_urls << QUrl(QLatin1String("http://www.torrentz.com")) << QUrl(QLatin1String("http://isohunt.com"));
<< KUrl("http://www.bittorrent.com") default_urls << QUrl(QLatin1String("http://www.ktorrents.com"))
<< QUrl(QLatin1String("http://www.bittorrent.com"))
+#if 0 +#if 0
<< KUrl("http://www.mininova.org") << QUrl(QLatin1String("http://www.mininova.org"))
<< KUrl("http://thepiratebay.org") << QUrl(QLatin1String("http://thepiratebay.org"))
<< KUrl("http://www.bitenova.org") << QUrl(QLatin1String("http://www.bitenova.org"))
- << KUrl("http://btjunkie.org"); - << QUrl(QLatin1String("http://btjunkie.org"));
+ << KUrl("http://btjunkie.org") + << QUrl(QLatin1String("http://btjunkie.org"))
+#endif +#endif
+ ; + ;
} }

12
remove-plasma.diff
View File

@ -1,12 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a4973e3..f6b7142 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,7 +40,6 @@ add_subdirectory(libktcore)
add_subdirectory(plugins)
add_subdirectory(ktorrent)
add_subdirectory(ktupnptest)
-add_subdirectory(plasma)
add_subdirectory(ktmagnetdownloader)
add_subdirectory(doc)

81
suse-dht-warning.diff
View File

@ -1,20 +1,38 @@
Index: ktorrent/CMakeLists.txt diff -urNB ktorrent-5.0/CMakeLists.txt new/CMakeLists.txt
=================================================================== --- CMakeLists.txt 2016-04-15 00:30:28.000000000 +0200
--- ktorrent/CMakeLists.txt.orig +++ CMakeLists.txt 2016-04-16 13:52:36.168059210 +0200
+++ ktorrent/CMakeLists.txt @@ -16,7 +16,7 @@
@@ -91,6 +91,7 @@ install(FILES ktorrentplugin.desktop DE
install(FILES ktorrentui.rc DESTINATION ${DATA_INSTALL_DIR}/ktorrent )
install(FILES kttorrentactivityui.rc DESTINATION ${DATA_INSTALL_DIR}/ktorrent )
install(FILES ktorrent.notifyrc DESTINATION ${DATA_INSTALL_DIR}/ktorrent )
+install(FILES dhttip DESTINATION ${DATA_INSTALL_DIR}/ktorrent)
if (NOT ${ENABLE_KIO_MAGNET}) find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Widgets Script)
install(FILES magnet.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
Index: ktorrent/dhttip -find_package(KF5 5.15 REQUIRED I18n KIO XmlGui Notifications NotifyConfig Solid Config CoreAddons DocTools Kross KCMUtils Sonnet DBusAddons Crash Archive KDELibs4Support)
=================================================================== +find_package(KF5 5.15 REQUIRED I18n KIO XmlGui Notifications NotifyConfig Solid Config ConfigWidgets CoreAddons DocTools Kross KCMUtils Sonnet DBusAddons Crash Archive KDELibs4Support)
--- /dev/null
+++ ktorrent/dhttip find_package(LibKTorrent 1.9.50 CONFIG REQUIRED)
@@ -0,0 +1,11 @@ find_package(Boost REQUIRED)
diff -urNB ktorrent-5.0/ktorrent/CMakeLists.txt new/ktorrent/CMakeLists.txt
--- ktorrent/CMakeLists.txt 2016-03-30 11:25:13.000000000 +0200
+++ ktorrent/CMakeLists.txt 2016-04-16 13:53:51.520453793 +0200
@@ -88,6 +88,7 @@
KF5::Parts
KF5::DBusAddons
KF5::KDELibs4Support
+ KF5::ConfigWidgets
)
install(TARGETS ktorrent_app ${INSTALL_TARGETS_DEFAULT_ARGS})
@@ -95,6 +96,7 @@
install(FILES ktorrentui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/ktorrent )
install(FILES kttorrentactivityui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/ktorrent )
install(FILES ktorrent.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR} )
+install(FILES dhttip DESTINATION ${KXMLGUI_INSTALL_DIR}/ktorrent )
add_subdirectory(icons)
diff -urNB ktorrent-5.0/ktorrent/dhttip new/ktorrent/dhttip
--- ktorrent/dhttip 1970-01-01 01:00:00.000000000 +0100
+++ ktorrent/dhttip 2016-04-16 13:54:19.072598069 +0200
@@ -0,0 +1,10 @@
+<tip category="Ktorrent"> +<tip category="Ktorrent">
+<html> +<html>
+<p> +<p>
@ -25,20 +43,18 @@ Index: ktorrent/dhttip
+</p> +</p>
+</html> +</html>
+</tip> +</tip>
+ diff -urNB ktorrent-5.0/ktorrent/gui.cpp new/ktorrent/gui.cpp
Index: ktorrent/gui.cpp --- ktorrent/gui.cpp 2016-03-30 11:25:13.000000000 +0200
=================================================================== +++ ktorrent/gui.cpp 2016-04-16 18:15:12.284449587 +0200
--- ktorrent/gui.cpp.orig @@ -37,6 +37,7 @@
+++ ktorrent/gui.cpp #include <krecentdirs.h>
@@ -38,6 +38,7 @@
#include <kpushbutton.h>
#include <kxmlguifactory.h> #include <kxmlguifactory.h>
#include <KNotifyConfigWidget> #include <KNotifyConfigWidget>
+#include <KTipDialog> +#include <KTipDialog>
#include <kio/jobclasses.h> #include <kio/jobclasses.h>
#include <kio/jobuidelegate.h> #include <kio/jobuidelegate.h>
#include <kparts/partmanager.h> #include <kparts/partmanager.h>
@@ -122,6 +123,8 @@ namespace kt @@ -122,6 +123,8 @@
//markk.update(); //markk.update();
updateActions(); updateActions();
core->startUpdateTimer(); core->startUpdateTimer();
@ -46,8 +62,8 @@ Index: ktorrent/gui.cpp
+ QTimer::singleShot(0, this, SLOT(showDhtTip())); + QTimer::singleShot(0, this, SLOT(showDhtTip()));
} }
GUI:: ~GUI() GUI::~GUI()
@@ -597,6 +600,11 @@ namespace kt @@ -571,4 +574,9 @@
return torrent_activity; return torrent_activity;
} }
@ -57,16 +73,13 @@ Index: ktorrent/gui.cpp
+ } + }
+ +
} }
diff -urNB ktorrent-5.0/ktorrent/gui.h new/ktorrent/gui.h
#include "gui.moc" --- ktorrent/gui.h 2016-03-30 11:25:13.000000000 +0200
Index: ktorrent/gui.h +++ ktorrent/gui.h 2016-04-16 18:16:22.112815265 +0200
=================================================================== @@ -112,6 +112,7 @@
--- ktorrent/gui.h.orig
+++ ktorrent/gui.h
@@ -113,6 +113,7 @@ namespace kt
void showOrHide();
void configureNotifications(); void configureNotifications();
void activePartChanged(KParts::Part* p); void activePartChanged(KParts::Part* p);
void quit();
+ void showDhtTip(); + void showDhtTip();
private: private: