- Loudmouth uses OpenSSL now instead of GnuTLS, because I could not compile it with GnuTLS

- Upgraded KOffice to 2.0.2
- Upgraded KTorrent to 3.2.3
- Upgraded Amarok to 2.1.1


svn path=/nixpkgs/trunk/; revision=17038

6 files changed, 39 insertions, 19 deletions

diff --git a/pkgs/desktops/kde-4.3/default.nix b/pkgs/desktops/kde-4.3/default.nix
index b4697c3b9f0..4bd07c25f1a 100644
--- a/pkgs/desktops/kde-4.3/default.nix
+++ b/pkgs/desktops/kde-4.3/default.nix
@@ -196,7 +196,7 @@ rec {
 #### EXTRA GEAR
 
   amarok = import ./extragear/amarok {
-    inherit (pkgs) stdenv fetchurl cmake qt4 perl gettext curl mysql libxml2 taglib loudmouth;
+    inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gettext curl mysql libxml2 taglib loudmouth;
     inherit kdelibs;
     inherit automoc4 phonon strigi soprano;
   };
@@ -221,7 +221,7 @@ rec {
   };
   
   koffice = import ./extragear/koffice {
-    inherit (pkgs) stdenv fetchurl cmake qt4 perl lcms exiv2 libxml2 libxslt boost glew;
+    inherit (pkgs) stdenv fetchurl lib cmake qt4 perl lcms exiv2 libxml2 libxslt boost glew;
     inherit (pkgs) shared_mime_info gsl gmm wv2 libwpd;
     inherit kdelibs kdepimlibs;
     inherit automoc4 phonon qimageblitz qca2 eigen;
@@ -229,7 +229,7 @@ rec {
   };
   
   ktorrent = import ./extragear/ktorrent {
-    inherit (pkgs) stdenv fetchurl cmake qt4 perl gmp taglib boost gettext;
+    inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gmp taglib boost gettext;
     inherit kdelibs kdepimlibs kdebase_workspace;
     inherit automoc4 phonon qca2;
   };
diff --git a/pkgs/desktops/kde-4.3/extragear/amarok/default.nix b/pkgs/desktops/kde-4.3/extragear/amarok/default.nix
index b841c1ed932..92e80a96bca 100644
--- a/pkgs/desktops/kde-4.3/extragear/amarok/default.nix
+++ b/pkgs/desktops/kde-4.3/extragear/amarok/default.nix
@@ -1,15 +1,21 @@
-{stdenv, fetchurl, cmake, qt4, perl, gettext, curl, libxml2, mysql, taglib, loudmouth,
- kdelibs, automoc4, phonon, strigi, soprano}:
+{ stdenv, fetchurl, lib, cmake, qt4, perl, gettext, curl, libxml2, mysql, taglib, loudmouth
+, kdelibs, automoc4, phonon, strigi, soprano}:
 
 stdenv.mkDerivation {
-  name = "amarok-2.0.2";
+  name = "amarok-2.1.1";
   src = fetchurl {
-    url = mirror://kde/stable/amarok/2.0.2/src/amarok-2.0.2.tar.bz2;
-    md5 = "98b78372ec6ea3432faba356c90c6dbe";
+    url = mirror://kde/stable/amarok/2.1.1/src/amarok-2.1.1.tar.bz2;
+    sha256 = "0z0irnb86f00w8d0iapbdwygwm5vr83jhfmjd1xdldsyjrz65mi7";
   };
   includeAllQtDirs=true;
   inherit mysql loudmouth;
   builder = ./builder.sh;
   buildInputs = [ cmake qt4 perl stdenv.gcc.libc gettext curl libxml2 mysql taglib loudmouth
                   kdelibs automoc4 phonon strigi soprano ];
+  meta = {
+    description = "Popular music player for KDE";
+    license = "GPL";
+    homepage = http://amarok.kde.org;
+    maintainers = [ lib.maintainers.sander ];
+  };
 }
diff --git a/pkgs/desktops/kde-4.3/extragear/koffice/default.nix b/pkgs/desktops/kde-4.3/extragear/koffice/default.nix
index 872e2ab7e95..837edd93944 100644
--- a/pkgs/desktops/kde-4.3/extragear/koffice/default.nix
+++ b/pkgs/desktops/kde-4.3/extragear/koffice/default.nix
@@ -1,16 +1,22 @@
-{ stdenv, fetchurl, cmake, qt4, perl, lcms, exiv2, libxml2, libxslt, boost, glew
+{ stdenv, fetchurl, lib, cmake, qt4, perl, lcms, exiv2, libxml2, libxslt, boost, glew
 , shared_mime_info, poppler, gsl, gmm, wv2, libwpd
 , kdelibs, kdepimlibs, automoc4, phonon, qimageblitz, qca2, eigen}:
 
 stdenv.mkDerivation {
-  name = "koffice-2.0.0";
+  name = "koffice-2.0.2";
   src = fetchurl {
-    url = mirror://kde/stable/koffice-2.0.0/src/koffice-2.0.0.tar.bz2;
-    sha256 = "8cfc35acf4b6d306245e7705899167fd1b67a861136551ab02a0cd7542eb72e9";
+    url = mirror://kde/stable/koffice-2.0.2/src/koffice-2.0.2.tar.bz2;
+    sha256 = "1nvpj8viw7ijjnz1pg6kdb21srsm13vh6c1v7s01hn4xrv9zwyic";
   }; 
   includeAllQtDirs=true;
   CMAKE_PREFIX_PATH=kdepimlibs;
   buildInputs = [ cmake qt4 perl lcms exiv2 libxml2 libxslt boost glew shared_mime_info 
                   poppler gsl gmm wv2 libwpd
                   kdelibs kdepimlibs automoc4 phonon qimageblitz qca2 eigen ];
+  meta = {
+    description = "KDE integrated Office Suite";
+    license = "GPL";
+    homepage = http://www.koffice.org;
+    maintainers = [ lib.maintainers.sander ];
+  };
 }
diff --git a/pkgs/desktops/kde-4.3/extragear/ktorrent/default.nix b/pkgs/desktops/kde-4.3/extragear/ktorrent/default.nix
index 0a60fa82d29..218e9f82692 100644
--- a/pkgs/desktops/kde-4.3/extragear/ktorrent/default.nix
+++ b/pkgs/desktops/kde-4.3/extragear/ktorrent/default.nix
@@ -1,15 +1,21 @@
-{stdenv, fetchurl, cmake, qt4, perl, gmp, taglib, boost, gettext,
+{stdenv, fetchurl, lib, cmake, qt4, perl, gmp, taglib, boost, gettext,
  kdelibs, kdepimlibs, kdebase_workspace, automoc4, phonon, qca2}:
 
 stdenv.mkDerivation {
-  name = "ktorrent-3.2.1";
+  name = "ktorrent-3.2.3";
   src = fetchurl {
-    url = http://ktorrent.org/downloads/3.2.1/ktorrent-3.2.1.tar.bz2;
-    sha256 = "e37324519fdd04cad2a489fb772cbe628d8ff9f578e2bb913b18a1404dd7c4eb";
+    url = http://ktorrent.org/downloads/3.2.3/ktorrent-3.2.3.tar.bz2;
+    sha256 = "1fvxf4wq7w9wl58ms9jnx321b224wzcz685r8dnqw27cy15vxsqd";
   };
   includeAllQtDirs=true;
   CMAKE_PREFIX_PATH=kdepimlibs;
   cmakeFlags = "-DTASKMANAGER_INCLUDE_DIR=${kdebase_workspace}/include";
   buildInputs = [ cmake qt4 perl gmp taglib boost gettext stdenv.gcc.libc
                   kdelibs kdepimlibs kdebase_workspace automoc4 phonon qca2 ];
+  meta = {
+    description = "KDE integrated BitTorrent client";
+    license = "GPL";
+    homepage = http://ktorrent.org;
+    maintainers = [ lib.maintainers.sander ];
+  };
 }
diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/development/libraries/loudmouth/default.nix
index 40b66c44d58..1de9e485f10 100644
--- a/pkgs/development/libraries/loudmouth/default.nix
+++ b/pkgs/development/libraries/loudmouth/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, gnutls, libidn, glib, pkgconfig, zlib}:
+{stdenv, fetchurl, openssl, libidn, glib, pkgconfig, zlib}:
 
 stdenv.mkDerivation {
   name = "loudmouth-1.4.3";
@@ -8,7 +8,9 @@ stdenv.mkDerivation {
     md5 = "55339ca42494690c3942ee1465a96937";
   };
     
-  propagatedBuildInputs = [gnutls libidn glib zlib];
+  configureFlags = "--with-ssl=openssl";
+  
+  propagatedBuildInputs = [openssl libidn glib zlib];
   
   buildInputs = [pkgconfig];
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e4cd91067ec..f1dfa11e9e4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3815,7 +3815,7 @@ let
   };
 
   loudmouth = import ../development/libraries/loudmouth {
-    inherit fetchurl stdenv libidn gnutls pkgconfig zlib;
+    inherit fetchurl stdenv libidn openssl pkgconfig zlib;
     inherit (gtkLibs) glib;
   };