Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

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 (75541522b1896a777cdaadbad77d6aa3b6df1156)
  • Date: Sat, 28 Aug 2010 15:37:59 -0500

GIT changes to master grimoire by Arjan Bouter <abouter AT sourcemage.org>:

dev/null |binary
editors/openoffice/BUILD | 4 +-
editors/openoffice/DEPENDS | 12 +++++-
editors/openoffice/DETAILS | 23
+++++-------
editors/openoffice/HISTORY | 3 +
editors/openoffice/OOo_3.2.0_src_binfilter.tar.bz2.sig | 0
editors/openoffice/OOo_3.2.0_src_core.tar.bz2.sig | 0
editors/openoffice/OOo_3.2.0_src_extensions.tar.bz2.sig | 0
editors/openoffice/OOo_3.2.0_src_l10n.tar.bz2.sig | 0
editors/openoffice/OOo_3.2.0_src_testautomation.tar.bz2.sig | 0
editors/openoffice/OOo_3.2.1_src_core.tar.bz2.sig |binary
editors/openoffice/OOo_3.2.1_src_extensions.tar.bz2.sig |binary
editors/openoffice/OOo_3.2.1_src_l10n.tar.bz2.sig |binary
editors/openoffice/PRE_BUILD | 3 -
14 files changed, 26 insertions(+), 19 deletions(-)

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

openoffice: version 3.2.1

diff --git a/editors/openoffice/BUILD b/editors/openoffice/BUILD
index 217805d..060d7f7 100755
--- a/editors/openoffice/BUILD
+++ b/editors/openoffice/BUILD
@@ -21,9 +21,9 @@ cd ${SOURCE_DIRECTORY} &&
--without-myspell-dicts \
--with-system-dicts \
--with-lang="$OOO_LANG" \
- $OPTS &&
+ $OPTS

