Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-openoffice grimoire by Martin Spitzbarth (5b174f462a0591a7998f7ae9a27c0655490ba2e8)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Martin Spitzbarth <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-openoffice grimoire by Martin Spitzbarth (5b174f462a0591a7998f7ae9a27c0655490ba2e8)
  • Date: Thu, 17 Jan 2008 08:10:32 -0600

GIT changes to devel-openoffice grimoire by Martin Spitzbarth
<m.spitzbarth AT gmx.de>:

dev/null |binary
editors/openoffice/BUILD | 11 ++++++-----
editors/openoffice/DETAILS | 19 +++++++++++++++----
editors/openoffice/HISTORY | 4 ++++
editors/openoffice/INSTALL | 5 +++--
editors/openoffice/OOo_2.3.0_src_core.tar.bz2.sig | 0
editors/openoffice/PRE_BUILD | 5 +++++
7 files changed, 33 insertions(+), 11 deletions(-)

New commits:
commit 5b174f462a0591a7998f7ae9a27c0655490ba2e8
Author: Martin Spitzbarth <m.spitzbarth AT gmx.de>
Commit: Martin Spitzbarth <m.spitzbarth AT gmx.de>

openoffice: WIP, it compiles with saying "no" to everything. Private
branch

diff --git a/editors/openoffice/BUILD b/editors/openoffice/BUILD
index 8a912cb..a329d8f 100755
--- a/editors/openoffice/BUILD
+++ b/editors/openoffice/BUILD
@@ -1,6 +1,6 @@
OPTS="$OPENOFFICE_ODK \
$OPENOFFICE_QA \
- --disable-epm \
+ --with-package-format=native \
--disable-ldap \
--disable-mozilla \
--without-gpc \
@@ -19,10 +19,11 @@ if ! check_if_xorg_modular_server; then
$OPTS"
fi &&

-if [[ "$(get_spell_provider $SPELL JAVA)" == "gcj" ]]; then
- OPTS="--with-java=gij \
- $OPTS"
-fi &&
+# if [[ "$(get_spell_provider $SPELL JAVA)" == "gcj" ]]; then
+# OPTS="--with-java=gij \
+# $OPTS"
+# fi &&
+OPTS="--without-java $OPTS"

source $INSTALL_ROOT/etc/profile.d/java.sh &&
source $INSTALL_ROOT/etc/profile.d/ant.sh &&
diff --git a/editors/openoffice/DETAILS b/editors/openoffice/DETAILS
index e28b483..9ec2514 100755
--- a/editors/openoffice/DETAILS
+++ b/editors/openoffice/DETAILS
@@ -1,12 +1,23 @@
SPELL=openoffice
- VERSION=2.3.0
+ VERSION=2.3.1
SOURCE=OOo_${VERSION}_src_core.tar.bz2
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-# SOURCE_HASH=sha1:55b316209eaabf151a59ead2abc3c621502058ea
- SOURCE_DIRECTORY=$BUILD_DIRECTORY/OOG680_m5
+ SOURCE2="OOo_${VERSION}_src_system.tar.bz2"
+ SOURCE3="OOo_${VERSION}_src_binfilter.tar.bz2"
+ SOURCE4="OOo_${VERSION}_src_sdk.tar.bz2"
+ SOURCE5="OOo_${VERSION}_src_l10n.tar.bz2"
+
SOURCE_HASH=sha512:ca90b8b265c1eeccdee228780879cfc07a4312830222da29048279ec2b2a67baf9cdad9bec8899ee30c7b5318847119ca4bf04192b02fde073f7ee469d4e9ac8
+
SOURCE2_HASH=sha512:99e046a1d874f30cf19bd3f661c21367542bb28a47de876c92f21fc0975c23b0ee6acf101c017bb289654905660cdeffaec68d0aabe738b39a20da8f8fb4cd61
+
SOURCE3_HASH=sha512:eb55c8ac786398b9d6477f90eb36a11563c33840582401d63f2cf9043a5c863af626fa1bad132208854ab17652fcc813e96e4bc31d86fe4315c6b18821d00fd0
+
SOURCE4_HASH=sha512:5e9a72d3c1a9190016123ecd42e533f7db7ac0f88e982ab83a8857e9740b0e49500c3cab1cb8fd42ec9be949933abb9ac2d76d14bd47766693ebeaa379855e60
+
SOURCE5_HASH=sha512:376124da8986df2f16f90005fc95fba00e6c74152e937c3ac672baf6db843cd583f374da6b1226d201197096057095fc492989120e429145ec12dced395b3d28
+ SOURCE_DIRECTORY=$BUILD_DIRECTORY/OOG680_m9
SOURCE_URL[0]=ftp://ftp.osuosl.org/pub/openoffice/stable/$VERSION/$SOURCE

