rev 10461 - in kde-extras/ktorrent/branches/experimental/debian: . patches

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


Author: modax-guest
Date: 2008-05-03 20:37:55 +0000 (Sat, 03 May 2008)
New Revision: 10461

Added:
   kde-extras/ktorrent/branches/experimental/debian/patches/01_support_external_libbtcore.diff
   kde-extras/ktorrent/branches/experimental/debian/patches/02_no_dht_without_dht_headers.diff
   kde-extras/ktorrent/branches/experimental/debian/patches/97_fix_target_link_libraries.diff
Removed:
   kde-extras/ktorrent/branches/experimental/debian/libbtcore-dev.install
   kde-extras/ktorrent/branches/experimental/debian/libbtcore3.install
   kde-extras/ktorrent/branches/experimental/debian/libbtcore3.symbols.amd64
   kde-extras/ktorrent/branches/experimental/debian/patches/01_include_checkinclude_file.diff
Modified:
   kde-extras/ktorrent/branches/experimental/debian/changelog
   kde-extras/ktorrent/branches/experimental/debian/control
   kde-extras/ktorrent/branches/experimental/debian/ktorrent.install
   kde-extras/ktorrent/branches/experimental/debian/patches/series
   kde-extras/ktorrent/branches/experimental/debian/rules
Log:
ktorrent 3.1~beta1 enabling compilation against external libbtcore

Modified: kde-extras/ktorrent/branches/experimental/debian/changelog
===================================================================
--- kde-extras/ktorrent/branches/experimental/debian/changelog	2008-05-03 20:15:34 UTC (rev 10460)
+++ kde-extras/ktorrent/branches/experimental/debian/changelog	2008-05-03 20:37:55 UTC (rev 10461)
@@ -1,26 +1,27 @@
-ktorrent (3.1~~svn798493.dfsg.1-1~pre2) experimental; urgency=low
+ktorrent (3.1~beta1+dfsg.1-1) experimental; urgency=low
 
   [ Modestas Vainius ]
-  * New upstream development snapshot (r798493):
+  * New upstream development release:
     - Highlights:
       * A new media player plugin.
       * Fixes a crash with Qt 4.4 on close.
       * More bug fixes.
-    - The original tarball has never been released upstream. It's a snapshot
-      of KDE subversion repository /trunk/extragear/network/ktorrent with DFSG
-      non-free files removed.
-    - The latest included svn revision is r798493 commited by guisson
-      on 2008-04-18 15:41:44 +0300
-    - The latest translations as of Thu, 17 Apr 2008 21:32:09 +0300 are
-      included in the original tarball.
-  * Add shlibs for libbtcore3 to tighten dependencies on non-amd64.
+    - libbtcore and cmake (BTCore specific) have been moved from the
+      upstream tarball to the source package of their own (libbtcore).
+  * Remove libbtcore specific build depends.
+  * Build depend on libbtcore4-dev. Add 01 patch to enable building against
+    external BTCore library.
   * Improve ktorrent description a bit to bring it more up to date with
-    current features in 3.1dev.
-  * Build-depend on kdelibs5-dev (>= 4:4.0.70).
+    current features in 3.1~beta1.
+  * Build-depend on kdelibs5-dev (>= 4:4.0.72).
   * Build-depend on pkg-config and libstreamanalyzer-dev.
-  * Add 01_include_checkinclude_file.diff to fix FTBFS with cmake 2.6
+  * Add new files to ktorrent.install:
+    - /usr/lib/kde4/ktmediaplayerplugin.so
+    - /usr/share/kde4/services/ktmediaplayerplugin.desktop
+  * ktcore soname was bumped. Update ktorrent.install
+  * Add Vcs fields.
 
- -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sun, 20 Apr 2008 15:00:34 +0300
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sat, 03 May 2008 14:53:18 +0300
 
 ktorrent (3.1~~svn793490.dfsg.1-1) experimental; urgency=low
 

Modified: kde-extras/ktorrent/branches/experimental/debian/control
===================================================================
--- kde-extras/ktorrent/branches/experimental/debian/control	2008-05-03 20:15:34 UTC (rev 10460)
+++ kde-extras/ktorrent/branches/experimental/debian/control	2008-05-03 20:37:55 UTC (rev 10461)
@@ -2,42 +2,16 @@
 Section: kde
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
-Uploaders: Joel Johnson <mrjoel at lixil.net>, Modestas Vainius <modestas at vainius.eu>
+Uploaders: Modestas Vainius <modestas at vainius.eu>
 DM-Upload-Allowed: yes
