From 501117b1c5ee4c9702b3a2c0b6c2ece6d5c6eb24 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 16 Aug 2010 20:37:18 +0000
Subject: [PATCH] Rewrite builsystem fixes in upstream-supported manner

svn path=/nixpkgs/trunk/; revision=23195
---
 pkgs/desktops/kde-4.5/utils/default.nix      | 14 ++++++--------
 pkgs/desktops/kde-4.5/utils/log-feature.diff | 10 ++++++++++
 2 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/desktops/kde-4.5/utils/log-feature.diff

diff --git a/pkgs/desktops/kde-4.5/utils/default.nix b/pkgs/desktops/kde-4.5/utils/default.nix
index 250090b5892..fb038179daf 100644
--- a/pkgs/desktops/kde-4.5/utils/default.nix
+++ b/pkgs/desktops/kde-4.5/utils/default.nix
@@ -1,30 +1,28 @@
 { kdePackage, cmake, qt4, perl, gmp, python, libzip, libarchive, xz
 , sip, pyqt4, pycups, rhpl, system_config_printer, qjson, shared_mime_info
+, kdebase_workspace
 , kdelibs, kdepimlibs, kdebase, kdebindings, automoc4, qimageblitz, qca2}:
 
 kdePackage {
   pn = "kdeutils";
   v = "4.5.0";
   
-  inherit system_config_printer;
-  preConfigure = ''
+  postPatch = ''
+    cp -vn ${qjson}/share/apps/cmake/modules/FindQJSON.cmake cmake/modules
     sed -e "s@/usr\(/share/system-config-printer\)@${system_config_printer}\1@" -i \
       printer-applet/cmake-modules/FindSystemConfigPrinter.py \
       printer-applet/printer-applet.py
     sed -i -e "s|import cupshelpers.ppds, cupshelpers.cupshelpers|import ppds, cupshelpers|" printer-applet/cmake-modules/FindSystemConfigPrinter.py
     '';
 
-  cmakeFlags = "-DCMAKE_MODULE_PATH=${qjson}/share/apps/cmake/modules";
-  patches = [ ./cmake-module-path.diff ];
-  
   buildInputs = [ cmake qt4 perl gmp python libzip libarchive xz sip pyqt4
     pycups rhpl system_config_printer kdelibs kdepimlibs kdebase kdebindings
-    automoc4 qimageblitz qca2 qjson shared_mime_info ];
+    automoc4 qimageblitz qca2 qjson shared_mime_info kdebase_workspace ];
+
+  patches = [ ./log-feature.diff ];
                   
   meta = {
     description = "KDE Utilities";
     license = "GPL";
-    homepage = http://www.kde.org;
-    inherit (kdelibs.meta) maintainers platforms;
   };
 }
diff --git a/pkgs/desktops/kde-4.5/utils/log-feature.diff b/pkgs/desktops/kde-4.5/utils/log-feature.diff
new file mode 100644
index 00000000000..050f06fd397
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/utils/log-feature.diff
@@ -0,0 +1,10 @@
+--- kdeutils-4.5.0.orig/CMakeLists.txt.orig	2010-08-16 18:21:33.000000000 +0400
++++ kdeutils-4.5.0/CMakeLists.txt	2010-08-16 18:27:05.000000000 +0400
+@@ -36,6 +36,7 @@
+ endif( GMP_FOUND )
+ if( UNIX )
+     find_package( KDE4Workspace )
++    macro_log_feature( KDE4Workspace_FOUND "KDE4Workspace" "KDE workscpace library, part of kdebase-workspace" "http://www.kde.org" FALSE "" "Required to build kremotecontrol." )
+     if( KDE4Workspace_FOUND AND QT_QTXMLPATTERNS_FOUND )
+         macro_optional_add_subdirectory( kremotecontrol )
+     endif( KDE4Workspace_FOUND AND QT_QTXMLPATTERNS_FOUND )