CVS: crater/x11-apps/openoffice-src BUILD, 1.18, 1.19 CONFIGURE, 1.1,
1.2 DEPENDS, 1.5, 1.6 DETAILS, 1.16, 1.17 PRE_BUILD, 1.9,
1.10 build-ooo, 1.13, 1.14
Nick Hudson
nhudson at lunar-linux.org
Fri Oct 31 03:16:45 GMT 2003
Update of /var/cvs/lunar/crater/x11-apps/openoffice-src
In directory dbguin.lunar-linux.org:/tmp/cvs-serv24907
Modified Files:
BUILD CONFIGURE DEPENDS DETAILS PRE_BUILD build-ooo
Log Message:
Updating oo.o-src module so it will build without java support and now it will compile in bonobo support
Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/crater/x11-apps/openoffice-src/BUILD,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- BUILD 11 Oct 2003 13:00:51 -0000 1.18
+++ BUILD 31 Oct 2003 03:16:43 -0000 1.19
@@ -4,10 +4,13 @@
./configure --prefix=/usr \
--sysconfdir=/etc \
--with-system-gcc \
+ --enable-bonobo \
+ --disable-dependency-tracking \
$OPTS &&
- default_make &&
+ default_make &&
- cp /usr/share/gnome/ximian/applications/* /usr/share/applications/
+ cp /usr/share/gnome/ximian/applications/* /usr/share/applications/
+ rm -fr /usr/share/gnome/ximian/
) > $C_FIFO 2>&1
Index: CONFIGURE
===================================================================
RCS file: /var/cvs/lunar/crater/x11-apps/openoffice-src/CONFIGURE,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CONFIGURE 11 Oct 2003 13:26:24 -0000 1.1
+++ CONFIGURE 31 Oct 2003 03:16:43 -0000 1.2
@@ -1,5 +1,5 @@
message "${MESSAGE_COLOR}**WARNING** This module will take alot of time and resources to"
message "compile, just to give you a idea you will need atleast"
message "4GB worth of free space, compile time will depend on"
-message "your CPU and RAM on your system. On a XP 1800+ it took a"
+message "your CPU and RAM on your system. On a Athlon XP 1800+ it took a"
message "good 10-12 hours to compile"
Index: DEPENDS
===================================================================
RCS file: /var/cvs/lunar/crater/x11-apps/openoffice-src/DEPENDS,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- DEPENDS 11 Oct 2003 13:04:35 -0000 1.5
+++ DEPENDS 31 Oct 2003 03:16:43 -0000 1.6
@@ -1,9 +1,6 @@
depends automake &&
-depends libIDL &&
-depends libgnomecanvas &&
depends gnome-vfs2 &&
depends gnome-cups-manager &&
-depends libgnomeui &&
depends Linux-PAM &&
depends libart_lgpl &&
depends startup-notification &&
Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/crater/x11-apps/openoffice-src/DETAILS,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- DETAILS 10 Oct 2003 23:09:47 -0000 1.16
+++ DETAILS 31 Oct 2003 03:16:43 -0000 1.17
@@ -1,22 +1,19 @@
MODULE=openoffice-src
VERSION=1.1.0
- SOURCE=ooo-build-1.1.44.tar.gz
+ SOURCE=ooo-build-1.1.45.tar.gz
SOURCE2=OOO_1_1_0.tar.bz2
SOURCE3=ooo-icons-OOO_1_1-4.tar.gz
- SOURCE4=j2sdk-1.4.1-01-linux-i586-gcc3.2.tar.bz2
SOURCE_URL=http://ooo.ximian.com/packages/OOO_1_1_0/$SOURCE
- SOURCE_VFY=md5:1b1ac3685b82c487afafaf244c86a85e
+ SOURCE_VFY=md5:b0739e30f8a5211758495e90cb787866
SOURCE2_URL=http://ooo.ximian.com/packages/OOO_1_1_0/$SOURCE2
SOURCE2_VFY=md5:4a21da1d8bb5d65360ddd82848ad4b55
SOURCE3_URL=http://ooo.ximian.com/packages/$SOURCE3
SOURCE3_VFY=md5:02548122dd8d435d3e5c2d6ecf2c95d3
- SOURCE4_URL=http://ooo.ximian.com/packages/support/$SOURCE4
- SOURCE4_VFY=md5:ac1cb4ed5e121d25ba1c9a2ff9afa62a
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/ooo-build-1.1.44
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/ooo-build-1.1.45
MAINTAINER=nhudson at lunar-linux.org
WEB_SITE=http://ooo.ximian.com
ENTERED=20030805
- UPDATED=20031011
+ UPDATED=20031031
SHORT="OO.o Office Suite with Ximian Patches"
cat << EOF
OO.o Office Suite with Ximian Patches
Index: PRE_BUILD
===================================================================
RCS file: /var/cvs/lunar/crater/x11-apps/openoffice-src/PRE_BUILD,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- PRE_BUILD 10 Oct 2003 23:09:47 -0000 1.9
+++ PRE_BUILD 31 Oct 2003 03:16:43 -0000 1.10
@@ -1,10 +1,12 @@
-(
+(
+
+
+
default_pre_build &&
cd $SOURCE_DIRECTORY &&
mkdir -p src
cp $SOURCE_CACHE/$SOURCE2 src/ &&
cp $SOURCE_CACHE/$SOURCE3 src/ &&
- cp $SOURCE_CACHE/$SOURCE4 src/ &&
- cp $SCRIPT_DIRECTORY/build-ooo bin/
+ cp $SCRIPT_DIRECTORY/build-ooo bin/
)
Index: build-ooo
===================================================================
RCS file: /var/cvs/lunar/crater/x11-apps/openoffice-src/build-ooo,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- build-ooo 10 Oct 2003 23:11:19 -0000 1.13
+++ build-ooo 31 Oct 2003 03:16:43 -0000 1.14
@@ -32,15 +32,6 @@
GCC_TARBALL=gcc-3.2.2.tar.bz2
GCC_UNTAR_OPTIONS=jxf
-BINUTILS_VER=binutils-2.13.2.1
-BINUTILS_TARBALL=binutils-2.13.2.1.tar.bz2
-BINUTILS_UNTAR_OPTIONS=jxf
-BINUTILS_PATCH=$TOOLSDIR/patches/ld-2.13.2.1.diff
-
-JDK_VER=j2sdk1.4.1
-JDK_TARBALL=j2sdk-1.4.1-01-linux-i586-gcc3.2.tar.bz2
-JDK_UNTAR_OPTIONS=jxf
-
if test "${CVSTAG:0:7}" = "OOO_1_1"; then
OOO_ICONS_VER=ooo-icons-OOO_1_1-4
else
@@ -65,23 +56,6 @@
cd $BUILDDIR
-# unpack the Jdk
-PKG_VER=$JDK_VER
-
-if test -f $BUILDDIR/$PKG_VER/$STAMP; then
- echo "Skipping $PKG_VER";
- ln -sfn $PKG_VER $BUILDDIR/jdk
-else
- echo "Unpacking $PKG_VER";
- cd $BUILDDIR
- if test "z$WITH_SRC" = "z"; then
- tar $JDK_UNTAR_OPTIONS $SRCDIR/$JDK_TARBALL || exit 1;
- fi
-# Link it into where we expect it in the path
- ln -sfn $PKG_VER $BUILDDIR/jdk
- touch $BUILDDIR/$PKG_VER/$STAMP || exit 1;
-fi
-
if test "z$SYSTEM_GCC" = "z"; then
# build binutils
PKG_VER=$BINUTILS_VER
More information about the Lunar-commits
mailing list