-Build-Depends: cmake, debhelper (>= 6.0.0), cdbs (>= 0.4.51), quilt, kdelibs5-dev (>= 4:4.0.70), libgmp3-dev, libqca2-dev, libgeoip-dev, libphonon-dev, pkg-config, libstreamanalyzer-dev
+Build-Depends: cmake, debhelper (>= 6.0.0), cdbs (>= 0.4.51), quilt,
+ kdelibs5-dev (>= 4:4.0.72+), libphonon-dev (>= 4:4.0.72), libstreamanalyzer-dev, pkg-config,
+ libbtcore4-dev (>= 3.1~beta1), libgeoip-dev
 Standards-Version: 3.7.3.0
 Homepage: http://ktorrent.org/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-kde/kde-extras/ktorrent/branches/experimental/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/ktorrent/branches/experimental/
 
-Package: libbtcore3
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}
-Description: BitTorrent Client Core Library for C++/Qt4/KDE4
- BitTorrent Client Core Library (libbtcore) is a C++/Qt4/KDE4 based
- implementation of the BitTorrent protocol. In addition, it provides many
- powerful BitTorrent network client features including but not limited to
- torrent downloading and seeding, torrent creation and downloaded data
- verification, advanced peer management, IP blocking lists, HTTP, UDP tracker
- and mainline DHT support.
- .
- This public library is part of KTorrent. It provides core functionality for
- this BitTorrent client.
-
-Package: libbtcore-dev
-Architecture: all
-Section: libdevel
-Depends: libbtcore3 (>= ${source:Version}), libqt4-dev, kdelibs5-dev
-Description: BitTorrent Client Core Library for C++/Qt4/KDE4 -development files
- BitTorrent Client Core Library (libbtcore) is a C++/Qt4/KDE4 based
- implementation of the BitTorrent protocol. In addition, it provides many
- powerful BitTorrent network client features including but not limited to
- torrent downloading and seeding, torrent creation and downloaded data
- verification, advanced peer management, IP blocking lists, HTTP, UDP tracker
- and mainline DHT support.
- .
- This package contains header files and CMake modules needed for developing
- and compiling/linking applications which use libbtcore.
-
 Package: ktorrent
 Architecture: any
 Depends: ${shlibs:Depends}
@@ -81,7 +55,7 @@
 Package: ktorrent-dbg
 Architecture: any
 Priority: extra
-Depends: ktorrent (= ${binary:Version})
+Depends: ktorrent (= ${binary:Version}), libbtcore-dbg
 Recommends: kdelibs5-dbg
 Description: KTorrent debugging symbols
  This package contains debugging symbols for KTorrent. When KTorrent crashes,

Modified: kde-extras/ktorrent/branches/experimental/debian/ktorrent.install
===================================================================
--- kde-extras/ktorrent/branches/experimental/debian/ktorrent.install	2008-05-03 20:15:34 UTC (rev 10460)
+++ kde-extras/ktorrent/branches/experimental/debian/ktorrent.install	2008-05-03 20:37:55 UTC (rev 10461)
@@ -4,13 +4,14 @@
 debian/tmp/usr/lib/kde4/ktinfowidgetplugin.so
 debian/tmp/usr/lib/kde4/ktipfilterplugin.so
 debian/tmp/usr/lib/kde4/ktlogviewerplugin.so
+debian/tmp/usr/lib/kde4/ktmediaplayerplugin.so
 debian/tmp/usr/lib/kde4/ktscanfolderplugin.so
 debian/tmp/usr/lib/kde4/ktsearchplugin.so
 debian/tmp/usr/lib/kde4/ktstatsplugin.so
 debian/tmp/usr/lib/kde4/ktupnpplugin.so
 debian/tmp/usr/lib/kde4/ktwebinterfaceplugin.so
-debian/tmp/usr/lib/libktcore.so.3
-debian/tmp/usr/lib/libktcore.so.3.0.0
+debian/tmp/usr/lib/libktcore.so.4
+debian/tmp/usr/lib/libktcore.so.4.0.0
 debian/tmp/usr/lib/libktupnp.so.1
 debian/tmp/usr/lib/libktupnp.so.1.0.0
 debian/tmp/usr/share/applications/kde4/ktorrent.desktop
