ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-16 06:47:09 +03:00
Code Issues Projects Releases Wiki Activity

Upgrade ktorrent

Browse Source 
svn path=/nixpkgs/trunk/; revision=23754
This commit is contained in:
Yury G. Kudryashov 2010-09-13 14:23:02 +00:00
parent 61dd03faa8
commit 38dec40ddc
3 changed files with 73 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/applications/networking/ktorrent/default.nix Normal file
View File

@ -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 ];
};
}

44
pkgs/applications/networking/ktorrent/find-workspace.diff Normal file
View File

@ -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>

4
pkgs/top-level/all-packages.nix
View File

@ -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 { };