kdepim, kdepim-runtime, kdebase upgrade

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

pkgs/desktops/kde-4.5/base/default.nix

@@ -1,11 +1,11 @@
-{ kde, cmake, perl, qt4, kdelibs, pciutils, libraw1394
+{ kde, cmake, perl, qt4, kdelibs, pciutils, libraw1394 , automoc4, strigi
-, automoc4, strigi, qimageblitz, soprano}:
+, qimageblitz, soprano}:
 
 kde.package {
   preConfigure = "cd apps";
 
   buildInputs = [ cmake perl qt4 kdelibs pciutils libraw1394 automoc4
-    strigi qimageblitz soprano ];
+    strigi qimageblitz ];
 
   meta = {
     description = "KDE Base components";
@@ -13,7 +13,7 @@ kde.package {
     license = "GPL";
     kde = {
       name = "kdebase";
-      version = "4.5.0";
+      version = "4.5.1";
     };
   };
 }

pkgs/desktops/kde-4.5/default.nix

@@ -91,7 +91,7 @@
 
   #kdepim_runtime = callPackage ../kde-4.4/pim-runtime { };
   kdepim_runtime = callPackage ./pim-runtime { };
-  kdepim = callPackage ../kde-4.4/pim { };
+  kdepim = callPackage ./pim { };
 ### DEVELOPMENT
 
   kdebindings = callPackage ./bindings { };

pkgs/desktops/kde-4.5/kde-package/manifest.nix

@@ -1,13 +1,5 @@
 builtins.listToAttrs
 [
-{
-  name = "kdepim-runtime-4.4.92.tar.bz2";
-  value = "1gshcnra3fcbj6ww7rfaw6ny1x9mf4l7pxwlrppv2slgwg141msy";
-}
-{
-  name = "kdepim-4.4.92.tar.bz2";
-  value = "0mhpifynnypg81nhwfvr28hbpr7c6w488afasprqhxbs4q57lin6";
-}
 {
   name = "kdegraphics-4.5.0.tar.bz2";
   value = "13ms1z26sb2pfadhagkykgnw0p7inrn36p4s9qr04qisy2b2vd6l";
@@ -108,4 +100,16 @@ builtins.listToAttrs
   name = "kdepimlibs-4.5.1.tar.bz2";
   value = "1dlxnxxay6wbwgcfbkq0xak9z0h1bkh6rvysjx3djmawmwi5aw6b";
 }
+{
+  name = "kdepim-4.4.93.tar.bz2";
+  value = "1xrqmsgbgqpa8qzqadp1hikhn8c1snh5k323kc6a5yqdpnsf2qa0";
+}
+{
+  name = "kdepim-runtime-4.4.93.tar.bz2";
+  value = "18g8dz57pflmri7v013lsn2g4552c35lawcr7jxgig2x05zrwgf7";
+}
+{
+  name = "kdebase-4.5.1.tar.bz2";
+  value = "06g8s3r153hdmxh24s2x98a0fb4lr6d00d4307ibgp7r29w6dklb";
+}
 ]

pkgs/desktops/kde-4.5/pim-runtime/default.nix

@@ -1,16 +1,15 @@
 { kde, cmake, kdelibs, qt4, kdepimlibs, akonadi, pkgconfig, boost, shared_mime_info, libxml2, shared_desktop_ontologies, soprano, strigi, automoc4, libxslt }:
 
 kde.package rec {
-	stable = false;
-	subdir = "kdepim/${meta.kde.version}/src";
-
 	buildInputs = [ automoc4 cmake kdelibs qt4 kdepimlibs akonadi pkgconfig boost shared_mime_info shared_desktop_ontologies libxml2 soprano strigi libxslt ];
 
   meta = {
     description = "Runtime files for KDE PIM: akonadi agents etc.";
-    kde = {
+    kde = rec {
       name = "kdepim-runtime";
-      version = "4.4.92";
+      version = "4.4.93";
+      subdir = "kdepim/${version}/src/src";
+      stable = false;
     };
   };
 }

pkgs/desktops/kde-4.5/pim/boost-1.44.diff

@@ -0,0 +1,12 @@
+diff --git a/kleopatra/crypto/gui/newresultpage.cpp b/kleopatra/crypto/gui/newresultpage.cpp
+index 96d1cb2..5c7281a 100644
+--- a/kleopatra/crypto/gui/newresultpage.cpp
++++ b/kleopatra/crypto/gui/newresultpage.cpp
+@@ -40,6 +40,7 @@
+ #include <crypto/taskcollection.h>
+ 
+ #include <utils/stl_util.h>
++#include <boost/mem_fn.hpp>
+ 
+ #include <KLocalizedString>
+ 

pkgs/desktops/kde-4.5/pim/default.nix

@@ -0,0 +1,18 @@
+{ kde, automoc4, cmake, kdelibs, akonadi, kdepimlibs, boost, zlib, strigi,
+  shared_desktop_ontologies, soprano, grantlee, libassuan, perl, libxslt }:
+
+kde.package {
+  buildInputs = [ automoc4 cmake kdelibs akonadi kdepimlibs boost zlib strigi
+    shared_desktop_ontologies soprano grantlee libassuan perl libxslt ];
+
+  patches = [ ./boost-1.44.diff ];
+
+  meta = {
+    kde = rec {
+      name = "kdepim";
+      version = "4.4.93";
+      subdir = "kdepim/${version}/src/src";
+      stable = false;
+    };
+  };
+}

pkgs/desktops/kde-4.5/pimlibs/default.nix

@@ -3,8 +3,9 @@
 
 kde.package {
 
-  buildInputs = [ cmake qt4 perl boost cyrus_sasl gpgme libical openldap
+  buildInputs = [ cmake automoc4 perl shared_mime_info ];
-    shared_mime_info kdelibs automoc4 akonadi soprano ];
+  propagatedBuildInputs = [ qt4 boost cyrus_sasl gpgme libical openldap kdelibs
+    akonadi soprano ];
 
   meta = {
     description = "KDE PIM libraries";