From c37db61834d3b82841a11339df73a722db10fc06 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 4 Jul 2008 05:54:04 +0000
Subject: [PATCH] * OpenOffice 2.3.1.

svn path=/nixpkgs/trunk/; revision=12255
---
 pkgs/applications/office/openoffice/default.nix   | 15 ++++-----------
 .../applications/office/openoffice/libawt_problem | 10 ----------
 2 files changed, 4 insertions(+), 21 deletions(-)
 delete mode 100644 pkgs/applications/office/openoffice/libawt_problem

diff --git a/pkgs/applications/office/openoffice/default.nix b/pkgs/applications/office/openoffice/default.nix
index c7cedc69dee..21572526113 100644
--- a/pkgs/applications/office/openoffice/default.nix
+++ b/pkgs/applications/office/openoffice/default.nix
@@ -7,7 +7,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "openoffice.org-2.3.0";
+  name = "openoffice.org-2.3.1";
   builder = ./builder.sh;
 
   src =
@@ -21,9 +21,9 @@ stdenv.mkDerivation rec {
         #sha256 = "";
     #} else 
     fetchurl {
-        url = http://openoffice.bouncer.osuosl.org/?product=OpenOffice.org&os=src_bzip&lang=core&version=2.3.0;
-        name = "OOo_2.3.0_src_core.tar.bz2";
-        sha256 = "0mkxn9qj3f03rjkmxc4937gr2w429hnxzb9j5j2grdknfga5a1c3";
+      url = http://openoffice.bouncer.osuosl.org/?product=OpenOffice.org&os=src_bzip&lang=core&version=2.3.1;
+      name = "OOo_2.3.1_src_core.tar.bz2";
+      md5 = "9555a2d5fae9a25c788cc732921ef57a";
     };
 
   configureFlags = "
@@ -73,14 +73,7 @@ stdenv.mkDerivation rec {
 
   inherit icu fontconfig libjpeg jdk cups;
 
-  # libawt_problem see http://www.openoffice.org/issues/show_bug.cgi?id=74751 
-  # Can be removed in newer releases than 2.3.0
-  patch_file = ./libawt_problem;
   patches = [./ooo-libtextcat.patch ];
-  patchPhase = " 
-  patch config_office/set_soenv.in \$patch_file
-  unset patchPhase; patchPhase;
-  ";
 
   meta = {
     description = "OpenOffice.org is a multiplatform and multilingual office suite";
diff --git a/pkgs/applications/office/openoffice/libawt_problem b/pkgs/applications/office/openoffice/libawt_problem
deleted file mode 100644
index edfb72cd8d2..00000000000
--- a/pkgs/applications/office/openoffice/libawt_problem
+++ /dev/null
@@ -1,10 +0,0 @@
---- config_office/set_soenv.in  2007-02-21 16:31:51.000000000 +0100
-+++ config_office/set_soenv.in.new      2007-02-21 20:37:17.000000000 +0100
-@@ -426,6 +426,7 @@
-       $OUTPATH        = "unxlngx6";
-       # Blackdown.org JDK porting project uses `amd64' and `server' in JDK 1.4.2 RC1
-       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64";
-+      $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."xawt";
-       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
-       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
-    }