From b2720c6e0547bbe9ea994c0b1fc762b05c25f9395d3890cbd9feacb95f5e96c6 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 12 Mar 2012 19:15:13 +0000 Subject: [PATCH] Accepting request 108782 from KDE:Distro:Factory - Update to version 4.2.0, also lists changes what changed in rc1 * Add new group switcher combobox in toolbar * Make kio-magnet optional * Improve handing magnet uris in search plugin * Fix bug causing kio-magnet to deselect all files * Close current scan widget when a new one is started for a torrent * Fix syndication plugin not handling relative urls properly * Fix magnet uri's not being handled properly in load torrent feature of webinterface * Make it possible to check individual files of a torrent * Data checks for multiple torrents can now get started at the same time * Make links clickable in the status tab comments field * Revamp UPnP plugin * Fix bug making it possible to add conflicting items to the schedule * Make it possible for schedule items to span multiple days * Include disk usage of existing files when calculating bytes left after download in FileSelectDlg * Disable scripts in GUI, if no interpreter could be found for the script * Show shutdown plugin's config dialog when no rules are present and the enable button is pressed * Make it possible to wait for several events before activating the shutdown action * Fix wrong required diskspace calculation in some rare circumstances * Revamp scanfolder plugin * Revamp GUI of mediaplayer plugin * Make properties extender a dialog * Fix bug causing scripts not to be selectable in scripting plugin * Show info hash in status tab * Improve video streaming support * Add Open With option to FileView context menu * Fix bug causing views to not get properly restored when the application language changes * Check if new trackers have a supported protocol * Remove usage of several deprecated KDE3 networking classes * Remove obsolete config options of datacheck during upload feature OBS-URL: https://build.opensuse.org/request/show/108782 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ktorrent?expand=0&rev=86 --- ktorrent-4.1.3.tar.bz2 | 3 - ktorrent-4.2.0.tar.bz2 | 3 + ktorrent-bug287309.patch | 174 --------------------------------------- ktorrent.changes | 57 +++++++++++++ ktorrent.spec | 9 +- suse-dht-warning.diff | 35 +++++--- 6 files changed, 84 insertions(+), 197 deletions(-) delete mode 100644 ktorrent-4.1.3.tar.bz2 create mode 100644 ktorrent-4.2.0.tar.bz2 delete mode 100644 ktorrent-bug287309.patch diff --git a/ktorrent-4.1.3.tar.bz2 b/ktorrent-4.1.3.tar.bz2 deleted file mode 100644 index 65821c9..0000000 --- a/ktorrent-4.1.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2f852f4ffdda976af38b85bf532e7d353dcf7b7dd7135a66af834543eb420646 -size 2959837 diff --git a/ktorrent-4.2.0.tar.bz2 b/ktorrent-4.2.0.tar.bz2 new file mode 100644 index 0000000..290d7d5 --- /dev/null +++ b/ktorrent-4.2.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f625b1dc116c94d97ce3b56a7a259b07d95f6592b709596319bf16bb06cf6422 +size 3083219 diff --git a/ktorrent-bug287309.patch b/ktorrent-bug287309.patch deleted file mode 100644 index ee940e9..0000000 --- a/ktorrent-bug287309.patch +++ /dev/null @@ -1,174 +0,0 @@ -commit 6d4a6ae51692966862ccb20d17cb217717519d40 -Author: Joris Guisson -Date: Wed Nov 23 20:17:08 2011 +0100 - - Use dbus to show ktorrent window from plasma applet. This removes the dependency on libtaskmanager. - - BUG: 287309 - -diff --git a/plasma/applet/CMakeLists.txt b/plasma/applet/CMakeLists.txt -index 3a72241..4307cf2 100644 ---- a/plasma/applet/CMakeLists.txt -+++ b/plasma/applet/CMakeLists.txt -@@ -5,25 +5,15 @@ if(NOT QT_VERSION_OK) - - else(NOT QT_VERSION_OK) - -- set(TASKMANAGER_FOUND FALSE) -- FIND_PATH(TASKMANAGER_INCLUDE_DIR NAMES taskmanager.h PATHS ${KDE4_INCLUDE_DIR}/taskmanager ${INCLUDE_INSTALL_DIR}/taskmanager.h) -- FIND_LIBRARY(TASKMANAGER_LIBRARY NAMES taskmanager PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR}) -- -- if(TASKMANAGER_INCLUDE_DIR AND TASKMANAGER_LIBRARY) -- set(TASKMANAGER_FOUND TRUE) -- message(STATUS "Found libtaskmanager: ${TASKMANAGER_LIBRARY} ") -- include_directories(${TASKMANAGER_INCLUDE_DIR}) -- set(ktapplet_SRCS applet.cpp chunkbar.cpp fadingitem.cpp fadingnavigationwidget.cpp) -- -- kde4_add_ui_files(ktapplet_SRCS appletconfig.ui) -- -- kde4_add_plugin(plasma_applet_ktorrent ${ktapplet_SRCS}) -- target_link_libraries(plasma_applet_ktorrent ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${TASKMANAGER_LIBRARY} ${LIBKTORRENT_LIBRARIES} ktcore) -- -- install(TARGETS plasma_applet_ktorrent DESTINATION ${PLUGIN_INSTALL_DIR}) -- install(FILES plasma-applet-ktorrent.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -- endif(TASKMANAGER_INCLUDE_DIR AND TASKMANAGER_LIBRARY) -- -- macro_log_feature(TASKMANAGER_FOUND "libtaskmanager" "libtaskmanager library and header files" "http://www.kde.org/" FALSE "" "libtaskmanager is needed for KTorrent Plasmoid") -+ -+ set(ktapplet_SRCS applet.cpp chunkbar.cpp fadingitem.cpp fadingnavigationwidget.cpp) -+ -+ kde4_add_ui_files(ktapplet_SRCS appletconfig.ui) -+ -+ kde4_add_plugin(plasma_applet_ktorrent ${ktapplet_SRCS}) -+ target_link_libraries(plasma_applet_ktorrent ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${LIBKTORRENT_LIBRARIES} ktcore) -+ -+ install(TARGETS plasma_applet_ktorrent DESTINATION ${PLUGIN_INSTALL_DIR}) -+ install(FILES plasma-applet-ktorrent.desktop DESTINATION ${SERVICES_INSTALL_DIR}) - - endif(NOT QT_VERSION_OK) -diff --git a/plasma/applet/applet.cpp b/plasma/applet/applet.cpp -index 59e7191..bf09479 100644 ---- a/plasma/applet/applet.cpp -+++ b/plasma/applet/applet.cpp -@@ -21,6 +21,9 @@ - #include "applet.h" - #include - #include -+#include -+#include -+#include - #include - #include - #include -@@ -31,12 +34,11 @@ - #include - #endif - #include --#include --#include - #include - #include "chunkbar.h" - #include "fadingnavigationwidget.h" - -+ - using namespace bt; - - namespace ktplasma -@@ -174,7 +176,8 @@ namespace ktplasma - } - } - -- void Applet::updateNavigation() { -+ void Applet::updateNavigation() -+ { - navigation->setEnabled(connected_to_app && !sources.empty() - && (sources.count() > 1 || !sources.contains(current_source))); - } -@@ -193,12 +196,14 @@ namespace ktplasma - } - } - -- void Applet::updateSources() { -+ void Applet::updateSources() -+ { - sources = engine->sources(); - sources.removeOne("core"); - } - -- void Applet::setSource(QString source) { -+ void Applet::setSource(QString source) -+ { - if (!current_source.isEmpty()) - engine->disconnectSource(current_source,this); - clearData(); -@@ -340,20 +345,39 @@ namespace ktplasma - - void Applet::iconClicked() - { -- TaskManager::TaskDict tasks = TaskManager::TaskManager::self()->tasks(); -- for (TaskManager::TaskDict::iterator i = tasks.begin();i != tasks.end();i ++) -+ QDBusConnection session_bus = QDBusConnection::sessionBus(); -+ QDBusConnectionInterface* dbus_service = session_bus.interface(); -+ if (!session_bus.isConnected() || !dbus_service || !dbus_service->isServiceRegistered("org.ktorrent.ktorrent")) - { -- if (i.value()->className() == "ktorrent") -- { -- KWindowSystem::activateWindow(i.key()); -- return; -- } -+ // can't find the window, try launching it -+ KUrl::List empty; -+ KRun::run("ktorrent", empty, 0); -+ } -+ else -+ { -+ QDBusMessage msg = QDBusMessage::createMethodCall("org.ktorrent.ktorrent", "/ktorrent/MainWindow_1", "org.kde.KMainWindow", "winId"); -+ QDBusPendingCall call = session_bus.asyncCall(msg, 5000); -+ QDBusPendingCallWatcher* watcher = new QDBusPendingCallWatcher(call ,this); -+ connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)), this, SLOT(dbusCallFinished(QDBusPendingCallWatcher*))); - } -- -- // can't find the window, try launching it -- KUrl::List empty; -- KRun::run("ktorrent", empty, 0); - } -+ -+ void Applet::dbusCallFinished(QDBusPendingCallWatcher* self) -+ { -+ if (self->isError()) -+ { -+ // call failed, try launching it -+ KUrl::List empty; -+ KRun::run("ktorrent", empty, 0); -+ } -+ else -+ { -+ QDBusPendingReply reply = *self; -+ KWindowSystem::activateWindow(reply.value()); -+ } -+ self->deleteLater(); -+ } -+ - - void Applet::clearData() - { -diff --git a/plasma/applet/applet.h b/plasma/applet/applet.h -index 29b3265..d396118 100644 ---- a/plasma/applet/applet.h -+++ b/plasma/applet/applet.h -@@ -27,6 +27,7 @@ - #include "fadingnavigationwidget.h" - - class QGraphicsLinearLayout; -+class QDBusPendingCallWatcher; - - namespace Plasma - { -@@ -68,6 +69,7 @@ namespace ktplasma - void iconClicked(); - void selectPrev(); - void selectNext(); -+ void dbusCallFinished(QDBusPendingCallWatcher* self); - - private: - void updateTorrentCombo(); diff --git a/ktorrent.changes b/ktorrent.changes index d5c3527..ca87a9e 100644 --- a/ktorrent.changes +++ b/ktorrent.changes @@ -1,3 +1,60 @@ +------------------------------------------------------------------- +Tue Mar 6 10:51:32 UTC 2012 - mlin@suse.com + +- Update to version 4.2.0, also lists changes what changed in rc1 + * Add new group switcher combobox in toolbar + * Make kio-magnet optional + * Improve handing magnet uris in search plugin + * Fix bug causing kio-magnet to deselect all files + * Close current scan widget when a new one is started for a torrent + * Fix syndication plugin not handling relative urls properly + * Fix magnet uri's not being handled properly in load torrent feature of webinterface + * Make it possible to check individual files of a torrent + * Data checks for multiple torrents can now get started at the same time + * Make links clickable in the status tab comments field + * Revamp UPnP plugin + * Fix bug making it possible to add conflicting items to the schedule + * Make it possible for schedule items to span multiple days + * Include disk usage of existing files when calculating bytes left after download in FileSelectDlg + * Disable scripts in GUI, if no interpreter could be found for the script + * Show shutdown plugin's config dialog when no rules are present and the enable button is pressed + * Make it possible to wait for several events before activating the shutdown action + * Fix wrong required diskspace calculation in some rare circumstances + * Revamp scanfolder plugin + * Revamp GUI of mediaplayer plugin + * Make properties extender a dialog + * Fix bug causing scripts not to be selectable in scripting plugin + * Show info hash in status tab + * Improve video streaming support + * Add Open With option to FileView context menu + * Fix bug causing views to not get properly restored when the application language changes + * Check if new trackers have a supported protocol + * Remove usage of several deprecated KDE3 networking classes + * Remove obsolete config options of datacheck during upload feature + * Improve error display of syndication plugin errors + * Remove multiple views support + * Relabel Change Tracker button into Switch Tracker to avoid user confusion + * Revamp IP filter widget + * Fix scanfolder moving to loaded directory causing a flurry of popups about the torrent already being loaded + * Only enable the infowidget plugin by default + * Add force start option + * Add torrent search bar for view + * Make it possible to hide uploads, downloads and not queued torrents in the queue manager + * Merge status and name column into one column and use icons to show the status + * Highlight in bold and scroll to newly added torrents + * Show torrent names in remove torrent and data confirmation dialog + * Enable select new location button when all non excluded files are missing instead of when all files are missing + * Hide chunkbar when download of stream is complete + * Suspend/resume queue when middle clicking on tray icon + * Use dbus to show ktorrent window from plasma applet + * Fix crash due to dangling pointer + * Always make already loaded message of a torrent a passive popup + * Make torrent properties dialog modal + * Allow i2p addresses as a custom ip in tracker announces + * Fix bug causing homepage of search plugin not the render properly +- Refresh suse-dht-warning.diff +- Drop out ktorrent-bug287309.patch since its included + ------------------------------------------------------------------- Thu Jan 19 10:05:58 UTC 2012 - idonmez@suse.com diff --git a/ktorrent.spec b/ktorrent.spec index 8590c9f..bf75a49 100644 --- a/ktorrent.spec +++ b/ktorrent.spec @@ -17,7 +17,7 @@ Name: ktorrent -Version: 4.1.3 +Version: 4.2.0 Release: 0 Summary: KDE BitTorrent Client License: GPL-2.0+ @@ -34,13 +34,11 @@ 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 ktorrent-bug287309.patch idoenmez@suse.de -- Fix for kde#287309 -Patch3: ktorrent-bug287309.patch BuildRequires: ImageMagick BuildRequires: fdupes BuildRequires: kdebase4-workspace-devel BuildRequires: libkdepimlibs4-devel -BuildRequires: libktorrent-devel >= 1.1.1 +BuildRequires: libktorrent-devel >= 1.2.0 BuildRequires: taglib-devel %if 0%{?suse_version} BuildRequires: update-desktop-files @@ -70,7 +68,6 @@ for BitTorrent. %patch1 %endif %patch2 -%patch3 -p1 tar jxf %{SOURCE1} %build @@ -128,7 +125,6 @@ rm -rf %{buildroot}%{_datadir}/locale/sr@ijekavianlatin/ %{_kde4_bindir}/ktmagnetdownloader %{_kde4_bindir}/ktorrent %{_kde4_bindir}/ktupnptest -%{_kde4_modulesdir}/kio_magnet.so %{_kde4_modulesdir}/kt*.so %{_kde4_modulesdir}/plasma_applet_ktorrent.so %{_kde4_modulesdir}/plasma_engine_ktorrent.so @@ -139,7 +135,6 @@ rm -rf %{buildroot}%{_datadir}/locale/sr@ijekavianlatin/ %{_kde4_iconsdir}/hicolor/*/apps/ktorrent.* %{_kde4_iconsdir}/hicolor/*/mimetypes/torrent.* %{_kde4_appsdir}/ktorrent/ -%{_kde4_sharedir}/config.kcfg/magnetsettings.kcfg %{_kde4_servicesdir}/kt*.desktop %{_kde4_servicesdir}/magnet.protocol %{_kde4_servicesdir}/plasma-applet-ktorrent.desktop diff --git a/suse-dht-warning.diff b/suse-dht-warning.diff index d64f549..dcf9ede 100644 --- a/suse-dht-warning.diff +++ b/suse-dht-warning.diff @@ -1,14 +1,19 @@ ---- ktorrent/CMakeLists.txt 2010-11-22 20:03:36.000000000 +0100 -+++ ktorrent/CMakeLists.txt 2010-11-22 21:17:17.940000085 +0100 -@@ -92,5 +92,6 @@ +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) - add_subdirectory(icons) ---- ktorrent/dhttip 1970-01-01 01:00:00.000000000 +0100 -+++ ktorrent/dhttip 2010-11-22 21:17:17.931000085 +0100 + if (NOT ${ENABLE_KIO_MAGNET}) + install(FILES magnet.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) +Index: ktorrent/dhttip +=================================================================== +--- /dev/null ++++ ktorrent/dhttip @@ -0,0 +1,11 @@ + + @@ -21,8 +26,10 @@ + + + ---- ktorrent/gui.cpp 2010-11-22 20:03:36.000000000 +0100 -+++ ktorrent/gui.cpp 2010-11-22 21:17:17.931000085 +0100 +Index: ktorrent/gui.cpp +=================================================================== +--- ktorrent/gui.cpp.orig ++++ ktorrent/gui.cpp @@ -38,6 +38,7 @@ #include #include @@ -31,7 +38,7 @@ #include #include #include -@@ -128,6 +129,8 @@ +@@ -122,6 +123,8 @@ namespace kt //markk.update(); updateActions(); core->startUpdateTimer(); @@ -40,7 +47,7 @@ } GUI:: ~GUI() -@@ -599,6 +602,11 @@ +@@ -597,6 +600,11 @@ namespace kt return torrent_activity; } @@ -52,9 +59,11 @@ } #include "gui.moc" ---- ktorrent/gui.h 2010-11-22 20:03:36.000000000 +0100 -+++ ktorrent/gui.h 2010-11-22 21:18:05.565000084 +0100 -@@ -113,6 +113,7 @@ +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);