From b931fd862d698c0a6b970f9b3725c2562c716c96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 2 Nov 2011 15:00:11 +0000
Subject: [PATCH] Updating scribus to 1.4.0rc6. The developers say they
 abandoned 1.3 long ago.

svn path=/nixpkgs/trunk/; revision=30190
---
 pkgs/applications/office/scribus/default.nix | 45 ++++----------------
 pkgs/top-level/all-packages.nix              |  2 +-
 2 files changed, 9 insertions(+), 38 deletions(-)

diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix
index 8123f8717a8e..3c72db17e1f1 100644
--- a/pkgs/applications/office/scribus/default.nix
+++ b/pkgs/applications/office/scribus/default.nix
@@ -1,50 +1,22 @@
 { stdenv, fetchurl, pkgconfig, freetype, lcms, libtiff, libxml2
 , libart_lgpl, qt, python, cups, fontconfig, libjpeg
-, zlib, libpng, xorg, cairo, cmake }:
-
-assert stdenv.gcc.gcc != null;
-
-# NOTE: ! If Scribus doesn't render text try another font.
-
-# a lot of templates, colour palettes, colour profiles or gradients
-# will be released with the next version of scribus - So don't miss them
-# when upgrading this package
-
-let useCairo = false; in
-
+, zlib, libpng, xorg, cairo, podofo, aspell, boost, cmake }:
 stdenv.mkDerivation {
-  name = "scribus-1.3.3.14";
+  name = "scribus-1.4.0rc6";
 
   src = fetchurl {
-    url = mirror://sourceforge/scribus/scribus/1.3.3.14/scribus-1.3.3.14.tar.bz2;
-    sha256 = "1ig7x6vxhqgjlpnv6hkzpb6gj4yvxsrx7rw900zlp7g6zxl01iyy";
+    url = mirror://sourceforge/scribus/scribus/scribus-1.4.0.rc6.tar.bz2;
+    sha256 = "1rrnzxjzhqj4lgyfswly501xlyvm4hsnnq7zw008v0cnkx31icli";
   };
 
-  cmakeFlags = if useCairo then "-DWANT_CAIRO=1" else "";
-
-  configurePhase = ''
-    set -x
-    mkdir -p build;
-    cd build
-    eval -- "cmake .. $cmakeFlags"
-    set +x
-  '';
+  enableParallelBuilding = true;
 
   buildInputs =
-    [ pkgconfig /*<- required fro cairo only?*/ cmake freetype lcms libtiff libxml2 libart_lgpl qt
+    [ pkgconfig cmake freetype lcms libtiff libxml2 libart_lgpl qt
       python cups fontconfig
       xorg.libXaw xorg.libXext xorg.libX11 xorg.libXtst xorg.libXi xorg.libXinerama
-      libjpeg zlib libpng
-    ] ++ stdenv.lib.optional useCairo cairo;
-
-  # fix rpath which is removed by cmake..
-  postFixup = ''
-    for i in $buildNativeInputs ${stdenv.gcc.gcc}; do
-      [ -d "$i/lib" ] && RPATH="$RPATH:$i/lib"
-      [ -d "$i/lib64" ] && RPATH="$RPATH:$i/lib64"
-    done
-    patchelf --set-rpath "''\${RPATH:1}" $out/bin/scribus
-  '';
+      libjpeg zlib libpng podofo aspell cairo
+    ];
 
   meta = {
     maintainers = [ stdenv.lib.maintainers.marcweber ];
@@ -54,4 +26,3 @@ stdenv.mkDerivation {
     license = "GPLv2";
   };
 }
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6cf0c1c95e79..361f3123d65e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7255,7 +7255,7 @@ let
 
   scribus = callPackage ../applications/office/scribus {
     inherit (gnome) libart_lgpl;
-    qt = qt3;
+    qt = qt4;
   };
 
   seeks = callPackage ../tools/networking/p2p/seeks { };