Author: urkud
Date: Mon Sep 13 14:23:02 2010
New Revision: 23754
URL: https://svn.nixos.org/websvn/nix/?rev=23754&sc=1
Log:
Upgrade ktorrent
Added:
nixpkgs/trunk/pkgs/applications/networking/ktorrent/
nixpkgs/trunk/pkgs/applications/networking/ktorrent/default.nix
nixpkgs/trunk/pkgs/applications/networking/ktorrent/find-workspace.diff
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/applications/networking/ktorrent/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/applications/networking/ktorrent/default.nix Mon Sep
13 14:23:02 2010 (r23754)
@@ -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 ];
+ };
+}
Added: nixpkgs/trunk/pkgs/applications/networking/ktorrent/find-workspace.diff
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/applications/networking/ktorrent/find-workspace.diff
Mon Sep 13 14:23:02 2010 (r23754)
@@ -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>
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Sep 13 14:22:56
2010 (r23753)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Sep 13 14:23:02
2010 (r23754)
@@ -769,8 +769,6 @@
kismet = callPackage ../applications/networking/sniffers/kismet { };
- ktorrent = kde4.ktorrent;
-
less = callPackage ../tools/misc/less { };
most = callPackage ../tools/misc/most { };
@@ -5714,6 +5712,8 @@
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 { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
