OpenOffice update. It configures OK, but I prefer to let Hydra build it (old build failed anyway)

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

3 files changed, 14 insertions, 17 deletions

diff --git a/pkgs/applications/office/openoffice/builder.sh b/pkgs/applications/office/openoffice/builder.sh
index 1f215831ca9e..f4431a34f34d 100644
--- a/pkgs/applications/office/openoffice/builder.sh
+++ b/pkgs/applications/office/openoffice/builder.sh
@@ -17,12 +17,9 @@ preConfigure() {
     SRCDIR=
 
     sed -e '/CURL_NO_OLDIES/d' -i ucb/source/ucp/ftp/makefile.mk
-
-    cd config_office/
 }
 
 postConfigure() {
-    cd ..
     for i in LinuxX86*Env.Set; do
 	substituteInPlace $i --replace /usr /no-such-path
     done
diff --git a/pkgs/applications/office/openoffice/default.nix b/pkgs/applications/office/openoffice/default.nix
index b201e426dc63..06d2112ff13e 100644
--- a/pkgs/applications/office/openoffice/default.nix
+++ b/pkgs/applications/office/openoffice/default.nix
@@ -3,7 +3,7 @@
 , libxml2, db4, sablotron, curl, libXaw, fontconfig, libsndfile, neon
 , bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which
 , icu, boost, jdk, ant, libXext, libX11, libXtst, libXi, cups
-, libXinerama, openssl, gperf, cppunit
+, libXinerama, openssl, gperf, cppunit, GConf
 }:
 
 let version = "3.1.1"; in
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
     libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl 
     libXaw fontconfig libsndfile neon bison flex zip unzip gtk libmspack 
     getopt file jdk cairo which icu boost libXext libX11 libXtst libXi
-    cups libXinerama openssl gperf
+    cups libXinerama openssl gperf GConf
   ];
 
   inherit icu fontconfig libjpeg jdk cups;
diff --git a/pkgs/applications/office/openoffice/oo.patch b/pkgs/applications/office/openoffice/oo.patch
index 1234d961fd1d..1b8234e6d61e 100644
--- a/pkgs/applications/office/openoffice/oo.patch
+++ b/pkgs/applications/office/openoffice/oo.patch
@@ -50,20 +50,20 @@ index 5719272..75c31b7 100644
  BUILD_ACTION=$(GNUMAKE)
  BUILD_FLAGS+= -j$(EXTMAXPROCESS)
  BUILD_DIR=$(CONFIGURE_DIR)
-diff --git a/hunspell/hunspell-1.1.12.patch b/hunspell/hunspell-1.1.12.patch
+diff --git a/hunspell/hunspell-1.2.8.patch b/hunspell/hunspell-1.2.8.patch
 index 37b7964..e6fd962 100644
---- a/hunspell/hunspell-1.1.12.patch
-+++ b/hunspell/hunspell-1.1.12.patch
-@@ -487,3 +487,15 @@
-  i68568utf.test \
-  1706659.test \
-  digits_in_words.test \
-+diff --git a/hunspell/unxlngi6.pro/misc/build/hunspell-1.1.12/tests/test.sh b/hunspell/unxlngi6.pro/misc/build/hunspell-1.1.12/tests/test.sh
+--- a/hunspell/hunspell-1.2.8.patch
++++ b/hunspell/hunspell-1.2.8.patch
+@@ -619,3 +619,15 @@
+              p++;
+          }
+          if (i > 0 && buf[i - 1] == '\n') {
++diff --git a/hunspell/unxlngi6.pro/misc/build/hunspell-1.2.8/tests/test.sh b/hunspell/unxlngi6.pro/misc/build/hunspell-1.1.12/tests/test.sh
 +index 90080f6..f069517 100755
-+--- a/hunspell/unxlngi6.pro/misc/build/hunspell-1.1.12/tests/test.sh
-++++ b/hunspell/unxlngi6.pro/misc/build/hunspell-1.1.12/tests/test.sh
-+--- misc/hunspell-1.1.12/tests/test.sh	Sep  4 01:25:35 2007
-++++ misc/build/hunspell-1.1.12/tests/test.sh	Jun 18 11:53:11 2008
++--- a/hunspell/unxlngi6.pro/misc/build/hunspell-1.2.8/tests/test.sh
+++++ b/hunspell/unxlngi6.pro/misc/build/hunspell-1.2.8/tests/test.sh
++--- misc/hunspell-1.2.8/tests/test.sh	Sep  4 01:25:35 2007
+++++ misc/build/hunspell-1.2.8/tests/test.sh	Jun 18 11:53:11 2008
 +@@ -1,4 +1,4 @@
 +-#!/bin/bash
 ++#!/bin/sh