[Lunar-commits] r25958 - moonbase/trunk/zbeta/openoffice-src

[Dennis Veatch]

Author: stumbles
Date: 2007-09-25 01:42:16 +0200 (Tue, 25 Sep 2007)
New Revision: 25958

Modified:
   moonbase/trunk/zbeta/openoffice-src/BUILD
   moonbase/trunk/zbeta/openoffice-src/DETAILS
   moonbase/trunk/zbeta/openoffice-src/PRE_BUILD
Log:

Version bump. Leaving the mozilla-cplusplus.patch in but
disabled for the moment. The hunks fail.

For the time being we need to use --without-system-curl. The
current moonbase version causes the build to fail on some ftp
stuff.

Adding binfilter.

At one point the build failed on for file in *.desktop loop.
It bailed on the sedit for the exaile.desktop and the install
in that loop couldn't make the .desktops because they were
already there. I think the change to "$file;" fixed that because
I was not able to duplicate the failure.



Modified: moonbase/trunk/zbeta/openoffice-src/BUILD
===================================================================
--- moonbase/trunk/zbeta/openoffice-src/BUILD	2007-09-24 16:46:33 UTC (rev 25957)
+++ moonbase/trunk/zbeta/openoffice-src/BUILD	2007-09-24 23:42:16 UTC (rev 25958)
@@ -9,14 +9,14 @@
   OPTS="$OPTS --prefix=$OO_DIR --disable-qadevooo \
               --disable-fontooo --disable-odk --enable-libart \
               --disable-mathmldtd --enable-cairo --with-mozilla-version=1.7.5 \
-              --enable-mozilla --disable-binfilter --enable-xrender-link \
+              --enable-mozilla --enable-binfilter --enable-xrender-link \
               --without-fonts --without-ppds --without-afms \
               --with-system-stdlibs --without-nas --with-system-zlib \
               --with-system-jpeg --with-system-expat --with-system-freetype \
               --with-system-libxml --without-system-db \
               --with-system-xrender-headers --with-epm=internal \
               --with-use-shell=bash --with-x --with-package-format=native \
-              --with-build-version=LunarLinux" &&
+              --with-build-version=LunarLinux --without-system-boost --without-system-curl" &&
 
   if module_installed sane-backends ; then
     OPTS="$OPTS --with-system-sane-header";
@@ -33,7 +33,7 @@
   # Apply mandatory and optional patches
 
   patch_it $SOURCE2 0 &&
-  patch_it $SOURCE6 0 &&
+# patch_it $SOURCE6 0 &&
 
   # As long as OOo-src does not compile against nss it needs its own mozilla
   # tarball (and it also compiles its own mozilla)
@@ -63,7 +63,7 @@
   cd instsetoo_native/unxlngi6.pro/OpenOffice/native/install/en-US/linux-2.6-intel/buildroot/opt &&
 
   rm -rf $OO_DIR &&
-  cp -rv openoffice.org2.2 $OO_DIR &&
+  cp -rv openoffice.org2.3 $OO_DIR &&
 
   # Install icons for the .desktop files
   mkdir -p -m0755 /usr/share/icons/{HighContrast,hicolor} &&
@@ -81,7 +81,7 @@
     sedit '/Exec/d' $file;
     echo "Exec=$OO_DIR/program/s`echo $file | sed 's/.desktop//'`" >> $file;
     sedit '/Icon/d' $file;
-    echo "Icon=`echo $file | sed 's/.desktop//'`" >> $file
+    echo "Icon=`echo $file | sed 's/.desktop//'`" >> $file;
     install -m644 $file /usr/share/applications;
   done &&
   update-desktop-database

Modified: moonbase/trunk/zbeta/openoffice-src/DETAILS
===================================================================
--- moonbase/trunk/zbeta/openoffice-src/DETAILS	2007-09-24 16:46:33 UTC (rev 25957)
+++ moonbase/trunk/zbeta/openoffice-src/DETAILS	2007-09-24 23:42:16 UTC (rev 25958)
@@ -1,27 +1,30 @@
           MODULE=openoffice-src
-         VERSION=2.2.0
+         VERSION=2.3.0
           SOURCE=OOo_${VERSION}_src_core.tar.bz2
-         SOURCE2=$MODULE-$VERSION-xauth.patch
+         SOURCE2=$MODULE-2.2.0-xauth.patch
          SOURCE3=mozilla-source-1.7.5.tar.gz
          SOURCE4=OOo_${VERSION}_src_l10n.tar.bz2
          SOURCE5=OOo_${VERSION}_src_system.tar.bz2
-         SOURCE6=$MODULE-$VERSION-mozilla-cplusplus.patch
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/OOF680_m14
+         SOURCE6=$MODULE-2.2.0-mozilla-cplusplus.patch
+         SOURCE7=OOo_${VERSION}_src_binfilter.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/OOG680_m5
       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/
      SOURCE4_URL=http://ftp.rz.tu-bs.de/pub/mirror/OpenOffice.org/stable/${VERSION}/
      SOURCE5_URL=http://ftp.rz.tu-bs.de/pub/mirror/OpenOffice.org/stable/${VERSION}/
      SOURCE6_URL=$PATCH_URL/
-      SOURCE_VFY=sha1:a3b334c6a855366944e9e1e441a5fbe2f2d7bcb1
+     SOURCE7_URL=http://ftp.rz.tu-bs.de/pub/mirror/OpenOffice.org/stable/${VERSION}/
+      SOURCE_VFY=sha1:339453f169e63f531e24f3d5774e6a5da65b26c1
      SOURCE2_VFY=sha1:58c824ef969b017be5fcd7e4290d7681453aa354
      SOURCE3_VFY=sha1:bb2a89b95d7626a63a3787208e0abb99ea595d24
-     SOURCE4_VFY=sha1:fdb120f18310efb95938cdf30a0855ef8456d346
-     SOURCE5_VFY=sha1:311331016cbc6112e0cf9829d6ef6782acccc01b
+     SOURCE4_VFY=sha1:ca7dcd4d19d1f5df21fb931fe31cdd779128f49c
+     SOURCE5_VFY=sha1:a6c2af424f7ac26adf75b384572fe19975ef355d
      SOURCE6_VFY=sha1:31ee26c90f43f4385a713a8ee64a9ed0801e61d8
+     SOURCE7_VFY=sha1:a45b356092fc61aba68d0b7536bb3f723cd62937
         WEB_SITE=http://www.openoffice.org
          ENTERED=20030805
-         UPDATED=20070404
+         UPDATED=20070924
            PSAFE=no
            SHORT="OpenOffice.org Office Suite"
 cat << EOF

Modified: moonbase/trunk/zbeta/openoffice-src/PRE_BUILD
===================================================================
--- moonbase/trunk/zbeta/openoffice-src/PRE_BUILD	2007-09-24 16:46:33 UTC (rev 25957)
+++ moonbase/trunk/zbeta/openoffice-src/PRE_BUILD	2007-09-24 23:42:16 UTC (rev 25958)
@@ -3,4 +3,5 @@
 cd $SOURCE_DIRECTORY &&
 
 tar xf $SOURCE_CACHE/$SOURCE4 --strip-components=1 &&
-tar xf $SOURCE_CACHE/$SOURCE5 --strip-components=1
+tar xf $SOURCE_CACHE/$SOURCE5 --strip-components=1 &&
+tar xf $SOURCE_CACHE/$SOURCE7 --strip-components=1