From cf6e6b155f227ed89fb192b7c4f3029b8bc84d15b637b1ab093a8548a29d685c Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 22 Apr 2016 14:17:02 +0000 Subject: [PATCH] Accepting request 390358 from KDE:Extra 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 --- icons.tar.bz2 | 3 - initial-preference.diff | 8 +- ipfilter_bugfix.diff | 54 -------- ktorrent-4.3.1.tar.bz2 | 3 - ktorrent-5.0.tar.xz | 3 + ktorrent.changes | 21 +++ ktorrent.spec | 126 +++++++----------- ...ort-x-scheme-handler-magnet-mimetype.patch | 37 ----- remove-links.diff | 27 ++-- remove-plasma.diff | 12 -- suse-dht-warning.diff | 113 +++++++++------- 11 files changed, 151 insertions(+), 256 deletions(-) delete mode 100644 icons.tar.bz2 delete mode 100644 ipfilter_bugfix.diff delete mode 100644 ktorrent-4.3.1.tar.bz2 create mode 100644 ktorrent-5.0.tar.xz delete mode 100644 properly-support-x-scheme-handler-magnet-mimetype.patch delete mode 100644 remove-plasma.diff diff --git a/icons.tar.bz2 b/icons.tar.bz2 deleted file mode 100644 index 607679f..0000000 --- a/icons.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:776c2483b42a6e233e8312c00ba891d3ca1ba497fd167bcb526c7233965cf99d -size 33203 diff --git a/initial-preference.diff b/initial-preference.diff index d4fb05b..2e8566c 100644 --- a/initial-preference.diff +++ b/initial-preference.diff @@ -1,9 +1,9 @@ ---- ktorrent/ktorrent.desktop.orig 2011-03-14 19:48:22.000000000 +0200 -+++ ktorrent/ktorrent.desktop 2011-03-16 00:26:00.162000025 +0200 -@@ -106,6 +106,7 @@ +--- ktorrent/org.kde.ktorrent.desktop.orig 2011-03-14 19:48:22.000000000 +0200 ++++ ktorrent/org.kde.ktorrent.desktop 2011-03-16 00:26:00.162000025 +0200 +@@ -120,6 +120,7 @@ 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 diff --git a/ipfilter_bugfix.diff b/ipfilter_bugfix.diff deleted file mode 100644 index cf481e2..0000000 --- a/ipfilter_bugfix.diff +++ /dev/null @@ -1,54 +0,0 @@ -commit 3dfcbeb9765e99f9b99951134b17268eb7a617d2 -Author: Joris Guisson -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(); diff --git a/ktorrent-4.3.1.tar.bz2 b/ktorrent-4.3.1.tar.bz2 deleted file mode 100644 index 28ec90e..0000000 --- a/ktorrent-4.3.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:66094f6833347afb0c49e332f0ec15ec48db652cbe66476840846ffd5ca0e4a1 -size 2943708 diff --git a/ktorrent-5.0.tar.xz b/ktorrent-5.0.tar.xz new file mode 100644 index 0000000..b00fe39 --- /dev/null +++ b/ktorrent-5.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:78aefd4660a57e7d512f68db08a0f01e29dc4500242e58cbe7fac4592e24afec +size 2153772 diff --git a/ktorrent.changes b/ktorrent.changes index 97f594c..cb036a6 100644 --- a/ktorrent.changes +++ b/ktorrent.changes @@ -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 diff --git a/ktorrent.spec b/ktorrent.spec index 6f38669..5413ffa 100644 --- a/ktorrent.spec +++ b/ktorrent.spec @@ -17,15 +17,13 @@ Name: ktorrent -Version: 4.3.1 +Version: 5.0 Release: 0 Summary: KDE BitTorrent Client License: GPL-2.0+ Group: Productivity/Networking/File-Sharing Url: http://ktorrent.org/ -Source0: http://ktorrent.org/downloads/%{version}/%{name}-%{version}.tar.bz2 -# Mimetype icons -Source1: icons.tar.bz2 +Source0: http://download.kde.org/stable/ktorrent/%{version}/%{name}-%{version}.tar.xz Source2: ktorrent.1 Source3: ktupnptest.1 # 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 # PATCH-FIX-OPENSUSE initial-preference.diff cmorve69@yahoo.es -- InitialPreference to set it as the default torrent downloader Patch2: initial-preference.diff -# PATCH-FIX-UPSTREAM ipfilter_bugfix.diff -- Fix gzip not working in ipfilter plugin due to wrong mimetype, kde#315239 -Patch3: ipfilter_bugfix.diff -# 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: boost-devel +BuildRequires: extra-cmake-modules BuildRequires: fdupes -%if 0%{?suse_version} <= 1320 && ! 0%{?is_opensuse} -BuildRequires: kdebase4-workspace-devel -%endif -BuildRequires: libkdepimlibs4-devel -BuildRequires: libktorrent-devel >= 1.3.0 -%if %suse_version > 1200 -BuildRequires: pkgconfig(taglib) -%else -BuildRequires: taglib-devel -%endif -%if 0%{?suse_version} +BuildRequires: gmp-devel +BuildRequires: kcmutils-devel +BuildRequires: kconfig-devel +BuildRequires: kcoreaddons-devel +BuildRequires: kcrash-devel +BuildRequires: kdbusaddons-devel +BuildRequires: kdelibs4support-devel +BuildRequires: kdewebkit-devel +BuildRequires: kdoctools-devel +BuildRequires: ki18n-devel +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 -%endif +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5DBus) +BuildRequires: pkgconfig(Qt5Script) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(taglib) 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 -%kde4_pimlibs_requires -%kde4_runtime_requires %description KTorrent is a bittorrent application for KDE which allows you to download files @@ -80,28 +79,16 @@ for BitTorrent. %patch1 %endif %patch2 -tar jxf %{SOURCE1} -%patch3 -%patch4 -p1 -%if 0%{?suse_version} > 1320 || 0%{?is_opensuse} -%patch5 -p1 -%endif %build -%cmake_kde4 -d build +%cmake_kf5 -d build %make_jobs %install -%kde4_makeinstall -C build +%kf5_makeinstall -C build # Not needed, fix "devel-file-in-non-devel-package" rpmlint warning -rm -f %{buildroot}%{_kde4_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~ +rm -f %{buildroot}%{_libdir}/libktcore.so # Add man pages from help2man edited. 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 '#!'`; \ fi -%if 0%{?suse_version} -%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 +%suse_update_desktop_file -r org.kde.ktorrent Qt KDE Network P2P %fdupes -s %{buildroot} %find_lang %{name} -%kde_post_install - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -139,31 +114,22 @@ rm -rf %{buildroot}%{_datadir}/locale/sr@ijekavianlatin/ %files %defattr(-,root,root,-) %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/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 %defattr(-,root,root,-) +%_kf5_htmldir/*/ktorrent/ +%dir %_kf5_htmldir/pt_BR +%exclude %_kf5_htmldir/en/ktorrent/ %changelog diff --git a/properly-support-x-scheme-handler-magnet-mimetype.patch b/properly-support-x-scheme-handler-magnet-mimetype.patch deleted file mode 100644 index abda3a4..0000000 --- a/properly-support-x-scheme-handler-magnet-mimetype.patch +++ /dev/null @@ -1,37 +0,0 @@ -commit f090d11e8837d944dedb40f873713abe4e15d4b4 -Author: Joris Guisson -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 diff --git a/remove-links.diff b/remove-links.diff index 592f8e4..8951710 100644 --- a/remove-links.diff +++ b/remove-links.diff @@ -1,17 +1,18 @@ ---- plugins/search/searchenginelist.cpp -+++ plugins/search/searchenginelist.cpp -@@ -41,10 +41,13 @@ namespace kt - default_opensearch_urls << KUrl("http://www.torrentz.com") << KUrl("http://isohunt.com"); - default_urls << KUrl("http://www.ktorrents.com") - << KUrl("http://www.bittorrent.com") +diff -urNB ktorrent-5.0/plugins/search/searchenginelist.cpp new/plugins/search/searchenginelist.cpp +--- plugins/search/searchenginelist.cpp 2016-03-30 11:25:13.000000000 +0200 ++++ plugins/search/searchenginelist.cpp 2016-04-16 18:46:41.622344264 +0200 +@@ -41,10 +41,13 @@ + default_opensearch_urls << QUrl(QLatin1String("http://www.torrentz.com")) << QUrl(QLatin1String("http://isohunt.com")); + default_urls << QUrl(QLatin1String("http://www.ktorrents.com")) + << QUrl(QLatin1String("http://www.bittorrent.com")) +#if 0 - << KUrl("http://www.mininova.org") - << KUrl("http://thepiratebay.org") - << KUrl("http://www.bitenova.org") -- << KUrl("http://btjunkie.org"); -+ << KUrl("http://btjunkie.org") + << QUrl(QLatin1String("http://www.mininova.org")) + << QUrl(QLatin1String("http://thepiratebay.org")) + << QUrl(QLatin1String("http://www.bitenova.org")) +- << QUrl(QLatin1String("http://btjunkie.org")); ++ << QUrl(QLatin1String("http://btjunkie.org")) +#endif -+ ; - } ++ ; + } diff --git a/remove-plasma.diff b/remove-plasma.diff deleted file mode 100644 index 8d3b0b8..0000000 --- a/remove-plasma.diff +++ /dev/null @@ -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) - diff --git a/suse-dht-warning.diff b/suse-dht-warning.diff index dcf9ede..598eb75 100644 --- a/suse-dht-warning.diff +++ b/suse-dht-warning.diff @@ -1,20 +1,38 @@ -Index: ktorrent/CMakeLists.txt -=================================================================== ---- ktorrent/CMakeLists.txt.orig -+++ ktorrent/CMakeLists.txt -@@ -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) +diff -urNB ktorrent-5.0/CMakeLists.txt new/CMakeLists.txt +--- CMakeLists.txt 2016-04-15 00:30:28.000000000 +0200 ++++ CMakeLists.txt 2016-04-16 13:52:36.168059210 +0200 +@@ -16,7 +16,7 @@ - if (NOT ${ENABLE_KIO_MAGNET}) - install(FILES magnet.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) -Index: ktorrent/dhttip -=================================================================== ---- /dev/null -+++ ktorrent/dhttip -@@ -0,0 +1,11 @@ + find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Widgets Script) + +-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) + + find_package(LibKTorrent 1.9.50 CONFIG REQUIRED) + 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 @@ + + +

