[Lunar-commits] <moonbase> openoffice-src: updated to 2.4.1

[Zbigniew Luszpinski]

commit e33e6e53fc4525fa4d775b66587adc582ac8859e
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Sun Jul 6 03:39:44 2008 +0200

    openoffice-src: updated to 2.4.1
---
 x11-apps/openoffice-src/BUILD     |   11 ++++++++---
 x11-apps/openoffice-src/DEPENDS   |    1 +
 x11-apps/openoffice-src/DETAILS   |   17 ++++++++++-------
 x11-apps/openoffice-src/PRE_BUILD |    3 ++-
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/x11-apps/openoffice-src/BUILD b/x11-apps/openoffice-src/BUILD
index d130cf1..599b0dc 100644
--- a/x11-apps/openoffice-src/BUILD
+++ b/x11-apps/openoffice-src/BUILD
@@ -16,7 +16,7 @@
       rm -f /usr/share/applications/${FILE}.desktop || exit 1
     done &&
 
-  sedit "/^ARCH_FLAGS\*=/d" solenv/inc/unxlngi{4,5,6}.mk &&
+  sedit "/^ARCH_FLAGS\*=/d" solenv/inc/unxlngi{4,6}.mk &&
 
   # All of the options have been carefully chosen. Don't edit them unless you
   # really know what you're doing
@@ -38,8 +38,13 @@
   fi &&
 
   if module_installed sun-jdk; then
-    JAVA_VERSION="`installed_version sun-jdk`"
-    OPTS="$OPTS --with-jdk-home=/usr/lib/jdk${JAVA_VERSION}";
+# hsqldb 3rdparty compilation fault will break OO build
+# we can pull out hsqldb 1.9.0 from svn,
+# or downgrade JDK to 1.5 only for OO build:
+    cd $SOURCE_DIRECTORY;
+    chmod +x $SOURCE8;
+    ./$SOURCE8 --accept-license --unpack;
+    OPTS="$OPTS --with-jdk-home=$SOURCE_DIRECTORY/jdk1.5.0_15";
   else
     JAVA_VERSION="`installed_version j2sdk`";
     OPTS="$OPTS --with-jdk-home=/usr/lib/j2sdk${JAVA_VERSION}";
diff --git a/x11-apps/openoffice-src/DEPENDS b/x11-apps/openoffice-src/DEPENDS
index 42dec55..c2db869 100644
--- a/x11-apps/openoffice-src/DEPENDS
+++ b/x11-apps/openoffice-src/DEPENDS
@@ -10,6 +10,7 @@ depends zip
 depends which
 depends desktop-file-utils
 depends hicolor-icon-theme
+depends IO-Compress-Zlib
 
 optional_depends "boost"                  \
                  "--with-system-boost"    \
diff --git a/x11-apps/openoffice-src/DETAILS b/x11-apps/openoffice-src/DETAILS
index 354e2b1..62cbf75 100644
--- a/x11-apps/openoffice-src/DETAILS
+++ b/x11-apps/openoffice-src/DETAILS
@@ -1,5 +1,5 @@
           MODULE=openoffice-src
-         VERSION=2.4.0
+         VERSION=2.4.1
           SOURCE=OOo_${VERSION}_src_core.tar.bz2
          SOURCE2=$MODULE-2.2.0-xauth.patch
          SOURCE3=mozilla-source-1.7.5.tar.gz
@@ -7,7 +7,8 @@
          SOURCE5=OOo_${VERSION}_src_system.tar.bz2
          SOURCE6=$MODULE-2.2.0-mozilla-cplusplus.patch
          SOURCE7=OOo_${VERSION}_src_binfilter.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/OOH680_m12
+         SOURCE8=jdk-5.0u15-dlj-linux-i586.bin
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/OOH680_m17
       SOURCE_URL=http://ftp.rz.tu-bs.de/pub/mirror/OpenOffice.org/stable/${VERSION}/
      SOURCE2_URL=$PATCH_URL/
      SOURCE3_URL=ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla1.7.5/source/
@@ -15,16 +16,18 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/OOH680_m12
      SOURCE5_URL=http://ftp.rz.tu-bs.de/pub/mirror/OpenOffice.org/stable/${VERSION}/
      SOURCE6_URL=$PATCH_URL/
      SOURCE7_URL=http://ftp.rz.tu-bs.de/pub/mirror/OpenOffice.org/stable/${VERSION}/
-      SOURCE_VFY=sha1:1f775a0f2b755ad1c4cb7d14df93d86948424e7f
+     SOURCE8_URL=http://download.java.net/dlj/binaries/
+      SOURCE_VFY=sha1:170642263c32f614ee7e9439a8af30410e00d318
      SOURCE2_VFY=sha1:58c824ef969b017be5fcd7e4290d7681453aa354
      SOURCE3_VFY=sha1:bb2a89b95d7626a63a3787208e0abb99ea595d24
-     SOURCE4_VFY=sha1:3ef13fbaa6c41ab920ba9a9f4494f6c4f805c28e
-     SOURCE5_VFY=sha1:cbefb4655987fb70b929b6922c2b27beb1e5db18
+     SOURCE4_VFY=sha1:b21f4531ea8182d87ff6f5f68809086c1c063295
+     SOURCE5_VFY=sha1:d42b8345b55ef6f0f2a4adb575c815bbb23ec00d
      SOURCE6_VFY=sha1:31ee26c90f43f4385a713a8ee64a9ed0801e61d8
-     SOURCE7_VFY=sha1:6196fd2d2b5b37635d9a08a36f5476d57b14e0d8
+     SOURCE7_VFY=sha1:a50c7f317643b756c2b0e8937fa9d64b99f05ed9
+     SOURCE8_VFY=sha1:e52af3bc81f268d73a94772428d612769473834b
         WEB_SITE=http://www.openoffice.org
          ENTERED=20030805
-         UPDATED=20080414
+         UPDATED=20080705
            PSAFE=no
            SHORT="OpenOffice.org Office Suite"
 cat << EOF
diff --git a/x11-apps/openoffice-src/PRE_BUILD b/x11-apps/openoffice-src/PRE_BUILD
index 8a38b32..5e343f7 100644
--- a/x11-apps/openoffice-src/PRE_BUILD
+++ b/x11-apps/openoffice-src/PRE_BUILD
@@ -4,4 +4,5 @@ cd $SOURCE_DIRECTORY &&
 
 tar xf $SOURCE_CACHE/$SOURCE4 --strip-components=1 &&
 tar xf $SOURCE_CACHE/$SOURCE5 --strip-components=1 &&
-tar xf $SOURCE_CACHE/$SOURCE7 --strip-components=1
+tar xf $SOURCE_CACHE/$SOURCE7 --strip-components=1 &&
+cp $SOURCE_CACHE/$SOURCE8 .