Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arjan Bouter (e1f98546fa9602d7d7e220766ac1ae563081b4ba)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Arjan Bouter (e1f98546fa9602d7d7e220766ac1ae563081b4ba)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Arjan Bouter <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arjan Bouter (e1f98546fa9602d7d7e220766ac1ae563081b4ba)
  • Date: Wed, 31 Mar 2010 08:38:16 -0500
GIT changes to master grimoire by Arjan Bouter <abouter AT sourcemage.org>:

dev/null |binary
editors/openoffice/BUILD | 32 +--
editors/openoffice/CONFIGURE | 20 ++
editors/openoffice/CONFLICTS | 1
editors/openoffice/DEPENDS | 107
+++++-------
editors/openoffice/DETAILS | 32 +--
editors/openoffice/HISTORY | 12 +
editors/openoffice/INSTALL | 5
editors/openoffice/OOo_3.1.1_src_binfilter.tar.bz2.sig | 0
editors/openoffice/OOo_3.1.1_src_core.tar.bz2.sig | 0
editors/openoffice/OOo_3.1.1_src_extensions.tar.bz2.sig | 0
editors/openoffice/OOo_3.1.1_src_l10n.tar.bz2.sig | 0
editors/openoffice/OOo_3.1.1_src_system.tar.bz2.sig | 0
editors/openoffice/OOo_3.1.1_src_testautomation.tar.bz2.sig | 0
editors/openoffice/OOo_3.2.0_src_binfilter.tar.bz2.sig |binary
editors/openoffice/OOo_3.2.0_src_core.tar.bz2.sig |binary
editors/openoffice/OOo_3.2.0_src_extensions.tar.bz2.sig |binary
editors/openoffice/OOo_3.2.0_src_l10n.tar.bz2.sig |binary
editors/openoffice/OOo_3.2.0_src_testautomation.tar.bz2.sig |binary
editors/openoffice/PREPARE | 6
editors/openoffice/PRE_BUILD | 7
editors/openoffice/TODO | 11 +
editors/openoffice/getline.patch | 43 ----
editors/openoffice/oo.dict | 18 --
editors/openoffice/oo.languages | 105
-----------
25 files changed, 129 insertions(+), 270 deletions(-)

New commits:
commit e1f98546fa9602d7d7e220766ac1ae563081b4ba
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

openoffice: version 3.2.0, and it works!

diff --git a/editors/openoffice/BUILD b/editors/openoffice/BUILD
index 3fe7130..217805d 100755
--- a/editors/openoffice/BUILD
+++ b/editors/openoffice/BUILD
@@ -1,31 +1,29 @@
-# --with-vendor=\"Source Mage GNU/Linux\" \
-# --with-build-version="\"$(head -n1 ${SPELL_DIRECTORY}/HISTORY
|awk '{print $2, $3}' )\"" \
-# --with-system-headers \
-# --with-system-libs \
-# --with-system-stdlibs \
-
OPTS="${OPTS} ${OOO_OPTS}" &&
if [[ "${OOO_BINFILTER}" = 'n' ]]; then
OPTS="${OPTS} --disable-binfilter"
fi &&
-export PKGFORMAT="installed" &&
-export SRC_ROOT="${SOURCE_DIRECTORY}" &&
+
+if [[ "${MAKE_NJOBS}" = "" ]]; then
+ MAKE_NJOBS=1
+fi

cd ${SOURCE_DIRECTORY} &&
-./configure --prefix=${INSTALL_ROOT}/usr \
+
+./configure --prefix=${INSTALL_ROOT}/opt \
--sysconfdir=${INSTALL_ROOT}/etc \
--localstatedir=${INSTALL_ROOT}/var \
--mandir=${INSTALL_ROOT}/usr/share/man \
--infodir=${INSTALL_ROOT}/usr/share/info \
- --with-dict \
- --with-x \
+ --with-vendor="Source Mage GNU/Linux" \
--disable-epm \
- --disable-odk \
- --disable-mathmldtd \
- --disable-qadevooo \
- --with-vendor="Source\ Mage\ GNU/Linux" \
+ --with-use-shell=bash \
+ --with-system-stdlibs \
+ --without-myspell-dicts \
+ --with-system-dicts \
+ --with-lang="$OOO_LANG" \
$OPTS &&

