Hello community, here is the log from the commit of package ktorrent checked in at Thu May 25 00:43:03 CEST 2006. -------- --- KDE/ktorrent/ktorrent.changes 2006-04-16 23:57:42.000000000 +0200 +++ ktorrent/ktorrent.changes 2006-05-23 17:30:45.000000000 +0200 @@ -1,0 +2,12 @@ +Tue May 23 17:28:15 CEST 2006 - adrian@suse.de + +- update to version 2.0beta1 + * Speed improvements + * Protocol encryption + * Bandwith scheduling + * File prioritization for multifile torrents + * Directory scanner for torrent files + * Many bug fixes +- disable experimental DHT for now + +------------------------------------------------------------------- Old: ---- fix-translations.diff ktorrent-1.2.tar.gz ktorrent-fix-KBytesPerSecToString.diff ktorrent-fix-german-translation.diff ktorrent-fix-i18n-strings.diff New: ---- disable-DHT.diff ktorrent-2.0beta1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ktorrent.spec ++++++ --- /var/tmp/diff_new_pack.jA73Qx/_old 2006-05-25 00:42:29.000000000 +0200 +++ /var/tmp/diff_new_pack.jA73Qx/_new 2006-05-25 00:42:29.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package ktorrent (Version 1.2) +# spec file for package ktorrent (Version 2.0beta1) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,25 +11,22 @@ # norootforbuild Name: ktorrent -BuildRequires: kdelibs3-devel +BuildRequires: gmp-devel kdelibs3-devel URL: http://ktorrent.pwsp.net/ License: LGPL Group: Productivity/Networking/Other Summary: KDE BitTorrent Client -Version: 1.2 -Release: 15 +Version: 2.0beta1 +Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source: %{name}-%{version}.tar.gz +Source: %{name}-%{version}.tar.bz2 Patch2: remove-links.diff Patch10: ktorrent-fix-columns.diff Patch11: ktorrent-fix-columns_save_restore_ktorrentview.diff -Patch12: ktorrent-fix-KBytesPerSecToString.diff Patch13: ktorrent-fix-keep_seeding.diff Patch14: ktorrent-fix-remove-unneeded.diff Patch15: ktorrent-fix-compiler_warning.diff -Patch16: fix-translations.diff -Patch17: ktorrent-fix-german-translation.diff -Patch18: ktorrent-fix-i18n-strings.diff +Patch16: disable-DHT.diff %description Torrent is a BitTorrent program for KDE. Its main features are: * @@ -53,13 +50,10 @@ %patch2 %patch10 %patch11 -%patch12 %patch13 %patch14 %patch15 %patch16 -%patch17 -%patch18 . /etc/opt/kde3/common_options update_admin @@ -103,26 +97,23 @@ /opt/kde3/share/icons/*/*/*/* /opt/kde3/share/appl*/*/*.desktop /opt/kde3/share/apps/* -/opt/kde3/%_lib/kde3/ktinfowidgetplugin.* -/opt/kde3/%_lib/kde3/ktipfilterplugin.* -/opt/kde3/%_lib/kde3/ktlogviewerplugin.* -/opt/kde3/%_lib/kde3/ktpartfileimportplugin.* -/opt/kde3/%_lib/kde3/ktsearchplugin.* -/opt/kde3/%_lib/kde3/ktupnpplugin.* +/opt/kde3/%_lib/kde3/* /opt/kde3/%_lib/libktorrent.* -/opt/kde3/share/config.kcfg/ktinfowidgetplugin.kcfg -/opt/kde3/share/config.kcfg/ktipfilterplugin.kcfg -/opt/kde3/share/config.kcfg/ktsearchplugin.kcfg -/opt/kde3/share/config.kcfg/ktupnpplugin.kcfg -/opt/kde3/share/services/ktinfowidgetplugin.desktop -/opt/kde3/share/services/ktipfilterplugin.desktop -/opt/kde3/share/services/ktlogviewerplugin.desktop -/opt/kde3/share/services/ktpartfileimportplugin.desktop -/opt/kde3/share/services/ktsearchplugin.desktop -/opt/kde3/share/services/ktupnpplugin.desktop -/opt/kde3/share/servicetypes/ktorrentplugin.desktop +/opt/kde3/share/mimelnk/application/x-bittorrent.desktop +/opt/kde3/share/config.kcfg/*.kcfg +/opt/kde3/share/services/*.desktop +/opt/kde3/share/servicetypes/*.desktop %changelog -n ktorrent +* Tue May 23 2006 - adrian@suse.de +- update to version 2.0beta1 + * Speed improvements + * Protocol encryption + * Bandwith scheduling + * File prioritization for multifile torrents + * Directory scanner for torrent files + * Many bug fixes +- disable experimental DHT for now * Sun Apr 16 2006 - dkukawka@suse.de - updated/added upstream commited changes: - ktorrent-fix-german-translation.diff: updated german ++++++ disable-DHT.diff ++++++ --- apps/ktorrent/ktorrent.cpp +++ apps/ktorrent/ktorrent.cpp 2006/05/23 15:57:30 @@ -320,6 +320,7 @@ //update QM m_core->getQueueManager()->orderQueue(); +#if 0 dht::DHTBase & ht = Globals::instance().getDHT(); if (Settings::dhtSupport() && !ht.isRunning()) { @@ -335,6 +336,7 @@ ht.stop(); ht.start(KGlobal::dirs()->saveLocation("data","ktorrent") + "dht_table",Settings::dhtPort()); } +#endif if (Settings::useEncryption()) { --- apps/ktorrent/ktorrent.kcfg +++ apps/ktorrent/ktorrent.kcfg 2006/05/23 15:31:53 @@ -79,16 +79,6 @@ <label>GUI update interval</label> <default>0</default> </entry> - <entry name="dhtSupport" type="Bool"> - <label>Support for DHT</label> - <default>false</default> - </entry> - <entry name="dhtPort" type="Int"> - <label>DHT port</label> - <default>6881</default> - <min>0</min> - <max>65535</max> - </entry> <entry name="numUploadSlots" type="Int"> <label>Number of upload slots</label> <default>4</default> --- apps/ktorrent/pref.cpp +++ apps/ktorrent/pref.cpp 2006/05/23 15:59:53 @@ -153,12 +153,14 @@ Settings::setKeepSeeding(dp->keep_seeding->isChecked()); Settings::setPort(dp->port->value()); Settings::setNumUploadSlots(dp->num_upload_slots->value()); +#if 0 if (Settings::dhtSupport() && dp->udp_tracker_port->value() == Settings::dhtPort()) { QString msg = i18n("The DHT port needs to be different then the UDP tracker port !"); KMessageBox::error(0,msg,i18n("Error")); return false; } +#endif Settings::setUdpTrackerPort(dp->udp_tracker_port->value()); return true; } @@ -202,8 +204,10 @@ this,SLOT(autosaveChecked(bool ))); connect(gp->custom_ip_check,SIGNAL(toggled(bool)), this,SLOT(customIPChecked(bool ))); +#if 0 connect(gp->use_dht,SIGNAL(toggled(bool)), this,SLOT(dhtChecked( bool ))); +#endif connect(gp->use_encryption,SIGNAL(toggled(bool)), this,SLOT(useEncryptionChecked( bool ))); } @@ -245,7 +249,8 @@ Settings::setMemoryUsage(gp->mem_usage->currentItem()); Settings::setGuiUpdateInterval(gp->gui_interval->currentItem()); - + +#if 0 if (gp->use_dht->isChecked() && gp->dht_port->value() == Settings::udpTrackerPort()) { QString msg = i18n("The DHT port needs to be different then the UDP tracker port !"); @@ -255,6 +260,7 @@ Settings::setDhtSupport(gp->use_dht->isChecked()); Settings::setDhtPort(gp->dht_port->value()); +#endif Settings::setUseEncryption(gp->use_encryption->isChecked()); Settings::setAllowUnencryptedConnections(gp->allow_unencrypted->isChecked()); return true; @@ -278,7 +284,9 @@ void PrefPageTwo::dhtChecked(bool on) { +#if 0 gp->dht_port->setEnabled(on); +#endif } void PrefPageTwo::updateData() @@ -318,11 +326,11 @@ gp->mem_usage->setCurrentItem(Settings::memoryUsage()); gp->gui_interval->setCurrentItem(Settings::guiUpdateInterval()); - +#if 0 gp->use_dht->setChecked(Settings::dhtSupport()); gp->dht_port->setValue(Settings::dhtPort()); gp->dht_port->setEnabled(Settings::dhtSupport()); - +#endif gp->use_encryption->setChecked(Settings::useEncryption()); gp->allow_unencrypted->setChecked(Settings::allowUnencryptedConnections()); gp->allow_unencrypted->setEnabled(Settings::useEncryption()); ++++++ ktorrent-fix-columns_save_restore_ktorrentview.diff ++++++ --- /var/tmp/diff_new_pack.jA73Qx/_old 2006-05-25 00:42:29.000000000 +0200 +++ /var/tmp/diff_new_pack.jA73Qx/_new 2006-05-25 00:42:29.000000000 +0200 @@ -1,16 +1,6 @@ -2005-12-15 Danny Kukawka <danny.kukawka@web.de> - - * apps/ktorrent/ktorrentview.cpp: fixed prevent automatically - resize and enable change the columns in the main transfer listview. - - * apps/ktorrent/ktorrent.cpp: call destructor of m_view to store - the layout also if exit via menu. - -Index: apps/ktorrent/ktorrent.cpp -=================================================================== ---- apps/ktorrent/ktorrent.cpp (Revision 488727) -+++ apps/ktorrent/ktorrent.cpp (Arbeitskopie) -@@ -175,6 +175,7 @@ +--- apps/ktorrent/ktorrent.cpp ++++ apps/ktorrent/ktorrent.cpp 2006/05/20 11:14:20 +@@ -248,6 +248,7 @@ delete m_statusInfo; delete m_statusTransfer; delete m_statusSpeed; @@ -18,19 +8,16 @@ } void KTorrent::addTabPage(QWidget* page,const QIconSet & icon,const QString & caption) ---- apps/ktorrent/ktorrentview.cpp 2006/01/17 21:03:28 1.1 -+++ apps/ktorrent/ktorrentview.cpp 2006/01/17 21:06:55 -@@ -87,10 +87,12 @@ +--- apps/ktorrent/ktorrentview.cpp ++++ apps/ktorrent/ktorrentview.cpp 2006/05/20 11:15:07 +@@ -93,8 +93,10 @@ setShowSortIndicator(true); setAcceptDrops(true); - + setSelectionMode(QListView::Extended); + setResizeMode(QListView::NoColumn); - for (Uint32 i = 2;i < columns();i++) + for (Uint32 i = 2;i < (Uint32)columns();i++) setColumnWidthMode(i,QListView::Manual); -- + setAllColumnsShowFocus(true); - restoreLayout(KGlobal::config(),"KTorrentView"); -+ - } - KTorrentView::~KTorrentView() + restoreLayout(KGlobal::config(),m_seedView ? "KTorrentSeedView" : "KTorrentView"); + } ++++++ remove-links.diff ++++++ --- /var/tmp/diff_new_pack.jA73Qx/_old 2006-05-25 00:42:29.000000000 +0200 +++ /var/tmp/diff_new_pack.jA73Qx/_new 2006-05-25 00:42:29.000000000 +0200 @@ -1,7 +1,7 @@ ---- plugins/search/searchprefpage.cpp 2006/01/02 10:23:08 1.1 -+++ plugins/search/searchprefpage.cpp 2006/01/02 10:24:40 -@@ -150,7 +150,7 @@ - QListViewItem* se = new QListViewItem(m_engines, "bittorrent.com", "http://search.bittorrent.com/search.jsp?query=FOOBAR"); +--- plugins/search/searchprefpage.cpp ++++ plugins/search/searchprefpage.cpp 2006/05/20 11:12:23 +@@ -158,7 +158,7 @@ + se = new QListViewItem(m_engines, "bittorrent.com", "http://search.bittorrent.com/search.jsp?query=FOOBAR"); m_items.append(se); m_engines->insertItem(se); - @@ -9,25 +9,25 @@ se = new QListViewItem(m_engines, "isohunt.com", "http://isohunt.com/torrents.php?ihq=FOOBAR&op=and"); m_items.append(se); m_engines->insertItem(se); -@@ -178,6 +178,7 @@ - se = new QListViewItem(m_engines, "torrentz.com", "http://www.torrentz.com/s.php?q=FOOBAR"); +@@ -186,6 +186,7 @@ + se = new QListViewItem(m_engines, "torrentz.com", "http://www.torrentz.com/search_FOOBAR"); m_items.append(se); m_engines->insertItem(se); +#endif } void SearchPrefPageWidget::removeAllClicked() ---- plugins/search/searchwidget.cpp 2006/01/02 10:23:08 1.1 -+++ plugins/search/searchwidget.cpp 2006/01/02 10:25:54 -@@ -205,6 +205,7 @@ - out << "# PLEASE DO NOT MODIFY THIS FILE. Use KTorrent configuration dialog for adding new search engines." << ::endl; +--- plugins/search/searchwidget.cpp ++++ plugins/search/searchwidget.cpp 2006/05/20 11:12:50 +@@ -207,6 +207,7 @@ out << "# SEARCH ENGINES list" << ::endl; - out << "bittorrent.com http://search.bittorrent.com/search.jsp?query=FOOBAR" << ::endl; + out << "KTorrents http://www.ktorrents.com/search.php?lg=0&sourceid=ktorrent&q=FOOBAR&f=0" << ::endl; + out << "bittorrent.com http://www.bittorrent.com/search_result.myt?search=FOOBAR" << ::endl; +#if 0 out << "isohunt.com http://isohunt.com/torrents.php?ihq=FOOBAR&op=and" << ::endl; out << "mininova.org http://www.mininova.org/search.php?search=FOOBAR" << ::endl; out << "thepiratebay.org http://thepiratebay.org/search.php?q=FOOBAR" << ::endl; -@@ -212,6 +213,7 @@ +@@ -214,6 +215,7 @@ out << "bytenova.org http://www.bitenova.org/search.php?search=FOOBAR&start=0&start=0&ie=utf-8&oe=utf-8" << ::endl; out << "torrentspy.com http://torrentspy.com/search.asp?query=FOOBAR" << ::endl; out << "torrentz.com http://www.torrentz.com/search_FOOBAR" << ::endl; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...
participants (1)
-
root@suse.de