rev 10459 - in kde-extras/ktorrent/libbtcore/debian: . patches

Modestas Vainius modax-guest at alioth.debian.org
Sat May 3 20:07:23 UTC 2008


Author: modax-guest
Date: 2008-05-03 20:07:23 +0000 (Sat, 03 May 2008)
New Revision: 10459

Modified:
   kde-extras/ktorrent/libbtcore/debian/changelog
   kde-extras/ktorrent/libbtcore/debian/patches/01_libbtcore_export.diff
   kde-extras/ktorrent/libbtcore/debian/patches/97_fix_link_interface_libraries.diff
Log:
Fix crashes when DHT support is disabled when building.

Modified: kde-extras/ktorrent/libbtcore/debian/changelog
===================================================================
--- kde-extras/ktorrent/libbtcore/debian/changelog	2008-05-03 17:57:03 UTC (rev 10458)
+++ kde-extras/ktorrent/libbtcore/debian/changelog	2008-05-03 20:07:23 UTC (rev 10459)
@@ -1,3 +1,12 @@
+libbtcore (3.1~beta1-2) experimental; urgency=low
+
+  [ Modestas Vainius ]
+  * libbtcore was not designed for building without DHT support (with actual
+    code skipped. So remove some portions of 01 patch which caused crashes
+    when built without DHT support.
+
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sat, 03 May 2008 23:04:26 +0300
+
 libbtcore (3.1~beta1-1) experimental; urgency=low
 
   +++ Changes by Modestas Vainius:

Modified: kde-extras/ktorrent/libbtcore/debian/patches/01_libbtcore_export.diff
===================================================================
--- kde-extras/ktorrent/libbtcore/debian/patches/01_libbtcore_export.diff	2008-05-03 17:57:03 UTC (rev 10458)
+++ kde-extras/ktorrent/libbtcore/debian/patches/01_libbtcore_export.diff	2008-05-03 20:07:23 UTC (rev 10459)
@@ -46,57 +46,6 @@
  
  include_directories(${CMAKE_CURRENT_BINARY_DIR})
  include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-@@ -122,23 +155,6 @@
- 	torrent/torrentcontrol.cpp
- 	torrent/torrentcreator.cpp
- 
--	dht/announcetask.cpp  
--	dht/dht.cpp                
--	dht/kclosestnodessearch.cpp  
--	dht/nodelookup.cpp  
--	dht/rpcmsg.cpp     
--	dht/taskmanager.cpp
--	dht/database.cpp      
--	dht/dhttrackerbackend.cpp  
--	dht/key.cpp                  
--	dht/pack.cpp        
--	dht/rpcserver.cpp
--	dht/dhtbase.cpp       
--	dht/kbucket.cpp            
--	dht/node.cpp                 
--	dht/rpccall.cpp     
--	dht/task.cpp
--
- 	diskio/cache.cpp      
- 	diskio/chunk.cpp         
- 	diskio/dndfile.cpp         
-@@ -167,6 +183,26 @@
- 	btversion.cpp
- )
- 
-+if (ENABLE_DHT_SUPPORT)
-+  set(libbtcore_SRC ${libbtcore_SRC}
-+	dht/announcetask.cpp
-+	dht/dht.cpp
-+	dht/kclosestnodessearch.cpp
-+	dht/nodelookup.cpp
-+	dht/rpcmsg.cpp
-+	dht/taskmanager.cpp
-+	dht/database.cpp
-+	dht/dhttrackerbackend.cpp
-+	dht/key.cpp
-+	dht/pack.cpp
-+	dht/rpcserver.cpp
-+	dht/dhtbase.cpp
-+	dht/kbucket.cpp
-+	dht/node.cpp
-+	dht/rpccall.cpp
-+	dht/task.cpp
-+  )
-+endif (ENABLE_DHT_SUPPORT)
- 
- # kde4_add_ui_files(libbtcore_SRC ${libbtcore_UI})
- # kde4_add_kcfg_files(libbtcore_SRC settings.kcfgc)
 @@ -259,11 +295,13 @@
  	./download/piece.h
  	./download/packet.h
@@ -154,40 +103,6 @@
      endif(NOT BTCORE_FIND_QUIETLY)
    else(BTCORE_FOUND)
      if(BTCORE_FIND_REQUIRED)
---- libbtcore-3.1~beta1.orig/torrent/peersourcemanager.cpp
-+++ libbtcore-3.1~beta1/torrent/peersourcemanager.cpp
-@@ -618,6 +618,7 @@
- 	
- 	void PeerSourceManager::addDHT()
- 	{
-+#ifdef ENABLE_DHT_SUPPORT
- 		if(m_dht)
- 		{
- 			removePeerSource(m_dht);
-@@ -628,6 +629,9 @@
- 		
- 		// add the DHT source
- 		addPeerSource(m_dht);
-+#else
-+		m_dht = 0;
-+#endif
- 	}
- 
- 	void PeerSourceManager::removeDHT()
---- libbtcore-3.1~beta1.orig/torrent/globals.cpp
-+++ libbtcore-3.1~beta1/torrent/globals.cpp
-@@ -33,7 +33,11 @@
- 	{
- 		plist = new net::PortList();
- 		server = 0;
-+#ifdef ENABLE_DHT_SUPPORT
- 		dh_table = new dht::DHT();
-+#else
-+		dh_table = 0;
-+#endif
- 	}
- 
- 	Globals::~ Globals()
 --- libbtcore-3.1~beta1.orig/config-btcore.h.cmake
 +++ libbtcore-3.1~beta1/config-btcore.h.cmake
 @@ -1,5 +1,5 @@

Modified: kde-extras/ktorrent/libbtcore/debian/patches/97_fix_link_interface_libraries.diff
===================================================================
--- kde-extras/ktorrent/libbtcore/debian/patches/97_fix_link_interface_libraries.diff	2008-05-03 17:57:03 UTC (rev 10458)
+++ kde-extras/ktorrent/libbtcore/debian/patches/97_fix_link_interface_libraries.diff	2008-05-03 20:07:23 UTC (rev 10459)
@@ -1,6 +1,6 @@
 --- libbtcore-3.1~beta1.orig/CMakeLists.txt
 +++ libbtcore-3.1~beta1/CMakeLists.txt
-@@ -208,7 +208,7 @@
+@@ -205,7 +205,7 @@
  # kde4_add_kcfg_files(libbtcore_SRC settings.kcfgc)
  kde4_add_library(btcore SHARED ${libbtcore_SRC})
  




More information about the pkg-kde-commits mailing list