@@ -20,6 +21,7 @@
 debian/tmp/usr/share/kde4/services/ktinfowidgetplugin.desktop
 debian/tmp/usr/share/kde4/services/ktipfilterplugin.desktop
 debian/tmp/usr/share/kde4/services/ktlogviewerplugin.desktop
+debian/tmp/usr/share/kde4/services/ktmediaplayerplugin.desktop
 debian/tmp/usr/share/kde4/services/ktscanfolderplugin.desktop
 debian/tmp/usr/share/kde4/services/ktsearchplugin.desktop
 debian/tmp/usr/share/kde4/services/ktstatsplugin.desktop

Deleted: kde-extras/ktorrent/branches/experimental/debian/libbtcore-dev.install

Deleted: kde-extras/ktorrent/branches/experimental/debian/libbtcore3.install

Deleted: kde-extras/ktorrent/branches/experimental/debian/libbtcore3.symbols.amd64

Deleted: kde-extras/ktorrent/branches/experimental/debian/patches/01_include_checkinclude_file.diff

Added: kde-extras/ktorrent/branches/experimental/debian/patches/01_support_external_libbtcore.diff
===================================================================
--- kde-extras/ktorrent/branches/experimental/debian/patches/01_support_external_libbtcore.diff	                        (rev 0)
+++ kde-extras/ktorrent/branches/experimental/debian/patches/01_support_external_libbtcore.diff	2008-05-03 20:37:55 UTC (rev 10461)
@@ -0,0 +1,101 @@
+--- ktorrent-3.1~beta1+dfsg.1.orig/CMakeLists.txt
++++ ktorrent-3.1~beta1+dfsg.1/CMakeLists.txt
+@@ -1,8 +1,6 @@
+ project(KTORRENT)
+ find_package(KDE4 REQUIRED)
+ find_package(KDE4Internal REQUIRED)
+-find_package(GMP REQUIRED)
+-find_package(QCA2 REQUIRED)
+ find_package(Strigi REQUIRED)
+ 
+ # set some default settings
+@@ -10,42 +8,49 @@
+ 
+ # make some more macros available
+ include (MacroLibrary)
+-#
+-# checks for functions and stuff
+-#
+-include(CheckIncludeFiles)
+-include(CheckFunctionExists)
+-include(CheckTypeSize) #XFS
+-
+ 
++# Checks for external BTCore
++if (EXISTS libbtcore)
++  option(USE_EXTERNAL_BTCORE "Whether to link KTorrent against BTCore library installed on the system" false)
++else (EXISTS libbtcore)
++  set(USE_EXTERNAL_BTCORE true)
++endif (EXISTS libbtcore)
++
++if (USE_EXTERNAL_BTCORE)
++  find_package(BTCore REQUIRED)
++  set(DHT_possible ${BTCORE_DHT_SUPPORTED})
++else (USE_EXTERNAL_BTCORE)
++  set(DHT_possible true)
++endif (USE_EXTERNAL_BTCORE)
+ 
+ add_definitions(${KDE4_ENABLE_EXCEPTIONS} ${KDE4_DEFINITIONS} )
+ 
+-option(ENABLE_DHT_SUPPORT "Whether to build KTorrent with DHT support or not" true)
+-if (ENABLE_DHT_SUPPORT)
+-  message(STATUS "Building KTorrent with DHT support (-DENABLE_DHT_SUPPORT=false to disable)")
+-  add_definitions(-DENABLE_DHT_SUPPORT)
+-endif (ENABLE_DHT_SUPPORT)
++if (DHT_possible)
++  option(ENABLE_DHT_SUPPORT "Whether to build KTorrent with DHT support or not" true)
++  if (ENABLE_DHT_SUPPORT)
++    message(STATUS "Building KTorrent with DHT support (-DENABLE_DHT_SUPPORT=false to disable)")
++    add_definitions(-DENABLE_DHT_SUPPORT)
++  endif (ENABLE_DHT_SUPPORT)
++endif (DHT_possible)
+ 
+ # option(ENABLE_GEOIP "Wether or not to enable support for the GeoIP library" true)
+ #if (ENABLE_GEOIP)
+ #  message(STATUS "Building KTorrent with GeoIP support")
+ #endif (ENABLE_GEOIP)
+ 
+-
++if (NOT USE_EXTERNAL_BTCORE)
++  add_subdirectory(libbtcore)
++  set(BTCORE_INCLUDE_DIR ${libbtcore_SOURCE_DIR} ${libbtcore_BINARY_DIR})
++  set(BTCORE_LIBRARIES btcore)
++endif (NOT USE_EXTERNAL_BTCORE)
+ 
+ include_directories( ${KDE4_INCLUDES} 
+-   ${KTORRENT_BINARY_DIR}
++   ${BTCORE_INCLUDE_DIR}
+    ${KTORRENT_BINARY_DIR}/libktcore
+    ${KTORRENT_SOURCE_DIR}/libktcore
+-   ${KTORRENT_BINARY_DIR}/libbtcore
+-   ${KTORRENT_SOURCE_DIR}/libbtcore
+    ${KTORRENT_SOURCE_DIR}
+-   ${GMP_INCLUDE_DIR}
+    )
+ 
+-add_subdirectory(cmake)
+-add_subdirectory(libbtcore)
+ add_subdirectory(libktcore)
+ add_subdirectory(libktupnp)
+ add_subdirectory(plugins)
+--- ktorrent-3.1~beta1+dfsg.1.orig/ktupnptest/CMakeLists.txt
++++ ktorrent-3.1~beta1+dfsg.1/ktupnptest/CMakeLists.txt
+@@ -6,6 +6,6 @@
+ kde4_add_ui_files(ktupnptest_SRC upnptestwidget.ui)
+ kde4_add_executable(ktupnptest ${ktupnptest_SRC})
+ 
+-target_link_libraries(ktupnptest btcore ktupnp ${KDE4_KDEUI_LIBS})
++target_link_libraries(ktupnptest ${BTCORE_LIBRARIES} ktupnp ${KDE4_KDEUI_LIBS})
+ install(TARGETS ktupnptest DESTINATION ${BIN_INSTALL_DIR})
+ 
+--- ktorrent-3.1~beta1+dfsg.1.orig/libktcore/CMakeLists.txt
++++ ktorrent-3.1~beta1+dfsg.1/libktcore/CMakeLists.txt
+@@ -44,7 +44,7 @@
+ kde4_add_kcfg_files(libktorrent_SRC settings.kcfgc)
+ kde4_add_library(ktcore SHARED ${libktorrent_SRC})
+ 
+-target_link_libraries(ktcore ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KUTILS_LIBS} btcore ${KDE4_SOLID_LIBS} ${GMP_LIBRARIES})
++target_link_libraries(ktcore ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KUTILS_LIBS} ${BTCORE_LIBRARIES} ${KDE4_SOLID_LIBS} ${GMP_LIBRARIES})
+ set_target_properties(ktcore PROPERTIES VERSION 4.0.0 SOVERSION 4 )
+ install(TARGETS ktcore  DESTINATION ${LIB_INSTALL_DIR} )
+ 

