commit ktorrent for openSUSE:Factory

25 Nov 2009

Hello community,

here is the log from the commit of package ktorrent for openSUSE:Factory
checked in at Wed Nov 25 15:21:35 CET 2009.



--------

--- KDE/ktorrent/ktorrent.changes	2009-11-12 00:55:37.000000000 +0100
+++ /mounts/work_src_done/STABLE/ktorrent/ktorrent.changes	2009-11-25 10:16:54.000000000 +0100
@@ -1,0 +2,12 @@
+Wed Nov 25 09:16:18 UTC 2009 - wstephenson@novell.com
+
+- Re-enable DHT following legal advice, with warning popup
+
+-------------------------------------------------------------------
+Wed Nov 25 08:33:35 UTC 2009 - beineri@opensuse.org
+
+- update to 3.3.1: several crash and memory leaks fixes. Bandwidth
+  schedulers user interaction has been improved, and some other
+  minor issues have also been fixed.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  ktorrent-3.3.tar.bz2

New:
----
  ktorrent-3.3.1.tar.bz2
  suse-dht-warning.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ktorrent.spec ++++++
--- /var/tmp/diff_new_pack.i9aRXT/_old	2009-11-25 15:20:48.000000000 +0100
+++ /var/tmp/diff_new_pack.i9aRXT/_new	2009-11-25 15:20:48.000000000 +0100
@@ -1,5 +1,5 @@
 #
-# spec file for package ktorrent (Version 3.3)
+# spec file for package ktorrent (Version 3.3.1)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -26,7 +26,7 @@
 License:        GPL v2 or later
 Group:          Productivity/Networking/File-Sharing
 Summary:        KDE BitTorrent Client
-Version:        3.3
+Version:        3.3.1
 Release:        1
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define rversion %version
@@ -34,9 +34,8 @@
 Source2:        icons.tar.bz2
 Patch1:         remove-links.diff
 Patch3:         proxy.diff
-%if %suse_version > 1020
+Patch4:         suse-dht-warning.diff
 Requires:       %{name}-lang = %{version}
-%endif
 %kde4_runtime_requires
 Requires:       oxygen-icon-theme
 
@@ -77,10 +76,13 @@
 %setup -q -n %name-%{rversion}
 %patch1
 %patch3
+%if ! 0%{?packman_bs}
+%patch4
+%endif
 tar xfj %{SOURCE2}
 
 %build
-  %cmake_kde4 -d build -- -DENABLE_DHT_SUPPORT=false
+  %cmake_kde4 -d build -- -DENABLE_DHT_SUPPORT=true
   %make_jobs
 
 %install

++++++ ktorrent-3.3.tar.bz2 -> ktorrent-3.3.1.tar.bz2 ++++++
++++ 113812 lines of diff (skipped)

++++++ suse-dht-warning.diff ++++++
Index: ktorrent/gui.cpp
===================================================================
--- ktorrent/gui.cpp	(revision 1053967)
+++ ktorrent/gui.cpp	(working copy)
@@ -38,6 +38,7 @@
 #include <kpushbutton.h>
 #include <kxmlguifactory.h>
 #include <KNotifyConfigWidget>
+#include <KTipDialog>
 #include <kio/jobclasses.h>
 #include <kio/jobuidelegate.h>
 
@@ -115,6 +116,8 @@
 		//markk.update();
 		updateActions();
 		core->startUpdateTimer();
+
+		QTimer::singleShot(0, this, SLOT(showDhtTip()));
 	}
 
 	GUI:: ~GUI()
@@ -601,6 +604,11 @@
 	{
 		return torrent_activity;
 	}
+
+    void GUI::showDhtTip()
+    {
+        KTipDialog::showTip(this, "ktorrent/dhttip");
+    }
 }
 
 #include "gui.moc"
Index: ktorrent/dhttip
===================================================================
--- ktorrent/dhttip	(revision 0)
+++ ktorrent/dhttip	(revision 0)
@@ -0,0 +1,11 @@
+<tip category="Ktorrent">
+<html>
+<p>
+Please respect the rights of copyright holders.
+</p>
+<p>
+Free Software also depends upon the principle of copyright.
+</p>
+</html>
+</tip>
+
Index: ktorrent/gui.h
===================================================================
--- ktorrent/gui.h	(revision 1053967)
+++ ktorrent/gui.h	(working copy)
@@ -121,6 +121,7 @@
 		void applySettings();
 		void showOrHide();
 		void configureNotifications();
+		void showDhtTip();
 		
 	private:
 		void setupActions();
Index: ktorrent/CMakeLists.txt
===================================================================
--- ktorrent/CMakeLists.txt	(revision 1053967)
+++ ktorrent/CMakeLists.txt	(working copy)
@@ -78,5 +78,6 @@
 install(FILES ktorrentplugin.desktop  DESTINATION  ${SERVICETYPES_INSTALL_DIR} )
 install(FILES ktorrentui.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)

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠Hilbert.suse.de

tags

participants (1)