-./bootstrap &&
source Linux*Env.Set.sh &&
-dmake
+./bootstrap &&
+echo "building with $MAKE_NJOBS make jobs"
+nodep=TRUE NO_HIDS=TRUE dmake -P${MAKE_NJOBS}
diff --git a/editors/openoffice/CONFIGURE b/editors/openoffice/CONFIGURE
index 62d78d2..56fa38b 100755
--- a/editors/openoffice/CONFIGURE
+++ b/editors/openoffice/CONFIGURE
@@ -1,3 +1,5 @@
+source $GRIMOIRE/FUNCTIONS &&
+
config_query_option OOO_OPTS "build QuickStart systray plugin?" n \
"--enable-systray" \
"--disable-systray" &&
@@ -18,4 +20,20 @@ config_query_option OOO_OPTS "enable the PDF Import
extension and Xpdf?" n \
"--disable-pdfimport" &&
config_query_option OOO_OPTS "enable the VBA compatibility feature?" n \
"--with-vba-package-format=builtin" \
- "--disable-vba"
+ "--disable-vba" &&
+config_query_option OOO_OPTS 'install the OOo SDK (not needed)' n \
+ '--enable-odk' \
+ '--disable-odk' &&
+config_query_option OOO_OPTS 'install mathmldtd?' n \
+ '--enable-mathmldtd' \
+ '--disable-mathmldtd' &&
+config_query_option OOO_OPTS 'install the OOo dev testsuite? (not needed)' n
\
+ '--enable-qadevooo' \
+ '--disable-qadevooo' &&
+config_query_multi OOO_LANG \
+ 'Which localizations do you want to support? (en-US is always
enabled)' \
+ af ar as ast be-BY bg bn bo br brx bs ca cs cy da de dgo dz el en-GB \
+ en-ZA eo es et eu fa fi fr ga gl gu he hi-IN hr hu id is it ja ka kid
kk \
+ km kn ko kok ks ku lt lv mai mk ml mn mni mr my nb ne nl nn nr ns oc
om \
+ or pa-IN pap pl pt pt-BR ro ru rw sa-IN sat sd sh si sk sl sr ss st sv
\
+ sw-TZ ta te tg th tn tr ts ug uk ur uz ve vi xh zh-CN zh-TW zu
diff --git a/editors/openoffice/CONFLICTS b/editors/openoffice/CONFLICTS
index 67fa1b1..e57273a 100755
--- a/editors/openoffice/CONFLICTS
+++ b/editors/openoffice/CONFLICTS
@@ -1,4 +1,3 @@
-conflicts openoffice &&
conflicts openoffice-bin &&
conflicts openoffice2-bin &&
conflicts openoffice3-bin
diff --git a/editors/openoffice/DEPENDS b/editors/openoffice/DEPENDS
index 8244beb..e612a61 100755
--- a/editors/openoffice/DEPENDS
+++ b/editors/openoffice/DEPENDS
@@ -1,53 +1,55 @@
-# good old fashioned hard dependencies, with or without options
-depends gmp &&
-depends freetype2 &&
-depends archive-zip &&
-depends zip '--with-zip-home=/usr/bin/zip' &&
-depends unzip '--with-unzip-home=/usr/bin/uzip' &&
+# good old fashioned hard dependencies
+depends freetype2 &&
+depends archive-zip &&
+depends zip &&
+depends unzip &&