+sedit 's/testautomation//' instsetoo_native/prj/build.lst &&
source Linux*Env.Set.sh &&
./bootstrap &&
-echo "building with $MAKE_NJOBS make jobs"
nodep=TRUE NO_HIDS=TRUE dmake -P${MAKE_NJOBS}
diff --git a/editors/openoffice/DEPENDS b/editors/openoffice/DEPENDS
index 4938ce9..69917fd 100755
--- a/editors/openoffice/DEPENDS
+++ b/editors/openoffice/DEPENDS
@@ -22,7 +22,7 @@ depends curl '--with-system-curl' &&
depends boost '--with-system-boost' &&
depends hunspell '--with-system-hunspell' &&
depends hyphen '--with-system-altlinuxhyph' &&
-depends mythes '--with-system-mythes' &&
+#depends mythes '--with-system-mythes' &&
# 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' &&
@@ -121,4 +121,12 @@ optional_depends libxaw \
optional_depends openldap \
'--enable-ldap --with-openldap' \
'--disable-ldap --without-openldap' \
- "enable the use of the OpenLDAP LDAP SDK?"
+ "enable the use of the OpenLDAP LDAP SDK?" &&
+optional_depends MYSQL \
+ '--with-system-mysql --enable-mysql-connector' \
+ '--without-system-mysql --disable-mysql-connector' \
+ "build the MySQL Connector/OOo extension?" &&
+optional_depends mysqlcppapi \
+ '--with-system-mysql-cppconn' \
+ '--without-system-mysql-cppconn' \
+ "build the MySQL CPP Connector/OOo extension?"
diff --git a/editors/openoffice/DETAILS b/editors/openoffice/DETAILS
index 81f0887..a1d1cb0 100755
--- a/editors/openoffice/DETAILS
+++ b/editors/openoffice/DETAILS
@@ -1,6 +1,6 @@
SPELL=openoffice
- VERSION='3.2.0'
- BUILD_VERSION=320_m12
+ VERSION='3.2.1'
+ BUILD_VERSION=320_m19

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"
@@ -8,20 +8,17 @@
SOURCE2="OOo_${VERSION}_src_extensions.tar.bz2"
SOURCE2_GPG="gurus.gpg:${SOURCE2}.sig:WORKS_FOR_ME"
SOURCE2_URL[0]=${COMMON_PATH}/${SOURCE2}
- SOURCE3="OOo_${VERSION}_src_testautomation.tar.bz2"
- SOURCE3_GPG="gurus.gpg:${SOURCE3}.sig:WORKS_FOR_ME"
+ SOURCE3="OOo_${VERSION}_src_l10n.tar.bz2"
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"
+ SOURCE3_GPG="gurus.gpg:${SOURCE3}.sig:WORKS_FOR_ME"
if [[ "${OOO_BINFILTER}" = 'y' ]]; then
- SOURCE5="OOo_${VERSION}_src_binfilter.tar.bz2"
- SOURCE5_GPG="gurus.gpg:${SOURCE5}.sig:WORKS_FOR_ME"
- SOURCE5_URL[0]=${COMMON_PATH}/${SOURCE5}
+ SOURCE4="OOo_${VERSION}_src_binfilter.tar.bz2"
+ SOURCE4_GPG="gurus.gpg:${SOURCE4}.sig:WORKS_FOR_ME"
+ SOURCE4_URL[0]=${COMMON_PATH}/${SOURCE4}
fi &&
-# SOURCE6="OOo_${VERSION}_src_system.tar.bz2"
-# SOURCE6_GPG="gurus.gpg:${SOURCE6}.sig:WORKS_FOR_ME"
-# SOURCE6_URL[0]=${COMMON_PATH}/${SOURCE6}
+# SOURCE5="OOo_${VERSION}_src_system.tar.bz2"
+# SOURCE5_GPG="gurus.gpg:${SOURCE5}.sig:WORKS_FOR_ME"
+# SOURCE5_URL[0]=${COMMON_PATH}/${SOURCE5}
SOURCE_DIRECTORY=$BUILD_DIRECTORY/OOO${BUILD_VERSION}
LICENSE[0]=LGPL
WEB_SITE=http://www.openoffice.org
diff --git a/editors/openoffice/HISTORY b/editors/openoffice/HISTORY
index 7ea572d..564a3a1 100644
--- a/editors/openoffice/HISTORY
+++ b/editors/openoffice/HISTORY
@@ -1,3 +1,6 @@
+2010-08-28 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 3.2.1
+
2010-05-20 Eric Sandall <sandalle AT sourcemage.org>
* OOo_3.2.0_src_l10n.tar.bz2.sig: Updated tarball, see
http://bugs.gentoo.org/show_bug.cgi?id=308661
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
deleted file mode 100644
index 0cd1c92..0000000
Binary files a/editors/openoffice/OOo_3.2.0_src_binfilter.tar.bz2.sig and
/dev/null 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
deleted file mode 100644
index f3031c8..0000000
Binary files a/editors/openoffice/OOo_3.2.0_src_core.tar.bz2.sig and
/dev/null 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
deleted file mode 100644
index 53ecc8a..0000000
Binary files a/editors/openoffice/OOo_3.2.0_src_extensions.tar.bz2.sig and
/dev/null 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
deleted file mode 100644
index 06ce0e0..0000000
Binary files a/editors/openoffice/OOo_3.2.0_src_l10n.tar.bz2.sig and
/dev/null 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
deleted file mode 100644
index c122679..0000000
Binary files a/editors/openoffice/OOo_3.2.0_src_testautomation.tar.bz2.sig
and /dev/null differ
diff --git a/editors/openoffice/OOo_3.2.1_src_core.tar.bz2.sig
b/editors/openoffice/OOo_3.2.1_src_core.tar.bz2.sig
new file mode 100644
index 0000000..b205580
Binary files /dev/null and
b/editors/openoffice/OOo_3.2.1_src_core.tar.bz2.sig differ
diff --git a/editors/openoffice/OOo_3.2.1_src_extensions.tar.bz2.sig
b/editors/openoffice/OOo_3.2.1_src_extensions.tar.bz2.sig
new file mode 100644
index 0000000..eca2355
Binary files /dev/null and
b/editors/openoffice/OOo_3.2.1_src_extensions.tar.bz2.sig differ
diff --git a/editors/openoffice/OOo_3.2.1_src_l10n.tar.bz2.sig
b/editors/openoffice/OOo_3.2.1_src_l10n.tar.bz2.sig
new file mode 100644
index 0000000..db29116
Binary files /dev/null and
b/editors/openoffice/OOo_3.2.1_src_l10n.tar.bz2.sig differ
diff --git a/editors/openoffice/PRE_BUILD b/editors/openoffice/PRE_BUILD
index db63a18..a123238 100755
--- a/editors/openoffice/PRE_BUILD
+++ b/editors/openoffice/PRE_BUILD
@@ -2,9 +2,8 @@ cd ${BUILD_DIRECTORY} &&
unpack_file &&
unpack_file '2' &&
unpack_file '3' &&
-unpack_file '4' &&
if [[ "${OOO_BINFILTER}" = 'y' ]]; then
- unpack_file '5'
+ unpack_file '4'
fi &&

cd ${SOURCE_DIRECTORY} &&




Archive powered by MHonArc 2.6.24.

Top of Page