diff --git a/disable-DHT.diff b/disable-DHT.diff index 2e365af..eb7c11f 100644 --- a/disable-DHT.diff +++ b/disable-DHT.diff @@ -35,51 +35,53 @@ 4 ---- 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()); +--- apps/ktorrent/pref.cpp 2007/06/18 11:48:38 1.1 ++++ apps/ktorrent/pref.cpp 2007/06/18 11:50:55 +@@ -173,14 +173,14 @@ Settings::setNumUploadSlots(dp->num_upload_slots->value()); + Settings::setMinDiskSpace(dp->intMinDiskSpace->value()); + Settings::setMaxSeedTime(dp->max_seed_time->value()); +- +#if 0 if (Settings::dhtSupport() && dp->udp_tracker_port->value() == Settings::dhtPort()) { QString msg = i18n("The DHT port needs to be different from the UDP tracker port!"); - KMessageBox::error(0,msg,i18n("Error")); + 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 ))); +@@ -228,8 +228,10 @@ + updateData(); + 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 ))); + connect(gp->use_dht, SIGNAL(toggled(bool)), + this, SLOT(dhtChecked(bool))); +#endif - connect(gp->use_encryption,SIGNAL(toggled(bool)), - this,SLOT(useEncryptionChecked( bool ))); + connect(gp->use_encryption, SIGNAL(toggled(bool)), + this, SLOT(useEncryptionChecked(bool))); } -@@ -258,6 +262,7 @@ - - - +@@ -289,6 +291,7 @@ + + + +#if 0 if (gp->use_dht->isChecked() && gp->dht_port->value() == Settings::udpTrackerPort()) { QString msg = i18n("The DHT port needs to be different from the UDP tracker port!"); -@@ -255,6 +260,7 @@ - +@@ -299,6 +302,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,8 +284,10 @@ +@@ -322,8 +326,10 @@ void GeneralPrefPage::dhtChecked(bool on) { @@ -89,21 +91,22 @@ +#endif } - void PrefPageTwo::updateData() -@@ -333,10 +341,13 @@ + void GeneralPrefPage::updateData() +@@ -388,12 +394,12 @@ + gp->custom_ip_check->setChecked(useExternalIP); gp->custom_ip->setEnabled(useExternalIP); gp->custom_ip_label->setEnabled(useExternalIP); - -+ gp->groupBox4->hide(); +- +#if 0 gp->use_dht->setChecked(Settings::dhtSupport()); gp->dht_port->setValue(Settings::dhtPort()); gp->dht_port->setEnabled(Settings::dhtSupport()); gp->dht_port_label->setEnabled(Settings::dhtSupport()); +- +#endif - gp->use_encryption->setChecked(Settings::useEncryption()); gp->allow_unencrypted->setChecked(Settings::allowUnencryptedConnections()); + gp->allow_unencrypted->setEnabled(Settings::useEncryption()); --- plugins/webinterface/php_interface.cpp 2007/03/06 09:40:49 1.1 +++ plugins/webinterface/php_interface.cpp 2007/03/06 09:42:44 @@ -130,7 +130,7 @@ @@ -115,7 +118,7 @@ ret.append(QString("\"use_encryption\" => \"%1\"").arg(Settings::useEncryption())); ret.append(");\n}\n"); -@@ -155,32 +155,6 @@ +@@ -156,35 +156,6 @@ switch(it.key()[0]) { case 'd': @@ -134,15 +137,18 @@ - if (Settings::dhtSupport() && !ht.isRunning()) - { - ht.start(kt::DataDir() + "dht_table",Settings::dhtPort()); +- ret = true; - } - else if (!Settings::dhtSupport() && ht.isRunning()) - { - ht.stop(); +- ret = true; - } - else if (Settings::dhtSupport() && ht.getPort() != Settings::dhtPort()) - { - ht.stop(); - ht.start(kt::DataDir() + "dht_table",Settings::dhtPort()); +- ret = true; - } - } break; diff --git a/ktorrent-2.1.4.tar.gz b/ktorrent-2.1.4.tar.gz deleted file mode 100644 index 2909019..0000000 --- a/ktorrent-2.1.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d492f75801c180202e99ca9c9cdff0b54e2f5d8e4ae2dddccbf1aac218276c48 -size 3631999 diff --git a/ktorrent-2.2rc1.tar.gz b/ktorrent-2.2rc1.tar.gz new file mode 100644 index 0000000..7234230 --- /dev/null +++ b/ktorrent-2.2rc1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e5e471ab0f771931dbc5c6cd4fb4b0632e459b543b93b017fdb33b91fdf634a8 +size 3642882 diff --git a/ktorrent-fix-columns.diff b/ktorrent-fix-columns.diff index 9d0b4f9..24e5774 100644 --- a/ktorrent-fix-columns.diff +++ b/ktorrent-fix-columns.diff @@ -5,20 +5,6 @@ plugins/infowidget/chunkdownloadview.cpp: Added focus to all collums in the ListView objects. -Index: plugins/infowidget/infowidgetbase.ui -=================================================================== ---- plugins/infowidget/infowidgetbase.ui (Revision 483953) -+++ plugins/infowidget/infowidgetbase.ui (Arbeitskopie) -@@ -692,6 +692,9 @@ - 32767 - - -+ -+ true -+ - - - Index: plugins/infowidget/peerview.cpp =================================================================== --- plugins/infowidget/peerview.cpp (Revision 483953) diff --git a/ktorrent-fix-compiler_warning.diff b/ktorrent-fix-compiler_warning.diff deleted file mode 100644 index a85c357..0000000 --- a/ktorrent-fix-compiler_warning.diff +++ /dev/null @@ -1,27 +0,0 @@ -Index: libktorrent/util/mmapfile.cpp -=================================================================== ---- libktorrent/util/mmapfile.cpp (Revision 494561) -+++ libktorrent/util/mmapfile.cpp (Arbeitskopie) -@@ -164,6 +164,7 @@ - - void MMapFile::growFile(Uint64 new_size) - { -+ Uint32 written; - Out() << "Growing file to " << new_size << " bytes " << endl; - Uint64 to_write = new_size - file_size; - // jump to the end of the file -@@ -176,12 +177,12 @@ - { - if (to_write < 1024) - { -- ::write(fd,buf,to_write); -+ written = ::write(fd,buf,to_write); - to_write = 0; - } - else - { -- ::write(fd,buf,1024); -+ written = ::write(fd,buf,1024); - to_write -= 1024; - } - } diff --git a/ktorrent.changes b/ktorrent.changes index 5b03534..b7b99be 100644 --- a/ktorrent.changes +++ b/ktorrent.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Sun Jun 17 11:55:08 CEST 2007 - stbinner@suse.de + +- update to 2.2rc1: + * Improved and more consistant GUI + * Possibility to open as many views as needed. By default you now + get a downloads and uploads tab + * Improved search plugin with possibility to open multiple search tabs + * Option to fully preallocate diskspace to avoid fragmentation + * Option to move finished downloads to a different directory + * Progress bar in status bar when searching + * Redesigned file selection dialog + * Option to copy torrent files to user specified directory + * Speed limits for individual torrents + * Diskspace monitoring, with option to stop torrents when diskspace + is running low + * Improved system tray popup + * Autorotation of the log file when it gets larger then 10 MB + * Import dialog is now network transparent for the torrent file + * Statistics plugin which was developed by Krzysztof Kundzicz + ------------------------------------------------------------------- Mon Jun 4 10:57:58 CEST 2007 - stbinner@suse.de diff --git a/ktorrent.spec b/ktorrent.spec index 2c05469..e42b8ae 100644 --- a/ktorrent.spec +++ b/ktorrent.spec @@ -1,5 +1,5 @@ # -# spec file for package ktorrent (Version 2.1.4) +# spec file for package ktorrent (Version 2.2rc1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,20 +11,19 @@ # norootforbuild Name: ktorrent -BuildRequires: -cracklib-dict-full gmp-devel kdelibs3-devel +BuildRequires: gmp-devel kdelibs3-devel URL: http://ktorrent.pwsp.net/ License: GNU General Public License (GPL) Group: Productivity/Networking/Other Summary: KDE BitTorrent Client -Version: 2.1.4 -Release: 22 +Version: 2.2rc1 +Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define rversion %{version} Source: %{name}-%{rversion}.tar.gz Patch2: remove-links.diff Patch4: no-geoip-db.diff Patch10: ktorrent-fix-columns.diff -Patch15: ktorrent-fix-compiler_warning.diff Patch16: disable-DHT.diff %if %suse_version > 1020 Requires: %{name}-lang = %{version} @@ -53,7 +52,6 @@ Authors: %patch2 -p1 %patch4 -p1 %patch10 -%patch15 %patch16 . /etc/opt/kde3/common_options update_admin @@ -111,6 +109,24 @@ make DESTDIR=$RPM_BUILD_ROOT install /opt/kde3/share/servicetypes/*.desktop %changelog +* Sun Jun 17 2007 - stbinner@suse.de +- update to 2.2rc1: + * Improved and more consistant GUI + * Possibility to open as many views as needed. By default you now + get a downloads and uploads tab + * Improved search plugin with possibility to open multiple search tabs + * Option to fully preallocate diskspace to avoid fragmentation + * Option to move finished downloads to a different directory + * Progress bar in status bar when searching + * Redesigned file selection dialog + * Option to copy torrent files to user specified directory + * Speed limits for individual torrents + * Diskspace monitoring, with option to stop torrents when diskspace + is running low + * Improved system tray popup + * Autorotation of the log file when it gets larger then 10 MB + * Import dialog is now network transparent for the torrent file + * Statistics plugin which was developed by Krzysztof Kundzicz * Mon Jun 04 2007 - stbinner@suse.de - fix build on older distributions * Sun May 20 2007 - stbinner@suse.de