-# dependencies that are required but will use local versions when missing
-optional_depends libwpd '--with-system-libwpd' '' 'use system libpwd' &&
-optional_depends icu '--with-system-icu' '' 'use system ICU?' &&
-optional_depends python '--with-system-python' '' 'use system python?' &&
-optional_depends db '--with-system-db' '--without-system-db' 'use system
db?' &&
-#optional_depends lucene '--with-system-lucene' '' 'use system Lucene?' &&
-optional_depends expat '--with-system-expat' '' 'use system expat?' &&
-optional_depends libxml2 '--with-system-libxml' '' 'use system libxml2?
(recommended)' &&
-optional_depends libxslt '--with-system-libxslt' '' 'use system libxslt?
(recommended)' &&
-optional_depends jpeg '--with-system-jpeg' '' 'use system JPEG?' &&
-optional_depends openssl '--with-system-openssl' '' 'use system OpenSSL?
(recommended)' &&
-optional_depends zlib '--with-system-zlib' '' 'use system zlib?
(recommended)' &&
-optional_depends poppler '--with-system-poppler' '' 'use system poppler?'
&&
-optional_depends curl '--with-system-curl' '' 'use system curl?' &&
-optional_depends boost '--with-system-boost' '' 'use system boost?' &&
-optional_depends hunspell '--with-system-hunspell' '' 'enable system
hunspell?' &&
-optional_depends stlport "--with-stlport=${INSTALL_ROOT}/usr"
'--without-stlport' 'use system stlport? (not recommended)' &&
-optional_depends ant "--with-ant-home=${INSTALL_ROOT}/usr" '' 'enable system
ant?' &&
-optional_depends vigra '--with-system-vigra' '--without-system-vigra'
'enable system vigra?' &&
+# dependencies that are required but will use included
+# OOo versions when missing (some of them might be in the openoffice
'system' tarball)
+depends libwpd '--with-system-libwpd' &&
+depends icu '--with-system-icu' &&
+depends python '--with-system-python' &&
+depends db '--with-system-db' &&
+depends expat '--with-system-expat' &&
+depends libxml2 '--with-system-libxml' &&
+depends libxslt '--with-system-libxslt' &&
+depends jpeg '--with-system-jpeg' &&
+depends openssl '--with-system-openssl' &&
+depends zlib '--with-system-zlib' &&
+depends poppler '--with-system-poppler' &&
+depends curl '--with-system-curl' &&
+depends boost '--with-system-boost' &&
+depends hunspell '--with-system-hunspell' &&
+depends hyphen '--with-system-altlinuxhyph' &&
+# just weird, it needs to be installed but OOo won't build when you specify
--with-stlport
+depends stlport "--without-stlport" &&
+depends vigra '--with-system-vigra' &&
+depends sane-backends '--with-system-sane-header' &&
+depends lp_solve '--with-system-lpsolve' &&
+depends libxrender '--with-system-xrender-headers' &&
+depends ttf-bitstream-vera '--without-fonts --without-afms' &&

