Hello community, here is the log from the commit of package kde3-ktorrent for openSUSE:Factory checked in at Thu Sep 22 11:44:14 CEST 2011.
-------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/kde3-ktorrent/kde3-ktorrent.changes 2011-09-22 00:09:00.000000000 +0200 @@ -0,0 +1,298 @@ +------------------------------------------------------------------- +Fri Dec 4 17:34:55 IRKT 2009 - highwaystar...@gmail.com + +- rename to kde3-ktorrent +- update to last kde3 version - 2.2.8 +- remove patches that now upstream +- fixed some rpmlint warnings + +------------------------------------------------------------------- +Mon Nov 10 15:00:25 CET 2008 - stbin...@suse.de + +- fix security issues in the webinterface plugin (bnc#439471) + +------------------------------------------------------------------- +Sun Aug 19 18:30:53 CEST 2007 - stbin...@suse.de + +- fix build on 10.0 + +------------------------------------------------------------------- +Tue Aug 14 09:31:59 CEST 2007 - stbin...@suse.de + +- add improved Hungarian translation (#295663) + +------------------------------------------------------------------- +Tue Jul 24 10:51:45 CEST 2007 - bvir...@suse.de + +- update to 2.2.1 + * Fix file selection bug + * Fix several webgui bugs + * Make sure plugin list is sorted on the plugin name + * Fix bug with UPnP plugin not releasing ports when KT is shutdown + +------------------------------------------------------------------- +Wed Jul 4 11:15:14 CEST 2007 - stbin...@suse.de + +- update to final 2.2 release + +------------------------------------------------------------------- +Thu Jun 21 11:19:41 CEST 2007 - stbin...@suse.de + +- run fdupes and kde_post_install, fix invalid .desktop file + +------------------------------------------------------------------- +Sun Jun 17 11:55:08 CEST 2007 - stbin...@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 - stbin...@suse.de + +- fix build on older distributions + +------------------------------------------------------------------- +Sun May 20 16:47:28 CEST 2007 - stbin...@suse.de + +- fix package requires + +------------------------------------------------------------------- +Mon May 14 17:37:05 CEST 2007 - co...@suse.de + +- split translations into special package + +------------------------------------------------------------------- +Tue Apr 24 09:45:44 CEST 2007 - stbin...@suse.de + +- update to 2.1.4: + * Fixed crash in parsing of DHT messages + * Fixed problem with files with .. in their name + * ScanFolder can now handle incomplete torrent files properly + +------------------------------------------------------------------- +Tue Apr 3 01:23:15 CEST 2007 - dmuel...@suse.de + +- update to 2.1.3: + * really fix file overwriting vulnerability + * crash fix + +------------------------------------------------------------------- +Sat Mar 10 15:15:55 CET 2007 - dmuel...@suse.de + +- update to 2.1.2: + * file overwriting vulnerability + * chunk id overflow vulnerability + +------------------------------------------------------------------- +Tue Mar 6 10:39:55 CET 2007 - stbin...@suse.de + +- update to version 2.1.1: + * Rewrite of webserver + * New webgui : coldmilk + * Networking thread has been split up in 2 threads, one for + upload, one for download + * Significant speed improvements when downloading over a LAN + +------------------------------------------------------------------- +Fri Feb 9 12:21:30 CET 2007 - stbin...@suse.de + +- port and re-enable patch 16 + +------------------------------------------------------------------- +Mon Feb 5 20:55:04 CET 2007 - stbin...@suse.de + +- update to version 2.1 release + +------------------------------------------------------------------- +Thu Jan 4 10:38:09 CET 2007 - stbin...@suse.de + +- update to version 2.1rc1: + * Peer Exchange (µTorrent compatible) + * Zeroconf plugin + +------------------------------------------------------------------- +Sat Nov 25 21:58:08 CET 2006 - wstephen...@suse.de + +- update to version 2.1beta1 + * Switched the GUI to an IDEAl style GUI (like KDevelop) + * WebGUI plugin + * RSS plugin + * Improvements in down and upload performance + * Grouping feature to put torrents into groups + * Improved search plugin, which now allows multiple searches + * Many bug fixes + +------------------------------------------------------------------- +Tue Oct 17 11:58:08 CEST 2006 - dmuel...@suse.de + +- remove geoIP database due to license issues (#188562) + +------------------------------------------------------------------- +Mon Oct 16 12:09:07 CEST 2006 - dmuel...@suse.de + +- fix build on PPC + +------------------------------------------------------------------- +Tue Oct 10 21:13:45 CEST 2006 - stbin...@suse.de + +- update to version 2.0.3 + - fixes some download speed issues + - fixes several other minor bugs + +------------------------------------------------------------------- +Wed Aug 30 19:17:19 CEST 2006 - stbin...@suse.de + +- update to version 2.0.2 + - fixes a data corruption bug + - should get the downloading working properly again + +------------------------------------------------------------------- +Mon Aug 21 22:02:10 CEST 2006 - stbin...@suse.de + +- update to version 2.0.1 + - fixes several bugs + - features some performance improvements + +------------------------------------------------------------------- +Wed Aug 9 02:48:29 CEST 2006 - stbin...@suse.de + +- update to version 2.0 (no changelog provided) + - bugfixes + - translation updates + +------------------------------------------------------------------- +Wed Jul 19 09:27:59 CEST 2006 - stbin...@suse.de + +- update to version 2.0rc1 + * bugfixes and polishing + +------------------------------------------------------------------- +Tue Jun 6 13:30:26 CEST 2006 - stbin...@suse.de + +- don't install with kdelibs conflicting x-bittorrent.desktop + +------------------------------------------------------------------- +Tue May 23 17:28:15 CEST 2006 - adr...@suse.de + +- update to version 2.0beta1 + * Speed improvements + * Protocol encryption + * Bandwith scheduling + * File prioritization for multifile torrents + * Directory scanner for torrent files ++++ 101 more lines (skipped) ++++ between /dev/null ++++ and /mounts/work_src_done/STABLE/kde3-ktorrent/kde3-ktorrent.changes calling whatdependson for head-i586 New: ---- disable-DHT.diff kde3-ktorrent.changes kde3-ktorrent.spec ktorrent-2.2.8.tar.bz2 no-geoip-db.diff remove-links.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde3-ktorrent.spec ++++++ # # spec file for package ktorrent (Version 2.2.8) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: kde3-ktorrent BuildRequires: gmp-devel kdelibs3-devel BuildRequires: fdupes Url: http://ktorrent.pwsp.net/ License: GPL-2.0+ Group: Productivity/Networking/File-Sharing Summary: KDE BitTorrent Client Version: 2.2.8 Release: 32.1 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define rversion 2.2.8 Source: ktorrent-%{rversion}.tar.bz2 Patch2: remove-links.diff Patch4: no-geoip-db.diff Patch16: disable-DHT.diff Requires: %{name}-lang = %{version} %description Torrent is a BitTorrent program for KDE3. Its main features are: * Download of torrent files * Upload speed capping, seeing that most people cannot upload infinite amounts of data * Internet searching using the BitTorrent Web site's search engine * UDP trackers Authors: -------- Jois Guisson <jrois.guis...@gmail.com> %lang_package %prep %setup -q -n ktorrent-%{rversion} %patch2 -p1 %patch4 -p1 %patch16 . /etc/opt/kde3/common_options update_admin %build export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fstack-protector" . /etc/opt/kde3/common_options ./configure $configkde do_make %{?jobs:-j %jobs} %install . /etc/opt/kde3/common_options make DESTDIR=$RPM_BUILD_ROOT install %suse_update_desktop_file ktorrent Network FileTransfer %fdupes -s $RPM_BUILD_ROOT kde_post_install %find_lang ktorrent %pre -p /sbin/ldconfig %post -p /sbin/ldconfig %files lang -f ktorrent.lang %defattr(-,root,root) %dir /opt/kde3/share/locale/br %dir /opt/kde3/share/locale/br/LC_MESSAGES %dir /opt/kde3/share/locale/fa %dir /opt/kde3/share/locale/fa/LC_MESSAGES %dir /opt/kde3/share/locale/ka %dir /opt/kde3/share/locale/ka/LC_MESSAGES %dir /opt/kde3/share/locale/nds %dir /opt/kde3/share/locale/nds/LC_MESSAGES %dir /opt/kde3/share/locale/cy %dir /opt/kde3/share/locale/cy/LC_MESSAGES %dir /opt/kde3/share/locale/ms %dir /opt/kde3/share/locale/ms/LC_MESSAGES %dir /opt/kde3/share/locale/rw %dir /opt/kde3/share/locale/rw/LC_MESSAGES %files %defattr(-,root,root) %dir /opt/kde3/share/icons/hicolor/16x16 %dir /opt/kde3/share/icons/hicolor/32x32 %dir /opt/kde3/share/icons/hicolor/128x128 %dir /opt/kde3/share/icons/hicolor/128x128/apps %dir /opt/kde3/share/icons/hicolor/16x16/apps %dir /opt/kde3/share/icons/hicolor/32x32/apps %dir /opt/kde3/share/icons/hicolor/48x48 %dir /opt/kde3/share/icons/hicolor/48x48/apps %dir /opt/kde3/share/icons/hicolor/64x64 %dir /opt/kde3/share/icons/hicolor/64x64/apps %dir /opt/kde3/share/icons/hicolor/scalable %dir /opt/kde3/share/icons/hicolor/scalable/apps /opt/kde3/bin/* /opt/kde3/share/icons/*/*/*/* /opt/kde3/share/appl*/*/*.desktop /opt/kde3/share/apps/* /opt/kde3/%_lib/kde3/* /opt/kde3/%_lib/libktorrent.* /opt/kde3/%_lib/libktorrent-2.2.8.so /opt/kde3/share/config.kcfg/*.kcfg /opt/kde3/share/services/*.desktop /opt/kde3/share/servicetypes/*.desktop %changelog * Fri Nov 13 2009 - highwaystar...@gmail.com - rename to kde3-ktorrent - update to last kde3 version - 2.2.8 - remove patches that now upstream - fixed some rpmlint warnings * Mon Nov 10 2008 - stbin...@suse.de - fix security issues in the webinterface plugin (bnc#439471) * Sun Aug 19 2007 - stbin...@suse.de - fix build on 10.0 * Tue Aug 14 2007 - stbin...@suse.de - add improved Hungarian translation (#295663) * Tue Jul 24 2007 - bvir...@suse.de - update to 2.2.1 * Fix file selection bug * Fix several webgui bugs * Make sure plugin list is sorted on the plugin name * Fix bug with UPnP plugin not releasing ports when KT is shutdown * Wed Jul 04 2007 - stbin...@suse.de - update to final 2.2 release * Thu Jun 21 2007 - stbin...@suse.de - run fdupes and kde_post_install, fix invalid .desktop file * Sun Jun 17 2007 - stbin...@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 - stbin...@suse.de - fix build on older distributions * Sun May 20 2007 - stbin...@suse.de - fix package requires * Mon May 14 2007 - co...@suse.de - split translations into special package * Tue Apr 24 2007 - stbin...@suse.de - update to 2.1.4: * Fixed crash in parsing of DHT messages * Fixed problem with files with .. in their name * ScanFolder can now handle incomplete torrent files properly * Tue Apr 03 2007 - dmuel...@suse.de - update to 2.1.3: * really fix file overwriting vulnerability * crash fix * Sat Mar 10 2007 - dmuel...@suse.de - update to 2.1.2: * file overwriting vulnerability * chunk id overflow vulnerability * Tue Mar 06 2007 - stbin...@suse.de - update to version 2.1.1: * Rewrite of webserver * New webgui : coldmilk * Networking thread has been split up in 2 threads, one for upload, one for download * Significant speed improvements when downloading over a LAN * Fri Feb 09 2007 - stbin...@suse.de - port and re-enable patch 16 * Mon Feb 05 2007 - stbin...@suse.de - update to version 2.1 release * Thu Jan 04 2007 - stbin...@suse.de - update to version 2.1rc1: * Peer Exchange (µTorrent compatible) * Zeroconf plugin * Sat Nov 25 2006 - wstephen...@suse.de - update to version 2.1beta1 * Switched the GUI to an IDEAl style GUI (like KDevelop) * WebGUI plugin * RSS plugin * Improvements in down and upload performance * Grouping feature to put torrents into groups * Improved search plugin, which now allows multiple searches * Many bug fixes * Tue Oct 17 2006 - dmuel...@suse.de - remove geoIP database due to license issues (#188562) * Mon Oct 16 2006 - dmuel...@suse.de - fix build on PPC * Tue Oct 10 2006 - stbin...@suse.de - update to version 2.0.3 - fixes some download speed issues - fixes several other minor bugs * Wed Aug 30 2006 - stbin...@suse.de - update to version 2.0.2 - fixes a data corruption bug - should get the downloading working properly again * Mon Aug 21 2006 - stbin...@suse.de - update to version 2.0.1 - fixes several bugs - features some performance improvements * Wed Aug 09 2006 - stbin...@suse.de - update to version 2.0 (no changelog provided) - bugfixes - translation updates * Wed Jul 19 2006 - stbin...@suse.de - update to version 2.0rc1 * bugfixes and polishing * Tue Jun 06 2006 - stbin...@suse.de - don't install with kdelibs conflicting x-bittorrent.desktop * Tue May 23 2006 - adr...@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 - dkuka...@suse.de - updated/added upstream commited changes: - ktorrent-fix-german-translation.diff: updated german translation file - ktorrent-fix-i18n-strings.diff: fixed typo in i18n string and merged back to translations * Tue Mar 07 2006 - dkuka...@suse.de - fixed some strings in german translation (related to bug #154683 and upstram changes) * Thu Mar 02 2006 - dkuka...@suse.de - fixed german translation for the plugin settings * Tue Feb 07 2006 - r...@suse.de - fix build for < 10.1 * Wed Feb 01 2006 - stbin...@suse.de - update to 1.2 final * Wed Jan 25 2006 - m...@suse.de - converted neededforbuild to BuildRequires * Tue Jan 17 2006 - stbin...@suse.de - update to 1.2rc2 * Mon Jan 16 2006 - dmuel...@suse.de - use -fstack-protector * Thu Jan 05 2006 - dkuka...@suse.de - added patches: - ktorrent-fix-columns.diff (Added focus to all collums in the ListView objects) - ktorrent-fix-columns_save_restore_ktorrentview.diff (fix store columns settings and enable change wide of columns) - ktorrent-fix-KBytesPerSecToString.diff - ktorrent-fix-keep_seeding.diff (fixed torrentFinished to respect "Keep seeding after download has finished") - ktorrent-fix-remove-unneeded.diff (removed unneeded code) - ktorrent-fix-compiler_warning.diff * Mon Jan 02 2006 - stbin...@suse.de - update to 1.2rc1 (#135481) * Thu Oct 13 2005 - dmuel...@suse.de - update to BRANCH * Tue Oct 11 2005 - dmuel...@suse.de - update 1.1 final * Wed Sep 07 2005 - adr...@suse.de - remove links to some search engine with maybe legal problems * Tue Sep 06 2005 - dmuel...@suse.de - update 1.1rc1 (#104905) * Fri Aug 05 2005 - adr...@suse.de - fix build for released non-PLUS distributions * Fri Jul 22 2005 - adr...@suse.de - fix file list * Fri Jul 22 2005 - adr...@suse.de - create initial package of version 1.0 ++++++ disable-DHT.diff ++++++ diff -ruN ./apps/ktorrent/ktorrent.cpp ../ktorrent-2.2.8-nodht/apps/ktorrent/ktorrent.cpp --- apps/ktorrent/ktorrent.cpp 2008-11-01 23:12:47.000000000 +0800 +++ apps/ktorrent/ktorrent.cpp 2009-11-13 13:37:32.960351598 +0800 @@ -442,6 +442,7 @@ //update QM m_core->getQueueManager()->orderQueue(); + #if 0 dht::DHTBase & ht = Globals::instance().getDHT(); if (Settings::dhtSupport() && !ht.isRunning()) { @@ -457,7 +458,7 @@ ht.stop(); ht.start(kt::DataDir() + "dht_table",kt::DataDir() + "dht_key",Settings::dhtPort()); } - + #endif if (Settings::useEncryption()) { Globals::instance().getServer().enableEncryption(Settings::allowUnencryptedConnections()); diff -ruN ./apps/ktorrent/pref.cpp ../ktorrent-2.2.8-nodht/apps/ktorrent/pref.cpp --- apps/ktorrent/pref.cpp 2008-11-01 23:12:47.000000000 +0800 +++ apps/ktorrent/pref.cpp 2009-11-13 13:42:32.799351144 +0800 @@ -173,13 +173,15 @@ 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")); return false; } + #endif Settings::setUdpTrackerPort(dp->udp_tracker_port->value()); @@ -228,8 +230,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))); + #endif connect(gp->use_encryption, SIGNAL(toggled(bool)), this, SLOT(useEncryptionChecked(bool))); } @@ -289,6 +293,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!"); @@ -299,6 +304,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; @@ -322,8 +328,10 @@ void GeneralPrefPage::dhtChecked(bool on) { +#if 0 gp->dht_port->setEnabled(on); gp->dht_port_label->setEnabled(on); +#endif } void GeneralPrefPage::updateData() @@ -388,12 +396,14 @@ gp->custom_ip_check->setChecked(useExternalIP); gp->custom_ip->setEnabled(useExternalIP); gp->custom_ip_label->setEnabled(useExternalIP); - + +#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()); diff -ruN ./libktorrent/ktorrent.kcfg ../ktorrent-2.2.8-nodht/libktorrent/ktorrent.kcfg --- libktorrent/ktorrent.kcfg 2008-11-01 23:12:33.000000000 +0800 +++ libktorrent/ktorrent.kcfg 2009-11-13 13:38:28.405351838 +0800 @@ -138,16 +138,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>2</default> diff -ruN ./plugins/webinterface/php_interface.cpp ../ktorrent-2.2.8-nodht/plugins/webinterface/php_interface.cpp --- plugins/webinterface/php_interface.cpp 2008-11-01 23:12:03.000000000 +0800 +++ plugins/webinterface/php_interface.cpp 2009-11-13 13:43:46.334351074 +0800 @@ -174,7 +174,7 @@ out << QString("\"max_upload_speed\" => \"%1\",").arg(core->getMaxUploadSpeed()); out << QString("\"max_downloads\" => \"%1\",").arg(Settings::maxDownloads()); out << QString("\"max_seeds\"=> \"%1\",").arg(Settings::maxSeeds()); - out << QString("\"dht_support\" => \"%1\",").arg(Settings::dhtSupport()); + out << QString("\"dht_support\" => \"%1\",").arg(false); out << QString("\"use_encryption\" => \"%1\"").arg(Settings::useEncryption()); out << ");\n}\n"; } @@ -208,35 +208,6 @@ switch(it.key()[0]) { case 'd': - if(it.key()=="dht") - { - if(it.data()=="start") - { - Settings::setDhtSupport(true); - } - else - { - Settings::setDhtSupport(false); - } - - dht::DHTBase & ht = Globals::instance().getDHT(); - if (Settings::dhtSupport() && !ht.isRunning()) - { - ht.start(kt::DataDir() + "dht_table",kt::DataDir() + "dht_key",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",kt::DataDir() + "dht_key",Settings::dhtPort()); - ret = true; - } - } break; case 'e': if(it.key()=="encription") ++++++ no-geoip-db.diff ++++++ diff -u -r ktorrent-2.1beta1.orig/plugins/infowidget/Makefile.am ktorrent-2.1beta1/plugins/infowidget/Makefile.am --- ktorrent-2.1beta1.orig/plugins/infowidget/Makefile.am 2006-11-25 13:49:50.000000000 +0100 +++ ktorrent-2.1beta1/plugins/infowidget/Makefile.am 2006-11-25 14:13:45.000000000 +0100 @@ -27,8 +27,4 @@ kde_services_DATA = ktinfowidgetplugin.desktop kde_kcfg_DATA = ktinfowidgetplugin.kcfg - -ktdatadir = $(kde_datadir)/ktorrent/geoip - -SUBDIRS = geoip KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff -u -r ktorrent-2.1beta1.orig/plugins/infowidget/peerview.cpp ktorrent-2.1beta1/plugins/infowidget/peerview.cpp --- ktorrent/plugins/infowidget/peerview.cpp 2007/07/04 09:15:48 1.1 +++ ktorrent/plugins/infowidget/peerview.cpp 2007/07/04 09:17:59 @@ -53,7 +53,7 @@ static QPixmap lock_pix; static FlagDB flagDB(22, 18); static bool yes_no_pix_loaded = false; - static bool geoip_db_exists = true; + static bool geoip_db_exists = false; static QString geoip_data_file; PeerViewItem::PeerViewItem(PeerView* pv,kt::PeerInterface* peer) : KListViewItem(pv),peer(peer) @@ -67,10 +67,10 @@ yes_pix = iload->loadIcon("button_ok",KIcon::Small); no_pix = iload->loadIcon("button_cancel",KIcon::Small); lock_pix = iload->loadIcon("ktencrypted",KIcon::Small); -#ifdef USE_SYSTEM_GEOIP +#if 0 geo_ip = GeoIP_open_type(GEOIP_COUNTRY_EDITION, GEOIP_STANDARD); geoip_db_exists = (geo_ip != NULL); -#else + geoip_db_exists = !locate("data", "ktorrent/geoip/geoip.dat").isNull(); if(geoip_db_exists) { geoip_data_file = "ktorrent/geoip/geoip.dat"; ++++++ remove-links.diff ++++++ diff -r -u ktorrent-2.1beta1.orig/plugins/search/searchenginelist.cpp ktorrent-2.1beta1/plugins/search/searchenginelist.cpp --- ktorrent-2.1beta1.orig/plugins/search/searchenginelist.cpp 2006-11-25 13:49:50.000000000 +0100 +++ ktorrent-2.1beta1/plugins/search/searchenginelist.cpp 2006-11-25 13:54:01.000000000 +0100 @@ -106,6 +106,7 @@ out << "# SEARCH ENGINES list" << ::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; @@ -113,6 +114,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; +#endif } KURL SearchEngineList::getSearchURL(bt::Uint32 engine) const Only in ktorrent-2.1beta1/plugins/search: searchenginelist.cpp~ diff -r -u ktorrent-2.1beta1.orig/plugins/search/searchprefpage.cpp ktorrent-2.1beta1/plugins/search/searchprefpage.cpp --- ktorrent-2.1beta1.orig/plugins/search/searchprefpage.cpp 2006-11-25 13:49:50.000000000 +0100 +++ ktorrent-2.1beta1/plugins/search/searchprefpage.cpp 2006-11-25 13:53:18.000000000 +0100 @@ -153,7 +153,7 @@ QListViewItem* se = new QListViewItem(m_engines, "KTorrents", "http://www.ktorrents.com/search.php?lg=0&sourceid=ktorrent&q=FOOBAR&f=0";); se = new QListViewItem(m_engines, "bittorrent.com", "http://search.bittorrent.com/search.jsp?query=FOOBAR";); - +#if 0 se = new QListViewItem(m_engines, "isohunt.com", "http://isohunt.com/torrents.php?ihq=FOOBAR&op=and";); se = new QListViewItem(m_engines, "mininova.org", "http://www.mininova.org/search.php?search=FOOBAR";); @@ -167,6 +167,7 @@ se = new QListViewItem(m_engines, "torrentspy.com", "http://torrentspy.com/search.asp?query=FOOBAR";); se = new QListViewItem(m_engines, "torrentz.com", "http://www.torrentz.com/search_FOOBAR";); +#endif } void SearchPrefPageWidget::removeAllClicked() Only in ktorrent-2.1beta1/plugins/search: searchprefpage.cpp~ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
