From 58c09d0ff2ad25ec9704ef69376f549e1b1f6ca3 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 22 Sep 2010 18:04:55 +0000
Subject: [PATCH] Move koffice to applications/office

svn path=/nixpkgs/trunk/; revision=23900
---
 pkgs/applications/office/koffice/default.nix  | 42 +++++++++++++++++++
 .../office}/koffice/wpd.patch                 |  6 +--
 pkgs/desktops/kde-4.4/default.nix             | 10 +----
 .../kde-4.4/extragear/koffice/default.nix     | 21 ----------
 pkgs/top-level/all-packages.nix               |  2 +
 5 files changed, 48 insertions(+), 33 deletions(-)
 create mode 100644 pkgs/applications/office/koffice/default.nix
 rename pkgs/{desktops/kde-4.4/extragear => applications/office}/koffice/wpd.patch (81%)
 delete mode 100644 pkgs/desktops/kde-4.4/extragear/koffice/default.nix

diff --git a/pkgs/applications/office/koffice/default.nix b/pkgs/applications/office/koffice/default.nix
new file mode 100644
index 00000000000..4679c231e16
--- /dev/null
+++ b/pkgs/applications/office/koffice/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, lib, cmake, qt4, perl, lcms, exiv2, libxml2, libxslt, boost, glew
+, shared_mime_info, popplerQt4, gsl, gmm, wv2, libwpd, libwpg,  giflib, libgsf
+, fftw, pkgconfig, openjpeg , kdelibs, kdepimlibs, automoc4, phonon
+, qimageblitz, qca2, eigen, soprano , kdegraphics}:
+
+stdenv.mkDerivation rec {
+  name = "koffice-2.2.2";
+  src = fetchurl {
+    url = "mirror://kde/stable/${name}/${name}.tar.bz2";
+    sha256 = "1jzdq7av4vbfkx987yz54431q3bwrsd7wzyinl9wsznx83v61c75";
+  }; 
+
+  patchFlags = "-p0";
+  patches =
+    let
+      urlBase = "http://kexi-project.org/download/patches/2.2.2/";
+    in
+    [
+      (fetchurl {
+        url = "${urlBase}support-large-memo-values-for-msaccess-2.2.2.patch";
+        sha256 = "1jn6na8c0vdf87p0yv9bcff0kd1jmcxndxmm3s0878l5pak9m8rd";
+      })
+      (fetchurl {
+        url = "${urlBase}fix-crash-on-closing-sqlite-connection-2.2.2.patch";
+        sha256 = "11h4rxdrv5vakym5786vr4bysi4627m53qqvk1vhxf3rkawvcafj";
+      })
+      ./wpd.patch
+    ];
+
+  buildInputs = [ cmake qt4 perl lcms exiv2 libxml2 libxslt boost glew
+    shared_mime_info popplerQt4 gsl gmm wv2 libwpd libwpg giflib libgsf
+    stdenv.gcc.libc fftw pkgconfig kdelibs kdepimlibs automoc4 phonon
+    qimageblitz qca2 eigen openjpeg soprano kdegraphics ];
+
+  meta = {
+    description = "KDE integrated Office Suite";
+    license = "GPL";
+    homepage = http://www.koffice.org;
+    maintainers = with stdenv.lib.maintainers; [ sander urkud ];
+    inherit (kdelibs.meta) platforms;
+  };
+}
diff --git a/pkgs/desktops/kde-4.4/extragear/koffice/wpd.patch b/pkgs/applications/office/koffice/wpd.patch
similarity index 81%
rename from pkgs/desktops/kde-4.4/extragear/koffice/wpd.patch
rename to pkgs/applications/office/koffice/wpd.patch
index 2b0af918bae..56a5b65e50b 100644
--- a/pkgs/desktops/kde-4.4/extragear/koffice/wpd.patch
+++ b/pkgs/applications/office/koffice/wpd.patch
@@ -1,7 +1,7 @@
-diff --git a/cmake/modules/FindWPD.cmake b/cmake/modules/FindWPD.cmake
+diff cmake/modules/FindWPD.cmake cmake/modules/FindWPD.cmake
 index 9bd788c..927785a 100644
---- a/cmake/modules/FindWPD.cmake
-+++ b/cmake/modules/FindWPD.cmake
+--- cmake/modules/FindWPD.cmake
++++ cmake/modules/FindWPD.cmake
 @@ -19,14 +19,17 @@ if (WPD_INCLUDE_DIR AND WPD_LIBRARIES)
  else (WPD_INCLUDE_DIR AND WPD_LIBRARIES)
  if(NOT WIN32)
diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix
index c24867359a3..f67802e055c 100644
--- a/pkgs/desktops/kde-4.4/default.nix
+++ b/pkgs/desktops/kde-4.4/default.nix
@@ -283,15 +283,7 @@ pkgs.recurseIntoAttrs (rec {
     inherit automoc4 phonon;
   };
   
-  koffice = import ./extragear/koffice {
-    inherit (pkgs) stdenv fetchurl lib cmake qt4 perl lcms exiv2 giflib libxml2 libxslt boost glew;
-    inherit (pkgs) shared_mime_info gsl gmm wv2 libwpd libgsf fftw;
-    inherit kdelibs kdepimlibs;
-    inherit automoc4 phonon qimageblitz qca2 eigen soprano;
-    poppler = pkgs.popplerQt4;
-  };
-  
-  inherit (pkgs) konversation yakuake ktorrent;
+  inherit (pkgs) konversation yakuake ktorrent koffice;
   
   gtk_qt_engine = import ./extragear/gtk-qt-engine {
     inherit (pkgs) stdenv fetchurl cmake qt4 perl gettext;
diff --git a/pkgs/desktops/kde-4.4/extragear/koffice/default.nix b/pkgs/desktops/kde-4.4/extragear/koffice/default.nix
deleted file mode 100644
index 2bc5ea5fab8..00000000000
--- a/pkgs/desktops/kde-4.4/extragear/koffice/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, lib, cmake, qt4, perl, lcms, exiv2, libxml2, libxslt, boost, glew
-, shared_mime_info, poppler, gsl, gmm, wv2, libwpd, giflib, libgsf, fftw
-, kdelibs, kdepimlibs, automoc4, phonon, qimageblitz, qca2, eigen, soprano}:
-
-stdenv.mkDerivation {
-  name = "koffice-2.2.0";
-  src = fetchurl {
-    url = mirror://kde/stable/koffice-2.2.0/koffice-2.2.0.tar.bz2;
-    sha256 = "0qa73grmn4c2d7zs5p0sxg6dws8hpg8v2vgp6frhj55l0sk3kqba";
-  }; 
-  buildInputs = [ cmake qt4 perl lcms exiv2 libxml2 libxslt boost glew shared_mime_info 
-                  poppler gsl gmm wv2 libwpd giflib libgsf stdenv.gcc.libc fftw
-                  kdelibs kdepimlibs automoc4 phonon qimageblitz qca2 eigen soprano ];
-  patches = [ ./wpd.patch ];
-  meta = {
-    description = "KDE integrated Office Suite";
-    license = "GPL";
-    homepage = http://www.koffice.org;
-    maintainers = [ lib.maintainers.sander ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 27b040a7ea9..07f9c185810 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5767,6 +5767,8 @@ let
     inherit (xlibs) libXv libX11;
   };
 
+  koffice = newScope pkgs.kde4 ../applications/office/koffice { };
+
   konversation = newScope pkgs.kde4 ../applications/networking/irc/konversation { };
 
   krename = newScope pkgs.kde4 ../applications/misc/krename { };