Author: urkud
Date: Wed Aug 18 15:54:10 2010
New Revision: 23230
URL: https://svn.nixos.org/websvn/nix/?rev=23230&sc=1
Log:
Add kdenetwork-4.5.0
Added:
nixpkgs/trunk/pkgs/desktops/kde-4.5/network/
nixpkgs/trunk/pkgs/desktops/kde-4.5/network/default.nix
nixpkgs/trunk/pkgs/desktops/kde-4.5/network/log-feature.diff
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix Wed Aug 18 15:52:58
2010 (r23229)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix Wed Aug 18 15:54:10
2010 (r23230)
@@ -48,6 +48,7 @@
kdegames = callPackage ./games { };
kdegraphics = callPackage ./graphics { };
kdemultimedia = callPackage ./multimedia { };
+ kdenetwork = callPackage ./network { };
kdetoys = callPackage ./toys { };
kdeutils = callPackage ./utils { };
### DEVELOPMENT
Added: nixpkgs/trunk/pkgs/desktops/kde-4.5/network/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/network/default.nix Wed Aug 18
15:54:10 2010 (r23230)
@@ -0,0 +1,34 @@
+{ kdePackage, cmake, qt4, perl, speex, gmp, libxml2, libxslt, sqlite, alsaLib,
libidn
+, libvncserver, libmsn, giflib, gpgme, boost, libv4l, libotr
+, libXi, libXtst, libXdamage, libXxf86vm, libktorrent, kdebase
+, kdebase_workspace
+, kdelibs, kdepimlibs, automoc4, qca2, soprano, qimageblitz, strigi}:
+
+kdePackage {
+ pn = "kdenetwork";
+ v = "4.5.0";
+
+ buildInputs = [ cmake qt4 perl speex gmp libxml2 libxslt sqlite alsaLib
libidn
+ libvncserver libmsn giflib gpgme boost libv4l libotr libXi libXtst
+ libXdamage libXxf86vm kdelibs kdepimlibs automoc4 qca2 soprano
+ qimageblitz strigi libktorrent kdebase kdebase_workspace ];
+
+ patches = [ ./log-feature.diff ];
+#TODO
+# * telepathy-qt4 (0.18 or higher) <http://telepathy.freedesktop.org>
+# * KWebKitPart
<https://svn.kde.org/home/kde/trunk/extragear/base/kwebkitpart>
+# * libortp (0.13 or higher)
<http://www.linphone.org/index.php/eng/code_review/ortp>
+# * XMMS <http://www.xmms.org>
+# * mediastreamer (2.3.0 or higher)
<http://www.linphone.org/index.php/eng/code_review/mediastreamer2>
+# * libmeanwhile <http://meanwhile.sf.net>
+# * libgadu (1.8.0 or higher) <http://toxygen.net/libgadu/>
+
+# Let cmake find libktorrent. Waiting for upstream fix in 4.5.1
+ KDEDIRS="${libktorrent}";
+
+ meta = {
+ description = "KDE network utilities";
+ longDescription = "Various network utilities for KDE such as a messenger
client and network configuration interface";
+ license = "GPL";
+ };
+}
Added: nixpkgs/trunk/pkgs/desktops/kde-4.5/network/log-feature.diff
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/network/log-feature.diff Wed Aug
18 15:54:10 2010 (r23230)
@@ -0,0 +1,60 @@
+--- a/kget/CMakeLists.txt 2010-08-16 19:08:36.000000000 +0400
++++ b/kget/CMakeLists.txt 2010-08-16 22:04:24.000000000 +0400
+@@ -53,21 +53,20 @@
+ add_subdirectory(desktop)
+ add_subdirectory(plasma)
+
+-# find kworkspace library to allow the shutdown after downloads completed
option
+-find_library(KDE4_KWORKSPACE_LIBRARY NAMES kworkspace PATHS
${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+-if(KDE4_KWORKSPACE_LIBRARY)
+- set(KDE4_KWORKSPACE_LIBS ${kworkspace_LIB_DEPENDS}
${KDE4_KWORKSPACE_LIBRARY})
++macro_optional_find_package(KDE4Workspace)
++macro_log_feature(KDE4WORKSPACE_FOUND "KDE4Workspace" "KDE4 workspace
libraries, part of kdebase-workspace" "http://www.kde.org"; FALSE "" "Allows
'shutdown after downloads completed' in kget")
++if(KDE4WORKSPACE_FOUND)
+ add_definitions(-DHAVE_KWORKSPACE)
+- set(KWORKSPACE_FOUND true)
+-endif(KDE4_KWORKSPACE_LIBRARY)
++ include_directories(${KDE4WORKSPACE_INCLUDE_DIR})
++endif(KDE4WORKSPACE_FOUND)
+
+ # find libkonq to allow actions and open with options in the context menu of
a transfer
+-find_library(KDE4_KONQUEROR_LIBRARY NAMES konq PATHS ${KDE4_LIB_INSTALL_DIR}
NO_DEFAULT_PATH )
+-if(KDE4_KONQUEROR_LIBRARY)
+- set(KDE4_KONQUEROR_LIBS ${konq_LIB_DEPENDS} ${KDE4_KONQUEROR_LIBRARY})
++macro_optional_find_package(LibKonq)
++macro_log_feature(LIBKONQ_FOUND "libkonq" "KDE4 Konqueror library"
"http://www.kde.org"; FALSE "" "Needed to build actions and open with options in
the context menu of a transfer")
++if(LIBKONQ_FOUND)
+ add_definitions(-DHAVE_KONQUEROR)
+- set(KONQUEROR_FOUND true)
+-endif(KDE4_KONQUEROR_LIBRARY)
++ include_directories(${LIBKONQ_INCLUDE_DIR})
++endif(LIBKONQ_FOUND)
+
+
+ include_directories(
+@@ -142,9 +141,9 @@
+
+ target_link_libraries(kgetcore ${KDE4_KIO_LIBS})
+
+-if (KWORKSPACE_FOUND)
+- target_link_libraries(kgetcore ${KDE4_KWORKSPACE_LIBS})
+-endif (KWORKSPACE_FOUND)
++if (KDE4WORKSPACE_FOUND)
++ target_link_libraries(kgetcore ${KDE4WORKSPACE_KWORKSPACE_LIBS})
++endif (KDE4WORKSPACE_FOUND)
+
+ if (HAVE_NEPOMUK)
+ target_link_libraries(kgetcore ${SOPRANO_LIBRARIES} ${NEPOMUK_LIBRARIES})
+@@ -294,9 +293,9 @@
+ target_link_libraries(kget ${SOPRANO_LIBRARIES} ${NEPOMUK_LIBRARIES})
+ endif (HAVE_NEPOMUK)
+
+-if (KONQUEROR_FOUND)
+- target_link_libraries(kget ${KDE4_KONQUEROR_LIBS})
+-endif (KONQUEROR_FOUND)
++if (LIBKONQ_FOUND)
++ target_link_libraries(kget ${LIBKONQ_LIBRARY})
++endif (LIBKONQ_FOUND)
+
+ if (QGPGME_FOUND)
+ target_link_libraries(kget ${QGPGME_LIBRARIES})
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