Added: kde-extras/ktorrent/branches/experimental/debian/patches/02_no_dht_without_dht_headers.diff
===================================================================
--- kde-extras/ktorrent/branches/experimental/debian/patches/02_no_dht_without_dht_headers.diff	                        (rev 0)
+++ kde-extras/ktorrent/branches/experimental/debian/patches/02_no_dht_without_dht_headers.diff	2008-05-03 20:37:55 UTC (rev 10461)
@@ -0,0 +1,218 @@
+--- ktorrent-3.1~beta1+dfsg.1.o/ktorrent/gui.cpp	2008-04-29 20:06:39.000000000 +0300
++++ ktorrent-3.1~beta1+dfsg.1/ktorrent/gui.cpp	2008-05-03 16:24:54.000000000 +0300
+@@ -45,7 +45,6 @@
+ #include <torrent/queuemanager.h>
+ #include <torrent/torrentcontrol.h>
+ #include <util/log.h>
+-#include <dht/dhtbase.h>
+ #include <groups/group.h>
+ #include <groups/groupmanager.h>
+ #include <pluginmanager.h>
+@@ -68,6 +67,9 @@
+ #include "speedlimitsdlg.h"
+ #include "queuemanagerwidget.h"
+ 
++#ifdef ENABLE_DHT_SUPPORT
++#  include <dht/dhtbase.h>
++#endif
+ 
+ namespace kt
+ {
+@@ -533,7 +535,9 @@ namespace kt
+ 		CurrentStats stats = core->getStats();
+ 		status_bar->updateSpeed(stats.upload_speed,stats.download_speed);
+ 		status_bar->updateTransfer(stats.bytes_uploaded,stats.bytes_downloaded);
++#ifdef ENABLE_DHT_SUPPORT
+ 		status_bar->updateDHTStatus(Globals::instance().getDHT().isRunning(),Globals::instance().getDHT().getStats());
++#endif
+ 
+ 		tray_icon->updateStats(stats,Settings::showSpeedBarInTrayIcon(),Settings::downloadBandwidth(), Settings::uploadBandwidth());
+ 		core->updateGuiPlugins();
+--- ktorrent-3.1~beta1+dfsg.1.o/ktorrent/statusbar.cpp	2008-04-29 20:06:39.000000000 +0300
++++ ktorrent-3.1~beta1+dfsg.1/ktorrent/statusbar.cpp	2008-05-03 16:26:43.000000000 +0300
+@@ -22,9 +22,12 @@
+ #include <QProgressBar>
+ #include <klocale.h>
+ #include <util/functions.h>
+-#include <dht/dhtbase.h>
+ #include "statusbar.h"
+ 
++#ifdef ENABLE_DHT_SUPPORT
++#  include <dht/dhtbase.h>
++#endif
++
+ using namespace bt;
+ 
+ namespace kt
+@@ -82,6 +85,7 @@ namespace kt
+ 	
+ 	void StatusBar::updateDHTStatus(bool on,const dht::Stats & s)
+ 	{
++#ifdef ENABLE_DHT_SUPPORT
+ 		if (on == dht_on && dht_peers == s.num_peers && dht_tasks == s.num_tasks)
+ 			return;
+ 
+@@ -90,7 +94,8 @@ namespace kt
+ 		dht_tasks = s.num_tasks;
+ 		if (on)
+ 			dht_status->setText(i18n("DHT: %1 nodes, %2 tasks",s.num_peers,s.num_tasks));
+-	        else
++		else
++#endif
+ 			dht_status->setText(i18n("DHT: off"));
+ 	}
+ 
+--- ktorrent-3.1~beta1+dfsg.1.o/ktorrent/torrentcreatordlg.cpp	2008-04-29 20:06:39.000000000 +0300
++++ ktorrent-3.1~beta1+dfsg.1/ktorrent/torrentcreatordlg.cpp	2008-05-03 16:35:18.000000000 +0300
+@@ -21,7 +21,6 @@
+ #include <kfiledialog.h>
+ #include <kmessagebox.h>
+ #include <kprogressdialog.h>
+-#include <dht/dht.h>
+ #include <torrent/globals.h>
+ #include <groups/group.h>
+ #include <groups/groupmanager.h>
+@@ -29,6 +28,10 @@
+ #include "gui.h"
+ #include "torrentcreatordlg.h"
+ 
++#ifdef ENABLE_DHT_SUPPORT
++#  include <dht/dht.h>
++#endif
++
+ using namespace bt;
+ 
+ namespace kt
+@@ -67,6 +70,7 @@ namespace kt
+ 		m_add_node->setEnabled(false);
+ 		m_remove_node->setEnabled(false);
+ 		
++#ifdef ENABLE_DHT_SUPPORT
+ 		// populate dht box with some nodes from our own table
+ 		QMap<QString, int> n = bt::Globals::instance().getDHT().getClosestGoodNodes(10);
+ 
+@@ -77,6 +81,7 @@ namespace kt
+ 			twi->setText(1,QString::number(it.value()));
+ 			m_node_list->addTopLevelItem(twi);
+ 		}
++#endif
+ 		
+ 		// webseed stuff
+ 		connect(m_add_webseed,SIGNAL(clicked()),this,SLOT(addWebSeedPressed()));
+--- ktorrent-3.1~beta1+dfsg.1.o/libktcore/interfaces/functions.cpp	2008-04-29 20:06:40.000000000 +0300
++++ ktorrent-3.1~beta1+dfsg.1/libktcore/interfaces/functions.cpp	2008-05-03 15:50:48.000000000 +0300
+@@ -32,7 +32,6 @@
+ #include <peer/peermanager.h>
+ #include <net/socketmonitor.h>
+ #include <net/socks.h>
+-#include <dht/dhtbase.h>
+ #include <mse/streamsocket.h>
+ #include <tracker/httptracker.h>
+ #include <tracker/udptrackersocket.h>
+@@ -45,6 +44,10 @@
+ #include "settings.h"
+ #include "functions.h"
+ 
++#ifdef ENABLE_DHT_SUPPORT
++#  include <dht/dhtbase.h>
++#endif
++
+ using namespace bt;
+ 
+ namespace kt
+--- ktorrent-3.1~beta1+dfsg.1.o/plugins/stats/ConnsTabPage.cc	2008-04-29 20:06:33.000000000 +0300
++++ ktorrent-3.1~beta1+dfsg.1/plugins/stats/ConnsTabPage.cc	2008-05-03 16:07:50.000000000 +0300
+@@ -78,6 +78,7 @@ void ConnsTabPage::SetupUi()
+ 	
+ 	//--------------------------
+ 	
++#ifdef ENABLE_DHT_SUPPORT
+ 	if(bt::Globals::instance().getDHT().isRunning ())
+ 	{
+ 		pmDhtChtWgt -> AddDataSet(ChartDrawerData(i18n("Nodes"), QPen(StatsPluginSettings::dhtNodesColor()), true));
+@@ -85,6 +86,9 @@ void ConnsTabPage::SetupUi()
+ 	} else {
+ 		pmConnsUi -> DhtGbw -> setEnabled(false);
+ 	}
++#else
++	pmConnsUi -> DhtGbw -> setEnabled(false);
++#endif
+ 	
+ 	ApplySettings();
+ }
+@@ -166,6 +170,7 @@ void ConnsTabPage::ApplySettings()
+ 
+ 	pmConnsChtWgt -> SetXMax(StatsPluginSettings::connsSamples());
+ 	
++#ifdef ENABLE_DHT_SUPPORT
+ 	if(bt::Globals::instance().getDHT().isRunning ())
+ 	{
+ 		if(! dynamic_cast<QWidget *>(pmDhtChtWgt.get()) -> isEnabled())
+@@ -178,6 +183,9 @@ void ConnsTabPage::ApplySettings()
+ 	} else {
+ 		pmConnsUi -> DhtGbw -> setEnabled(false);
+ 	}
++#else
++	pmConnsUi -> DhtGbw -> setEnabled(false);
++#endif
+ 	
+ 	pmConnsChtWgt -> SetXMax(StatsPluginSettings::connsSamples());
+ 	pmDhtChtWgt -> SetXMax(StatsPluginSettings::dhtSpdSamples());
+@@ -211,12 +219,15 @@ void ConnsTabPage::ResetAvg(ChartDrawer 
+ {
+ }
+ 
++
+ void ConnsTabPage::GatherDhtStats()
+ {
++#ifdef ENABLE_DHT_SUPPORT
+ 	const dht::Stats st = bt::Globals::instance().getDHT().getStats();
+ 	
+ 	pmDhtChtWgt -> AddValue(0, st.num_peers);
+ 	pmDhtChtWgt -> AddValue(1, st.num_tasks);
++#endif
+ }
+ 
+ void ConnsTabPage::GatherConnStats(Plugin * pPlug)
+--- ktorrent-3.1~beta1+dfsg.1.o/plugins/stats/ConnsTabPage.h	2008-04-29 20:06:33.000000000 +0300
++++ ktorrent-3.1~beta1+dfsg.1/plugins/stats/ConnsTabPage.h	2008-05-03 16:01:20.000000000 +0300
+@@ -27,7 +27,6 @@
+ 
+ #include <interfaces/plugin.h>
+ #include <torrent/globals.h>
+-#include <dht/dhtbase.h>
+ #include <interfaces/coreinterface.h>
+ #include <interfaces/torrentinterface.h>
+ #include <torrent/queuemanager.h>
+@@ -43,6 +42,10 @@
+ #include <drawer/KPlotWgtDrawer.h>
+ #include <statspluginsettings.h>
+ 
++#ifdef ENABLE_DHT_SUPPORT
++#  include <dht/dhtbase.h>
++#endif
++
+ namespace kt {
+ 
+ /** \brief Connections tab
+--- ktorrent-3.1~beta1+dfsg.1.o/plugins/webinterface/phpcommandhandler.cpp	2008-04-29 20:06:34.000000000 +0300
++++ ktorrent-3.1~beta1+dfsg.1/plugins/webinterface/phpcommandhandler.cpp	2008-05-03 15:58:29.000000000 +0300
+@@ -18,7 +18,6 @@
+  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
+  ***************************************************************************/
+ #include <settings.h>
+-#include <dht/dhtbase.h>
+ #include <net/socketmonitor.h>
+ #include <torrent/globals.h>
+ #include <torrent/server.h>
+@@ -33,6 +32,10 @@
+ #include <interfaces/functions.h>
+ #include "phpcommandhandler.h"
+ 
++#ifdef ENABLE_DHT_SUPPORT
++#  include <dht/dhtbase.h>
++#endif
++
+ using namespace bt;
+ 
+ namespace kt

Added: kde-extras/ktorrent/branches/experimental/debian/patches/97_fix_target_link_libraries.diff
===================================================================
--- kde-extras/ktorrent/branches/experimental/debian/patches/97_fix_target_link_libraries.diff	                        (rev 0)
+++ kde-extras/ktorrent/branches/experimental/debian/patches/97_fix_target_link_libraries.diff	2008-05-03 20:37:55 UTC (rev 10461)
@@ -0,0 +1,22 @@
+--- ktorrent-3.1~beta1+dfsg.1.orig/libktcore/CMakeLists.txt
++++ ktorrent-3.1~beta1+dfsg.1/libktcore/CMakeLists.txt
+@@ -44,7 +44,7 @@
+ kde4_add_kcfg_files(libktorrent_SRC settings.kcfgc)
+ kde4_add_library(ktcore SHARED ${libktorrent_SRC})
+ 
+-target_link_libraries(ktcore ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KUTILS_LIBS} ${BTCORE_LIBRARIES} ${KDE4_SOLID_LIBS} ${GMP_LIBRARIES})
++target_link_libraries(ktcore ${BTCORE_LIBRARIES} ${KDE4_KPARTS_LIBS} ${KDE4_KUTILS_LIBS} ${QT_QTNETWORK_LIBRARY})
+ set_target_properties(ktcore PROPERTIES VERSION 4.0.0 SOVERSION 4 )
+ install(TARGETS ktcore  DESTINATION ${LIB_INSTALL_DIR} )
+ 
+--- ktorrent-3.1~beta1+dfsg.1.orig/libktupnp/CMakeLists.txt
++++ ktorrent-3.1~beta1+dfsg.1/libktupnp/CMakeLists.txt
+@@ -5,7 +5,7 @@
+ 
+ kde4_add_library(ktupnp SHARED ${libktupnp_SRC})
+ 
+-target_link_libraries(ktupnp ktcore)
++target_link_libraries(ktupnp ktcore ${QT_QTXML_LIBRARY})
+ set_target_properties(ktupnp PROPERTIES VERSION 1.0.0 SOVERSION 1 )
+ install(TARGETS ktupnp  DESTINATION ${LIB_INSTALL_DIR} )
+ 

Modified: kde-extras/ktorrent/branches/experimental/debian/patches/series
===================================================================
--- kde-extras/ktorrent/branches/experimental/debian/patches/series	2008-05-03 20:15:34 UTC (rev 10460)
+++ kde-extras/ktorrent/branches/experimental/debian/patches/series	2008-05-03 20:37:55 UTC (rev 10461)
@@ -1 +1,3 @@
-01_include_checkinclude_file.diff
+01_support_external_libbtcore.diff
+02_no_dht_without_dht_headers.diff
+97_fix_target_link_libraries.diff

Modified: kde-extras/ktorrent/branches/experimental/debian/rules
===================================================================
--- kde-extras/ktorrent/branches/experimental/debian/rules	2008-05-03 20:15:34 UTC (rev 10460)
+++ kde-extras/ktorrent/branches/experimental/debian/rules	2008-05-03 20:37:55 UTC (rev 10461)
@@ -6,12 +6,6 @@
                          -DWITH_BUILTIN_COUNTRY_FLAGS:BOOL=OFF
 DEB_DH_INSTALL_SOURCEDIR =
 
-DEB_DH_SHLIBDEPS_ARGS_libbtcore3 = -- -xkdebase-runtime
-
-ifneq ($(DEB_HOST_ARCH_CPU),amd64)
-    DEB_DH_MAKESHLIBS_ARGS_libbtcore3 = -V'libbtcore3 (>= 3.1~~svn798493.dfsg.1)'
-endif
-
 prune-tarball:
 	# Remove non-free components: flags and geoip stuff
 	rm -f plugins/infowidget/geoip/*.png




More information about the pkg-kde-commits mailing list