# regular optional dependencies
-optional_depends tcsh \
- '--with-use-shell=tcsh' \
- '--with-use-shell=bash' \
- 'use TCSH instead of BASH (default)' &&
optional_depends ODBC-MGR \
'--with-system-odbc --with-system-odbc-headers' \
'' \
'enable ODBC database access? (recommended)' &&
optional_depends JAVA \
'--with-java --with-system-jars' \
- '--without-java --without-system-jars' \
+ '--without-java' \
'enable JAVA support?' &&
if (is_depends_enabled ${SPELL} JAVA); then
+ depends ant "--with-ant-home=${INSTALL_ROOT}/usr" &&
+ depends lucene '--with-system-lucene' &&
optional_depends gcj \
'--enable-gcjaot' \
'--disable-gcjaot' \
'Build with[out] using Ahead of Time java compilation?'
fi &&
-optional_depends GTK2 \
- '--enable-gtk' \
- '--disable-gtk' \
- 'use GTK vclplug? (recommended)' &&
+optional_depends GTK2 \
+ '--enable-gtk' \
+ '--disable-gtk' \
+ 'use GTK vclplug? (recommended)' &&
if [[ "$(get_spell_provider ${SPELL} GTK2)" = 'gtk+2' ]] || \
[[ "$(get_spell_provider ${SPELL} GTK2)" = 'gtk+2-directfb' ]]; then
optional_depends gconf2 \
@@ -57,15 +59,16 @@ optional_depends gconf2 \
optional_depends evolution \
'--enable-evolution2' \
'--disable-evolution2' \
- 'use evolution?' &&
+ 'enable use of evolution addressbook?' &&
optional_depends gnome-vfs2 \
'--enable-gnome-vfs' \
'--disable-gnome-vfs' \
'enable GNOME virtual filesystem support?'
fi &&
+#probably wrong, but I have no idea what to include for KDE and which
version ;)
optional_depends kdebase4 \
- '--enable-kde --enable-kdeab' \
- '--disable-kde --disable-kdeab' \
+ '--enable-kde4 --enable-kdeab' \
+ '--disable-kde4 --disable-kdeab' \
'enable KDE addressbook and vclplugin' &&
optional_depends cairo \
'--enable-cairo --with-system-cairo' \
@@ -79,28 +82,20 @@ optional_depends libxrandr \
'--enable-randr' \
'--disable-randr' \
'enable RandR support in the vcl project?' &&
-optional_depends libxrender \
- '--with-system-xrender-headers' \
- '' \
- 'use system libxrender?' &&
optional_depends agg \
- '--with-agg --with-system-agg' \
+ '--with-agg' \
'--without-agg' \
'enable agg support?' &&
# I'm only testing with xulrunner, feel free to add others ;)
optional_depends xulrunner \
- '--disable-mozilla --with-system-mozilla=xulrunner' \
- '--disable-build-mozilla' \
+ '--with-system-mozilla=xulrunner' \
+ '--disable-mozilla' \
"use xulrunner instead of 'strangely hacked up mozilla
binary'? (recommended)" &&
-#always --without-ppds. not needed without and provided with cups
+#always --without-ppds. not needed without cups or provided by cups
optional_depends CUPS \
'--enable-cups --without-ppds' \
'--disable-cups --without-ppds' \
'use CUPS in the psprint project?' &&
-optional_depends sane-backends \
- '--with-system-sane-header' \
- '' \
- 'use sane backends?' &&
optional_depends fontconfig \
'--enable-fontconfig --disable-fontooo' \
'--disable-fontconfig --enable-fontooo' \
@@ -109,11 +104,10 @@ optional_depends dbus \
'--enable-dbus' \
'--disable-dbus' \
'use D-BUS for screensaver control?' &&
-#probably wrong, but I have no idea what to include for KDE and which
version ;)
optional_depends linux-pam \
'--enable-pam' \
'--disable-pam' \
- 'use Linux-PAM?' &&
+ 'enable PAM support?' &&
optional_depends neon \
'--enable-neon --with-system-neon' \
'--disable-neon' \
@@ -125,13 +119,4 @@ optional_depends libxaw \
optional_depends openldap \
'--enable-ldap --with-openldap' \
'--disable-ldap --without-openldap' \
- "enable the use of the OpenLDAP LDAP SDK?" &&
-optional_depends rpm \
- '--enable-epm' \
- '--disable-epm' \
- "enable self-packaging code? (not recommended)" &&
-# this one is intentionally reversed
-optional_depends ttf-bitstream-vera \
- '--without-fonts' \
- '--with-fonts' \
- 'use system provided font instead of packaged version?
(recommended)'
+ "enable the use of the OpenLDAP LDAP SDK?"
diff --git a/editors/openoffice/DETAILS b/editors/openoffice/DETAILS
index df2035d..347ada9 100755
--- a/editors/openoffice/DETAILS
+++ b/editors/openoffice/DETAILS
@@ -1,45 +1,41 @@
SPELL=openoffice
- VERSION=3.1.1
- BUILD_VERSION=310_m19
+ VERSION='3.2.0'
+ BUILD_VERSION=320_m12
+
COMMON_PATH="http://download.services.openoffice.org/files/stable/${VERSION}";
SOURCE="OOo_${VERSION}_src_core.tar.bz2"
SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+ SOURCE_URL[0]=${COMMON_PATH}/${SOURCE}
SOURCE2="OOo_${VERSION}_src_extensions.tar.bz2"
SOURCE2_GPG="gurus.gpg:${SOURCE2}.sig:WORKS_FOR_ME"
- SOURCE3="OOo_${VERSION}_src_system.tar.bz2"
+ SOURCE2_URL[0]=${COMMON_PATH}/${SOURCE2}
+ SOURCE3="OOo_${VERSION}_src_testautomation.tar.bz2"
SOURCE3_GPG="gurus.gpg:${SOURCE3}.sig:WORKS_FOR_ME"
+ SOURCE3_URL[0]=${COMMON_PATH}/${SOURCE3}
SOURCE4="OOo_${VERSION}_src_l10n.tar.bz2"
+ SOURCE4_URL[0]=${COMMON_PATH}/${SOURCE4}
SOURCE4_GPG="gurus.gpg:${SOURCE4}.sig:WORKS_FOR_ME"
- COMMON_PATH=openoffice/stable/${VERSION}
- SOURCE_URL[0]=http://mirrors.isc.org/pub/${COMMON_PATH}/${SOURCE}
- SOURCE2_URL[0]=http://mirrors.isc.org/pub/${COMMON_PATH}/${SOURCE2}
- SOURCE3_URL[0]=http://mirrors.isc.org/pub/${COMMON_PATH}/${SOURCE3}
- SOURCE4_URL[0]=http://mirrors.isc.org/pub/${COMMON_PATH}/${SOURCE4}
if [[ "${OOO_BINFILTER}" = 'y' ]]; then
SOURCE5="OOo_${VERSION}_src_binfilter.tar.bz2"
SOURCE5_GPG="gurus.gpg:${SOURCE5}.sig:WORKS_FOR_ME"
- SOURCE5_URL[0]=http://mirrors.isc.org/pub/${COMMON_PATH}/${SOURCE5}
-fi &&
-if [[ "${OOO_TEST}" = 'y' ]]; then
- SOURCE6="OOo_${VERSION}_src_testautomation.tar.bz2"
- SOURCE6_GPG="gurus.gpg:${SOURCE6}.sig:WORKS_FOR_ME"
- SOURCE6_URL[0]=http://mirrors.isc.org/pub/${COMMON_PATH}/${SOURCE6}
+ SOURCE5_URL[0]=${COMMON_PATH}/${SOURCE5}
fi &&
+# SOURCE6="OOo_${VERSION}_src_system.tar.bz2"
+# SOURCE6_GPG="gurus.gpg:${SOURCE6}.sig:WORKS_FOR_ME"
+# SOURCE6_URL[0]=${COMMON_PATH}/${SOURCE6}
SOURCE_DIRECTORY=$BUILD_DIRECTORY/OOO${BUILD_VERSION}
LICENSE[0]=LGPL
WEB_SITE=http://www.openoffice.org
ENTERED=20080909
ARCHIVE="off"
- SHORT="The binary version of OpenOffice 3"
+ SHORT="OpenOffice 3"
cat << EOF
OpenOffice.org is the open source project through which Sun Microsystems has
released the technology for the popular StarOffice[tm] Productivity Suite.
All of the StarOffice code is available under the GNU Lesser General Public
License (LGPL) as well as the Sun Industry Standards Source License (SISSL).