@@ -25,49 +43,44 @@ Index: ktorrent/dhttip +

+ + -+ -Index: ktorrent/gui.cpp -=================================================================== ---- ktorrent/gui.cpp.orig -+++ ktorrent/gui.cpp -@@ -38,6 +38,7 @@ - #include +diff -urNB ktorrent-5.0/ktorrent/gui.cpp new/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 +@@ -37,6 +37,7 @@ + #include #include #include +#include #include #include #include -@@ -122,6 +123,8 @@ namespace kt - //markk.update(); - updateActions(); - core->startUpdateTimer(); +@@ -122,6 +123,8 @@ + //markk.update(); + updateActions(); + core->startUpdateTimer(); + -+ QTimer::singleShot(0, this, SLOT(showDhtTip())); - } ++ QTimer::singleShot(0, this, SLOT(showDhtTip())); + } - GUI:: ~GUI() -@@ -597,6 +600,11 @@ namespace kt - return torrent_activity; - } + GUI::~GUI() +@@ -571,4 +574,9 @@ + return torrent_activity; + } -+ void GUI::showDhtTip() -+ { -+ KTipDialog::showTip(this, "ktorrent/dhttip"); -+ } ++ void GUI::showDhtTip() ++ { ++ KTipDialog::showTip(this, "ktorrent/dhttip"); ++ } + } +diff -urNB ktorrent-5.0/ktorrent/gui.h new/ktorrent/gui.h +--- ktorrent/gui.h 2016-03-30 11:25:13.000000000 +0200 ++++ ktorrent/gui.h 2016-04-16 18:16:22.112815265 +0200 +@@ -112,6 +112,7 @@ + void configureNotifications(); + void activePartChanged(KParts::Part* p); + void quit(); ++ void showDhtTip(); - #include "gui.moc" -Index: ktorrent/gui.h -=================================================================== ---- ktorrent/gui.h.orig -+++ ktorrent/gui.h -@@ -113,6 +113,7 @@ namespace kt - void showOrHide(); - void configureNotifications(); - void activePartChanged(KParts::Part* p); -+ void showDhtTip(); - - private: - void setupActions(); + private: + void setupActions();