From 38dec40ddcc2605b15ff1d92dcc90049b75b8bcd Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 13 Sep 2010 14:23:02 +0000
Subject: [PATCH] Upgrade ktorrent

svn path=/nixpkgs/trunk/; revision=23754
---
 .../networking/ktorrent/default.nix           | 27 ++++++++++++
 .../networking/ktorrent/find-workspace.diff   | 44 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +-
 3 files changed, 73 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/applications/networking/ktorrent/default.nix
 create mode 100644 pkgs/applications/networking/ktorrent/find-workspace.diff

diff --git a/pkgs/applications/networking/ktorrent/default.nix b/pkgs/applications/networking/ktorrent/default.nix
new file mode 100644
index 000000000000..c4917c2b8fb0
--- /dev/null
+++ b/pkgs/applications/networking/ktorrent/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, cmake, automoc4, libktorrent, taglib, kdepimlibs, boost,
+  gettext, kdebase_workspace }:
+
+stdenv.mkDerivation rec {
+  name = pname + "-" + version;
+
+  pname = "ktorrent";
+  version = "4.0.3";
+
+  src = fetchurl {
+    url = "${meta.homepage}/downloads/${version}/${name}.tar.bz2";
+    sha256 = "02hp52333w75mdywgsln28samf9ybr9yldg1jsw0b93lj44pfxli";
+  };
+
+  patches = [ ./find-workspace.diff ];
+
+  KDEDIRS = libktorrent;
+
+  buildInputs = [ automoc4 cmake libktorrent taglib kdepimlibs boost gettext
+    kdebase_workspace ];
+
+  meta = {
+    description = "KDE integrated BtTorrent client";
+    homepage = http://ktorrent.org;
+    maintainers = with stdenv.lib.maintainers; [ sander urkud ];
+  };
+}
diff --git a/pkgs/applications/networking/ktorrent/find-workspace.diff b/pkgs/applications/networking/ktorrent/find-workspace.diff
new file mode 100644
index 000000000000..472ceff490e1
--- /dev/null
+++ b/pkgs/applications/networking/ktorrent/find-workspace.diff
@@ -0,0 +1,44 @@
+Fix finding taskmanager.h and kworkspace.h
+diff --git a/plasma/applet/CMakeLists.txt b/plasma/applet/CMakeLists.txt
+index 3a72241..69b1205 100644
+--- a/plasma/applet/CMakeLists.txt
++++ b/plasma/applet/CMakeLists.txt
+@@ -6,7 +6,9 @@ if(NOT QT_VERSION_OK)
+ else(NOT QT_VERSION_OK)
+ 	
+ 	set(TASKMANAGER_FOUND FALSE)
+-	FIND_PATH(TASKMANAGER_INCLUDE_DIR NAMES taskmanager.h  PATHS ${KDE4_INCLUDE_DIR}/taskmanager ${INCLUDE_INSTALL_DIR}/taskmanager.h)
++	FIND_PATH(TASKMANAGER_INCLUDE_DIR
++		NAMES taskmanager/taskmanager.h
++		HINTS ${KDE4_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR})
+ 	FIND_LIBRARY(TASKMANAGER_LIBRARY NAMES taskmanager PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR})
+ 
+ 	if(TASKMANAGER_INCLUDE_DIR AND TASKMANAGER_LIBRARY)
+diff --git a/plugins/shutdown/CMakeLists.txt b/plugins/shutdown/CMakeLists.txt
+index 59e5470..5b932ff 100644
+--- a/plugins/shutdown/CMakeLists.txt
++++ b/plugins/shutdown/CMakeLists.txt
+@@ -1,6 +1,8 @@
+ set(KWORKSPACE_FOUND FALSE)
+-FIND_PATH(KWORKSPACE_INCLUDE_DIR NAMES kworkspace.h  PATHS ${KDE4_INCLUDE_DIR}/kworkspace ${INCLUDE_INSTALL_DIR}/kworkspace.h)
+-FIND_LIBRARY(KWORKSPACE_LIBRARY NAMES kworkspace PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR})
++FIND_PATH(KWORKSPACE_INCLUDE_DIR
++	NAMES kworkspace/kworkspace.h
++	HINTS ${KDE4_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR})
++FIND_LIBRARY(KWORKSPACE_LIBRARY NAMES kworkspace HINTS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR})
+ 
+ if(KWORKSPACE_INCLUDE_DIR AND KWORKSPACE_LIBRARY)
+ 	set(KWORKSPACE_FOUND TRUE)
+diff --git a/plugins/shutdown/shutdownplugin.cpp b/plugins/shutdown/shutdownplugin.cpp
+index e233353..1efc20b 100644
+--- a/plugins/shutdown/shutdownplugin.cpp
++++ b/plugins/shutdown/shutdownplugin.cpp
+@@ -19,7 +19,7 @@
+ ***************************************************************************/
+ #include <kjob.h>
+ #include <kgenericfactory.h>
+-#include <kworkspace.h>
++#include <kworkspace/kworkspace.h>
+ #include <ktoggleaction.h>
+ #include <kactioncollection.h>
+ #include <kmessagebox.h>
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9493c68fa8df..1b1d20bb0225 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -769,8 +769,6 @@ let
 
   kismet = callPackage ../applications/networking/sniffers/kismet { };
 
-  ktorrent = kde4.ktorrent;
-
   less = callPackage ../tools/misc/less { };
 
   most = callPackage ../tools/misc/most { };
@@ -5714,6 +5712,8 @@ let
 
   konversation = newScope pkgs.kde4 ../applications/networking/irc/konversation { };
 
+  ktorrent = newScope pkgs.kde4 ../applications/networking/ktorrent { };
+
   lame = callPackage ../applications/audio/lame { };
 
   larswm = callPackage ../applications/window-managers/larswm { };