upgraded kadu to v0.9.2 + fixed typos in description

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

pkgs/applications/networking/instant-messengers/kadu/config.patch

@@ -0,0 +1,15 @@
+diff --git a/.config b/.config
+index e0068bf..808ebf4 100644
+--- a/.config
++++ b/.config
+@@ -187,8 +187,8 @@ module_history_migration=m
+ # PL: Obsługa szyfrowania wiadomości przy pomocy OpenSSLa
+ # Platform: Linux, Mac OS X, Windows
+ # Needs: libcrypto, libssl
+-module_encryption_ng=m
+-module_encryption_ng_simlite=m
++module_encryption_ng=n
++module_encryption_ng_simlite=n
+ 
+ # Description: Auto away module
+ # PL: Obsługa automatycznej zmiany statusu po określonym czasie bezczynności

pkgs/applications/networking/instant-messengers/kadu/default.nix

@@ -1,33 +1,33 @@
-{ stdenv, fetchurl, cmake, qt4, libgadu, libXScrnSaver, libsndfile, qca2
+{ stdenv, fetchurl, cmake, qt4, libgadu, libXScrnSaver, libsndfile, libX11,
-, libX11, alsaLib }:
+  alsaLib, aspell, libidn, qca2 }:
 
 stdenv.mkDerivation {
 
-  name = "kadu-0.6.5.4";
+  name = "kadu-0.9.2";
 
   src = fetchurl {
-    url = http://www.kadu.net/download/stable/kadu-0.6.5.4.tar.bz2;
+    url = http://www.kadu.net/download/stable/kadu-0.9.2.tar.bz2;
-    sha256 = "09bdcyx75lca1pl6x3vfpawmdjn5pfxvwivb9xdhk4bdvswxgv4x";
+    sha256 = "05lpx7m2adx8vv4h62rsiwlgay24m6cxdbibg7vzl4xkq9ybv30b";
   };
-  
+
   buildInputs = [
-    cmake qt4 libgadu libXScrnSaver libsndfile qca2 libX11 alsaLib
+    cmake qt4 libgadu libXScrnSaver libsndfile libX11 alsaLib aspell libidn qca2
   ];
 
-  cmakeFlags = "-DENABLE_AUTODOWNLOAD=OFF";
+  configureFlags = "CPPFLAGS=-DQT_NO_DEBUG";
+
+  cmakeFlags = "-DENABLE_AUTODOWNLOAD=OFF -DBUILD_DESCRIPTION='NixOS' -DCMAKE_BUILD_TYPE=Release";
 
   prePatch = ''
     patchShebangs .
   '';
-  
+
-  patches = [ 
+  patches = [ ./config.patch ];
-    ./includes.patch
-  ];
 
   NIX_LDFLAGS="-lX11";
 
-  meta = { 
+  meta = {
-    description = "An instance messanger client for the gadu-gadu network (most popular polish IM network)";
+    description = "An instant-messenger client for the gadu-gadu network (most popular polish IM network)";
     homepage = http://www.kadu.net/w/English:Main_Page;
     license = "GPLv2";
     platforms = stdenv.lib.platforms.linux;

pkgs/applications/networking/instant-messengers/kadu/includes.patch

@@ -1,13 +0,0 @@
---- kadu/kadu-core/main.cpp	2011-01-27 22:58:22.000000000 +0100
-+++ kadu/kadu-core/main.cpp	2011-01-27 22:58:28.000000000 +0100
-@@ -20,10 +20,8 @@
- #include <winsock2.h>
- #include <windows.h>
- #endif
--#ifdef Q_OS_BSD4
- #include <sys/types.h>
- #include <sys/stat.h>
--#endif
- 
- #include "config_file.h"
- #include "debug.h"

pkgs/applications/networking/instant-messengers/kadu/more-icons.patch

@@ -1,12 +0,0 @@
---- kadu/.config	2010-01-18 17:13:31.000000000 +0100
-+++ kadu/.config	2010-09-28 21:21:48.000000000 +0200
-@@ -559,10 +559,10 @@ icons_glass16=y
- icons_glass22=y
- 
- # Desctiption: Tango 16x16 icons made by BlotoPosniegowe
--icons_tango16=n
-+icons_tango16=y
- 
- # Description: Oxygen 16x16 icons maintained by Piotr Pelzowski
--icons_oxygen16=n
-+icons_oxygen16=y