[Lunar-commits] <moonbase> openoffice-src: Adding a patch and a sedit to fix some glibc related issues (thanks to the Arch folks).

[Dennis `stumbles` Veatch]

commit 84e440eb4a2d212840cb97145daededb2e9810f0
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Sun Oct 4 07:04:16 2009 -0400

    openoffice-src: Adding a patch and a sedit to fix some glibc related issues (thanks to the Arch folks).
---
 x11-apps/openoffice-src/BUILD          |    5 +++++
 x11-apps/openoffice-src/BUILD.x86_64   |    5 +++++
 x11-apps/openoffice-src/DETAILS        |    3 +++
 x11-apps/openoffice-src/DETAILS.x86_64 |    3 +++
 4 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/x11-apps/openoffice-src/BUILD b/x11-apps/openoffice-src/BUILD
index 5f9089e..0285cdb 100644
--- a/x11-apps/openoffice-src/BUILD
+++ b/x11-apps/openoffice-src/BUILD
@@ -1,5 +1,8 @@
 (
 
+# This sedit is needed for the configure to complete with current db.
+  sedit "s:seq 1 7:seq 1 8:" configure.in &&
+
   cd $SOURCE_DIRECTORY &&
   for file in `find . -name \*.patch -type f -exec grep -l '
$' {} \;`; do sedit 's/
$//' $file; done &&
   cd apache-commons/download &&
@@ -69,6 +72,8 @@
   # Apply mandatory and optional patches
 
   patch_it $SOURCE2 0 &&
+# A glibc related patch.
+  patch_it $SOURCE_CACHE/$SOURCE8 0 &&
 
   # As long as OOo-src does not compile against nss it needs its own mozilla
   # tarball (and it also compiles its own mozilla)
diff --git a/x11-apps/openoffice-src/BUILD.x86_64 b/x11-apps/openoffice-src/BUILD.x86_64
index bc3fe66..1ef97f1 100644
--- a/x11-apps/openoffice-src/BUILD.x86_64
+++ b/x11-apps/openoffice-src/BUILD.x86_64
@@ -1,5 +1,8 @@
 (
 
+# This sedit is needed for the configure to complete with current db.
+  sedit "s:seq 1 7:seq 1 8:" configure.in &&
+
   cd $SOURCE_DIRECTORY &&
   for file in `find . -name \*.patch -type f -exec grep -l '
$' {} \;`; do sedit 's/
$//' $file; done &&
   cd apache-commons/download &&
@@ -69,6 +72,8 @@
   # Apply mandatory and optional patches
 
   patch_it $SOURCE2 0 &&
+# A glibc related patch.
+  patch_it $SOURCE_CACHE/$SOURCE8 0 &&
 
   # As long as OOo-src does not compile against nss it needs its own mozilla
   # tarball (and it also compiles its own mozilla)
diff --git a/x11-apps/openoffice-src/DETAILS b/x11-apps/openoffice-src/DETAILS
index 92777c6..a4faedc 100644
--- a/x11-apps/openoffice-src/DETAILS
+++ b/x11-apps/openoffice-src/DETAILS
@@ -7,6 +7,7 @@
          SOURCE5=OOo_${VERSION}_src_system.tar.bz2
          SOURCE6=OOo_${VERSION}_src_extensions.tar.bz2
          SOURCE7=OOo_${VERSION}_src_binfilter.tar.bz2
+         SOURCE8=soltools-mkdepend-getline.diff
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/OOO310_m19
       SOURCE_URL=http://ftp.rz.tu-bs.de/pub/mirror/OpenOffice.org/stable/${VERSION}/
      SOURCE2_URL=$PATCH_URL/
@@ -15,6 +16,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/OOO310_m19
      SOURCE5_URL=http://ftp.rz.tu-bs.de/pub/mirror/OpenOffice.org/stable/${VERSION}/
      SOURCE6_URL=http://ftp.rz.tu-bs.de/pub/mirror/OpenOffice.org/stable/${VERSION}/
      SOURCE7_URL=http://ftp.rz.tu-bs.de/pub/mirror/OpenOffice.org/stable/${VERSION}/
+     SOURCE8_URL=$PATCH_URL
       SOURCE_VFY=sha1:e4e68570d488061e7e2e513e33916ce192dd1348
      SOURCE2_VFY=sha1:58c824ef969b017be5fcd7e4290d7681453aa354
      SOURCE3_VFY=sha1:bb2a89b95d7626a63a3787208e0abb99ea595d24
@@ -22,6 +24,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/OOO310_m19
      SOURCE5_VFY=sha1:c8a6348a2259ae8df30a0bc3a72d09280a57988c
      SOURCE6_VFY=sha1:dba308a76a75320507c0d67a4cf5d2dac3dd01b0
      SOURCE7_VFY=sha1:3b4d0d312a1bed9bdb1bbdfb172fa7361533b498
+     SOURCE8_VFY=sha1:d2e91ae7c374214dcd59a6fbdd732386a2040855
         WEB_SITE=http://www.openoffice.org
          ENTERED=20030805
          UPDATED=20090909
diff --git a/x11-apps/openoffice-src/DETAILS.x86_64 b/x11-apps/openoffice-src/DETAILS.x86_64
index 92777c6..a4faedc 100644
--- a/x11-apps/openoffice-src/DETAILS.x86_64
+++ b/x11-apps/openoffice-src/DETAILS.x86_64
@@ -7,6 +7,7 @@
          SOURCE5=OOo_${VERSION}_src_system.tar.bz2
          SOURCE6=OOo_${VERSION}_src_extensions.tar.bz2
          SOURCE7=OOo_${VERSION}_src_binfilter.tar.bz2
+         SOURCE8=soltools-mkdepend-getline.diff
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/OOO310_m19
       SOURCE_URL=http://ftp.rz.tu-bs.de/pub/mirror/OpenOffice.org/stable/${VERSION}/
      SOURCE2_URL=$PATCH_URL/
@@ -15,6 +16,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/OOO310_m19
      SOURCE5_URL=http://ftp.rz.tu-bs.de/pub/mirror/OpenOffice.org/stable/${VERSION}/
      SOURCE6_URL=http://ftp.rz.tu-bs.de/pub/mirror/OpenOffice.org/stable/${VERSION}/
      SOURCE7_URL=http://ftp.rz.tu-bs.de/pub/mirror/OpenOffice.org/stable/${VERSION}/
+     SOURCE8_URL=$PATCH_URL
       SOURCE_VFY=sha1:e4e68570d488061e7e2e513e33916ce192dd1348
      SOURCE2_VFY=sha1:58c824ef969b017be5fcd7e4290d7681453aa354
      SOURCE3_VFY=sha1:bb2a89b95d7626a63a3787208e0abb99ea595d24
@@ -22,6 +24,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/OOO310_m19
      SOURCE5_VFY=sha1:c8a6348a2259ae8df30a0bc3a72d09280a57988c
      SOURCE6_VFY=sha1:dba308a76a75320507c0d67a4cf5d2dac3dd01b0
      SOURCE7_VFY=sha1:3b4d0d312a1bed9bdb1bbdfb172fa7361533b498
+     SOURCE8_VFY=sha1:d2e91ae7c374214dcd59a6fbdd732386a2040855
         WEB_SITE=http://www.openoffice.org
          ENTERED=20030805
          UPDATED=20090909