-Sun is participating as a member of the OpenOffice.org community.
-OpenOffice.org is being hosted by CollabNet.
-
The suite includes:
+sbase - A database application
scalc - A spreadsheet application
sdraw - A vector drawing program
simpress - A presentation program
diff --git a/editors/openoffice/HISTORY b/editors/openoffice/HISTORY
index ca0e852..95a864d 100644
--- a/editors/openoffice/HISTORY
+++ b/editors/openoffice/HISTORY
@@ -1,3 +1,15 @@
+2010-03-26 Arjan Bouter <abouter AT sourcemage.org>
+ * BUILD,CONFIGURE,CONFLICTS,DEPENDS,INSTALL,PRE_BUILD,PREPARE,DETAILS:
+ version 3.2.0 and the spell works!
+ * TODO: added list of things to check and/or repair
+
+2009-09-01 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS,PREPARE,PREBUILD: made some tarballs optional
+ * BUILD,CONFIGURE: moved more options to CONFIGURE
+ * DEPENDS: switched from OOo to system libs and headers
+ where it was optional.
+ * getline.patch: removed
+
2009-08-31 Arjan Bouter <abouter AT sourcemage.org>
* version 3.1.1 and various other fixes.
still work in progress.
diff --git a/editors/openoffice/INSTALL b/editors/openoffice/INSTALL
new file mode 100755
index 0000000..1e71faa
--- /dev/null
+++ b/editors/openoffice/INSTALL
@@ -0,0 +1,5 @@
+dmake install --prefix="${INSTALL_ROOT}/opt" &&
+OOO_APPPATH="${INSTALL_ROOT}/opt/openoffice/openoffice.org3/program" &&
+for app in sbase scalc sdraw simpress smath soffice spadmin swriter ; do
+ ln -s "${OOO_APPPATH}/$app" ${INSTALL_ROOT}/usr/bin/$app
+done
diff --git a/editors/openoffice/OOo_3.1.1_src_binfilter.tar.bz2.sig
b/editors/openoffice/OOo_3.1.1_src_binfilter.tar.bz2.sig
deleted file mode 100644
index bc60eab..0000000
Binary files a/editors/openoffice/OOo_3.1.1_src_binfilter.tar.bz2.sig and
/dev/null differ
diff --git a/editors/openoffice/OOo_3.1.1_src_core.tar.bz2.sig
b/editors/openoffice/OOo_3.1.1_src_core.tar.bz2.sig
deleted file mode 100644
index 0675bf7..0000000
Binary files a/editors/openoffice/OOo_3.1.1_src_core.tar.bz2.sig and
/dev/null differ
diff --git a/editors/openoffice/OOo_3.1.1_src_extensions.tar.bz2.sig
b/editors/openoffice/OOo_3.1.1_src_extensions.tar.bz2.sig
deleted file mode 100644
index 249e7df..0000000
Binary files a/editors/openoffice/OOo_3.1.1_src_extensions.tar.bz2.sig and
/dev/null differ
diff --git a/editors/openoffice/OOo_3.1.1_src_l10n.tar.bz2.sig
b/editors/openoffice/OOo_3.1.1_src_l10n.tar.bz2.sig
deleted file mode 100644
index 766fd83..0000000
Binary files a/editors/openoffice/OOo_3.1.1_src_l10n.tar.bz2.sig and
/dev/null differ
diff --git a/editors/openoffice/OOo_3.1.1_src_system.tar.bz2.sig
b/editors/openoffice/OOo_3.1.1_src_system.tar.bz2.sig
deleted file mode 100644
index 7126f52..0000000
Binary files a/editors/openoffice/OOo_3.1.1_src_system.tar.bz2.sig and
/dev/null differ
diff --git a/editors/openoffice/OOo_3.1.1_src_testautomation.tar.bz2.sig
b/editors/openoffice/OOo_3.1.1_src_testautomation.tar.bz2.sig
deleted file mode 100644
index 7db0c77..0000000
Binary files a/editors/openoffice/OOo_3.1.1_src_testautomation.tar.bz2.sig
and /dev/null differ
diff --git a/editors/openoffice/OOo_3.2.0_src_binfilter.tar.bz2.sig
b/editors/openoffice/OOo_3.2.0_src_binfilter.tar.bz2.sig
new file mode 100644
index 0000000..0cd1c92
Binary files /dev/null and
b/editors/openoffice/OOo_3.2.0_src_binfilter.tar.bz2.sig differ
diff --git a/editors/openoffice/OOo_3.2.0_src_core.tar.bz2.sig
b/editors/openoffice/OOo_3.2.0_src_core.tar.bz2.sig
new file mode 100644
index 0000000..f3031c8
Binary files /dev/null and
b/editors/openoffice/OOo_3.2.0_src_core.tar.bz2.sig differ
diff --git a/editors/openoffice/OOo_3.2.0_src_extensions.tar.bz2.sig
b/editors/openoffice/OOo_3.2.0_src_extensions.tar.bz2.sig
new file mode 100644
index 0000000..53ecc8a
Binary files /dev/null and
b/editors/openoffice/OOo_3.2.0_src_extensions.tar.bz2.sig differ
diff --git a/editors/openoffice/OOo_3.2.0_src_l10n.tar.bz2.sig
b/editors/openoffice/OOo_3.2.0_src_l10n.tar.bz2.sig
new file mode 100644
index 0000000..d557492
Binary files /dev/null and
b/editors/openoffice/OOo_3.2.0_src_l10n.tar.bz2.sig differ
diff --git a/editors/openoffice/OOo_3.2.0_src_testautomation.tar.bz2.sig
b/editors/openoffice/OOo_3.2.0_src_testautomation.tar.bz2.sig
new file mode 100644
index 0000000..c122679
Binary files /dev/null and
b/editors/openoffice/OOo_3.2.0_src_testautomation.tar.bz2.sig differ
diff --git a/editors/openoffice/PREPARE b/editors/openoffice/PREPARE
index 89c9577..d1c7c1e 100755
--- a/editors/openoffice/PREPARE
+++ b/editors/openoffice/PREPARE
@@ -1,2 +1,4 @@
-config_query OOO_BINFILTER 'enable legacy binary file formats filters?' n
&&
-config_query OOO_TEST 'enable testautomation?' n
+message "${PROBLEM_COLOR}OpenOffice.org needs lots of space to
build.${DEFAULT_COLOR}" &&
+message "${PROBLEM_COLOR}expect anything from 6 to 10 GB${DEFAULT_COLOR}" &&
+query 'Do you have that much space available in your build directory?' n &&
+config_query OOO_BINFILTER 'enable legacy binary file formats filters?' n
diff --git a/editors/openoffice/PRE_BUILD b/editors/openoffice/PRE_BUILD
index d0448e0..f5b6598 100755
--- a/editors/openoffice/PRE_BUILD
+++ b/editors/openoffice/PRE_BUILD
@@ -6,8 +6,7 @@ unpack_file '4' &&
if [[ "${OOO_BINFILTER}" = 'y' ]]; then
unpack_file '5'
fi &&
-if [[ "${OOO_TEST}" = 'y' ]]; then
- unpack_file '6'
-fi &&
+
cd ${SOURCE_DIRECTORY} &&
-patch -p0 < ${SPELL_DIRECTORY}/getline.patch
+#somehow they forgot that db versions above 4.7 could be written one day ;)
+sedit 's#1 7#1 9#' configure
diff --git a/editors/openoffice/TODO b/editors/openoffice/TODO
new file mode 100644
index 0000000..8095f7a
--- /dev/null
+++ b/editors/openoffice/TODO
@@ -0,0 +1,11 @@
+* alter and copy the desktopfiles into /usr/share/applications
+ so they are shown in the windowmanager menu
+* the extensions and l10n tarballs could be optional, maybe...
+* JAVA support, not tested at all
+* fix JAVA based dependencies (write spells, fix chained dependencies)
+* hsqldb spell needs to be written
+* graphite spell may need to be written
+* figure out dictionaries
+* figure out hyphenation (hyphen, mythes)
+* figure out spelling (myspell, hunspell)
+* smgl themed bitmaps maybe? (--with-intro-bitmaps --with-about-bitmaps)
diff --git a/editors/openoffice/getline.patch
b/editors/openoffice/getline.patch
deleted file mode 100644
index 74420f7..0000000
--- a/editors/openoffice/getline.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- soltools/mkdepend/def.h.orig 2009-05-18 15:28:59.000000000 +0200
-+++ soltools/mkdepend/def.h 2009-05-18 15:29:36.000000000 +0200
-@@ -154,7 +154,7 @@
-
- char *copy();
- char *base_name();
--char *getline();
-+char *ooo_getline();
- char *isdefined();
- struct filepointer *getfile();
- struct inclist *newinclude();
---- soltools/mkdepend/main.c.orig 2009-05-18 15:29:08.000000000 +0200
-+++ soltools/mkdepend/main.c 2009-05-18 15:30:23.000000000 +0200
-@@ -548,7 +548,7 @@
- * Get the next line. We only return lines beginning with '#' since that
- * is all this program is ever interested in.
- */
--char *getline(filep)
-+char *ooo_getline(filep)
- register struct filepointer *filep;
- {
- register char *p, /* walking pointer */
---- soltools/mkdepend/parse.c.orig 2009-05-18 15:29:17.000000000 +0200
-+++ soltools/mkdepend/parse.c 2009-05-18 15:30:43.000000000 +0200
-@@ -45,7 +45,7 @@
- register int type;
- boolean recfailOK;
-
-- while ((line = getline(filep))) {
-+ while ((line = ooo_getline(filep))) {
- switch(type = deftype(line, filep, file_red, file, TRUE,
symbols)) {
- case IF:
- doif:
-@@ -168,7 +168,7 @@
- register char *line;
- register int type;
-
-- while ((line = getline(filep))) {
-+ while ((line = ooo_getline(filep))) {
- switch(type = deftype(line, filep, file_red, file, FALSE,
symbols)) {
- case IF:
- case IFFALSE:
-
diff --git a/editors/openoffice/oo.dict b/editors/openoffice/oo.dict
deleted file mode 100644
index c662bb6..0000000
--- a/editors/openoffice/oo.dict
+++ /dev/null
@@ -1,18 +0,0 @@
-da_DA
-Danish
-off
-en_GB
-English_(Great_Britian)
-off
-en_US
-English_(United_States)
-off
-de_DE
-German
-off
-it_IT
-Italian
-off
-ru_RU
-Russian
-off
diff --git a/editors/openoffice/oo.languages b/editors/openoffice/oo.languages
deleted file mode 100644
index d86e4c3..0000000
--- a/editors/openoffice/oo.languages
+++ /dev/null
@@ -1,105 +0,0 @@
-ar
-Arabic
-off
-ca
-Catalan
-off
-zh-CN
-Chinese_(Simplified)
-off
-zh-TW
-Chinese_(Traditional)
-off
-hr-HR
-Croatian
-off
-cs
-Czech
-off
-da
-Danish
-off
-nl
-Dutch
-off
-en-GB
-English_(Great_Britian)
-off
-en-US
-English_(United_States)
-off
-et
-Estonian
-off
-fi
-Finnish
-off
-fr
-French
-off
-de
-German
-off
-el
-Greek
-off
-he
-Hebrew
-off
-hi-IN
-Hindi
-off
-hu
-Hungarian
-off
-it
-Italian
-off
-ja
-Japanese
-off
-ko
-Korean
-off
-no
-Norwegian
-off
-pl
-Polish
-off
-pt-BR
-Portuguese_(Brazil)
-off
-pt
-Portuguese_(Portugal)
-off
-ru
-Russian
-off
-sr-YU
-Serbian_Cyrillic
-off
-sh-YU
-Serbian_Latin
-off
-sk
-Slovak
-off
-sl-SI
-Slovenian
-off
-es
-Spanish
-off
-sv
-Sweedish
-off
-th
-Thai
-off
-tr
-Turkish
-off
-uk-UA
-Ukrainian
-off


Archive powered by MHonArc 2.6.24.

Top of Page