SOURCE_URL[1]=http://www.mirror.ac.uk/mirror/sunsite.dk/openoffice/stable/$VERSION/$SOURCE

SOURCE_URL[2]=http://www.ring.gr.jp/archives/misc/openoffice/stable/$VERSION/$SOURCE
+
SOURCE2_URL[0]="ftp://ftp-1.gwdg.de/pub/openoffice/stable/${VERSION}/${SOURCE2}";
+
SOURCE3_URL[0]="ftp://ftp-1.gwdg.de/pub/openoffice/stable/${VERSION}/${SOURCE3}";
+
SOURCE4_URL[0]="ftp://ftp-1.gwdg.de/pub/openoffice/stable/${VERSION}/${SOURCE4}";
+
SOURCE5_URL[0]="ftp://ftp-1.gwdg.de/pub/openoffice/stable/${VERSION}/${SOURCE5}";
LICENSE[0]=GPL
WEB_SITE=http://www.openoffice.org/
KEYWORDS="editors"
diff --git a/editors/openoffice/HISTORY b/editors/openoffice/HISTORY
index 292adda..0ba598c 100644
--- a/editors/openoffice/HISTORY
+++ b/editors/openoffice/HISTORY
@@ -1,3 +1,7 @@
+2007-01-15 Martin Spitzbarth <m.spitzbarth AT gmx.de>
+ * Fix this history entry. The spell compiles now with
+ saying "no" to everything
+
2007-09-23 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 2.3.0
Removed deprecated MAKE_NJOBS=1
diff --git a/editors/openoffice/INSTALL b/editors/openoffice/INSTALL
index 20d82d1..7c0a0c8 100755
--- a/editors/openoffice/INSTALL
+++ b/editors/openoffice/INSTALL
@@ -1,5 +1,6 @@
- ./install --prefix=/opt
&&
+cp -r
$SOURCE_DIRECTORY/instsetoo_native/unxlngx6.pro/OpenOffice/native/install/en-US/linux-2.6-x86_64/buildroot/opt/openoffice.org2.3
/opt/openoffice &&
+
for APP in swriter scalc sdraw simpress smath soffice
do rm -f /usr/bin/$APP &&
ln -sf $TRACK_ROOT/opt/openoffice/program/$APP /usr/bin/$APP
- done
\ No newline at end of file
+ done
diff --git a/editors/openoffice/OOo_2.3.0_src_core.tar.bz2.sig
b/editors/openoffice/OOo_2.3.0_src_core.tar.bz2.sig
deleted file mode 100644
index 59fbf98..0000000
Binary files a/editors/openoffice/OOo_2.3.0_src_core.tar.bz2.sig and
/dev/null differ
diff --git a/editors/openoffice/PRE_BUILD b/editors/openoffice/PRE_BUILD
new file mode 100755
index 0000000..bae41f5
--- /dev/null
+++ b/editors/openoffice/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+unpack_file 2 &&
+unpack_file 3 &&
+unpack_file 4 &&
+unpack_file 5




Archive powered by MHonArc 2.6.24.

Top of Page