[Lunar-commits] <moonbase> openoffice-src: updated to 3.1.0
Zbigniew Luszpinski
zbiggy at lunar-linux.org
Wed May 20 20:55:20 CEST 2009
commit c533a62ff83bdd90814d809463be15e3aeb8e100
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date: Wed May 20 20:55:20 2009 +0200
openoffice-src: updated to 3.1.0
---
x11-apps/openoffice-src/BUILD | 15 +++++++--
x11-apps/openoffice-src/BUILD.x86_64 | 16 +++++++--
x11-apps/openoffice-src/DEPENDS | 56 ++++++++++++++++----------------
x11-apps/openoffice-src/DETAILS | 21 +++++-------
x11-apps/openoffice-src/DETAILS.x86_64 | 19 ++++------
x11-apps/openoffice-src/PRE_BUILD | 2 +-
6 files changed, 71 insertions(+), 58 deletions(-)
diff --git a/x11-apps/openoffice-src/BUILD b/x11-apps/openoffice-src/BUILD
index b2175ee..5f9089e 100644
--- a/x11-apps/openoffice-src/BUILD
+++ b/x11-apps/openoffice-src/BUILD
@@ -1,6 +1,17 @@
(
- patch_it $SOURCE_CACHE/$SOURCE8 0 &&
+ cd $SOURCE_DIRECTORY &&
+ for file in `find . -name \*.patch -type f -exec grep -l '
$' {} \;`; do sedit 's/
$//' $file; done &&
+ cd apache-commons/download &&
+ tar -xzpf commons-codec-1.3-src.tar.gz &&
+ tar -xzpf commons-logging-1.1.1-src.tar.gz &&
+ cd - &&
+ for file in `find . -name build.xml -type f -exec grep -l '
$' {} \;`; do sedit 's/
$//' $file; done &&
+ cd apache-commons/download &&
+ tar -czf commons-codec-1.3-src.tar.gz commons-codec-1.3 &&
+ tar -czf commons-logging-1.1.1-src.tar.gz commons-logging-1.1.1-src &&
+ rm -rf commons-codec-1.3 commons-logging-1.1.1-src &&
+ cd - &&
if module_installed qt3; then
. /etc/profile.d/qt3.rc
@@ -64,8 +75,6 @@
mkdir -p $SOURCE_DIRECTORY/moz/download &&
cp $SOURCE_CACHE/$SOURCE3 $SOURCE_DIRECTORY/moz/download/ &&
- cd $SOURCE_DIRECTORY/config_office &&
-
autoreconf &&
default_config &&
diff --git a/x11-apps/openoffice-src/BUILD.x86_64 b/x11-apps/openoffice-src/BUILD.x86_64
index b3e8643..bc3fe66 100644
--- a/x11-apps/openoffice-src/BUILD.x86_64
+++ b/x11-apps/openoffice-src/BUILD.x86_64
@@ -1,6 +1,17 @@
(
- patch_it $SOURCE_CACHE/$SOURCE8 0 &&
+ cd $SOURCE_DIRECTORY &&
+ for file in `find . -name \*.patch -type f -exec grep -l '
$' {} \;`; do sedit 's/
$//' $file; done &&
+ cd apache-commons/download &&
+ tar -xzpf commons-codec-1.3-src.tar.gz &&
+ tar -xzpf commons-logging-1.1.1-src.tar.gz &&
+ cd - &&
+ for file in `find . -name build.xml -type f -exec grep -l '
$' {} \;`; do sedit 's/
$//' $file; done &&
+ cd apache-commons/download &&
+ tar -czf commons-codec-1.3-src.tar.gz commons-codec-1.3 &&
+ tar -czf commons-logging-1.1.1-src.tar.gz commons-logging-1.1.1-src &&
+ rm -rf commons-codec-1.3 commons-logging-1.1.1-src &&
+ cd - &&
if module_installed qt3; then
. /etc/profile.d/qt3.rc
@@ -64,8 +75,6 @@
mkdir -p $SOURCE_DIRECTORY/moz/download &&
cp $SOURCE_CACHE/$SOURCE3 $SOURCE_DIRECTORY/moz/download/ &&
- cd $SOURCE_DIRECTORY/config_office &&
-
autoreconf &&
default_config &&
@@ -85,6 +94,7 @@
# make install is not reliable
# FIXME: How do we detect this directory in an elegant way?
cd instsetoo_native/unxlngx6.pro/OpenOffice/native/install/en-US/linux-2.6-x86_64/buildroot/opt &&
+
rm -rf $OO_DIR &&
mkdir -p $OO_DIR &&
cp -rv openoffice.org* $OO_DIR &&
diff --git a/x11-apps/openoffice-src/DEPENDS b/x11-apps/openoffice-src/DEPENDS
index 9a7ad3b..e19ec8c 100644
--- a/x11-apps/openoffice-src/DEPENDS
+++ b/x11-apps/openoffice-src/DEPENDS
@@ -1,25 +1,25 @@
-depends %JAVA_SDK
-depends apache-ant
-depends libIDL
-depends XML-Parser
-depends libxml2
-depends gtk+-2
-depends Archive-Zip
-depends Compress-Zlib
-depends unzip
-depends zip
-depends which
-depends desktop-file-utils
-depends hicolor-icon-theme
-depends IO-Compress-Zlib
-depends gperf
-depends jpeg
-depends expat
+depends %JAVA_SDK
+depends apache-ant
+depends libIDL
+depends XML-Parser
+depends libxml2
+depends gtk+-2
+depends Archive-Zip
+depends Compress-Zlib
+depends unzip
+depends zip
+depends which
+depends desktop-file-utils
+depends hicolor-icon-theme
+depends IO-Compress-Zlib
+depends gperf
+depends jpeg
+depends expat
optional_depends "libxslt" \
"--with-system-libxslt" \
"--without-system-libxslt" \
- "For xslt support"
+ "For xslt support"
optional_depends "%JAVA_SDK" \
"--with-java" \
@@ -29,42 +29,42 @@ optional_depends "%JAVA_SDK" \
optional_depends "openssl" \
"--with-system-openssl" \
"--without-system-openssl" \
- "For openssl support"
+ "For openssl support"
optional_depends "libwpd" \
"--with-system-libwpd" \
"--without-system-libwpd" \
- "For WordPerfect support"
+ "For WordPerfect support"
optional_depends "icu4c" \
"--with-system-icu" \
"--without-system-icu" \
- "For icu support"
+ "For icu support"
optional_depends "boost" \
"--with-system-boost" \
"--without-system-boost" \
- "For boost support"
+ "For boost support"
optional_depends "cups" \
"--enable-cups" \
"--disable-cups" \
- "enable the OpenOffice printing backend"
+ "enable the OpenOffice printing backend"
optional_depends "curl" \
"--with-system-curl" \
"--without-system-curl" \
- "to link against the system cURL library"
+ "to link against the system cURL library"
optional_depends "neon" \
"--enable-neon --with-system-neon" \
"--disable-neon" \
- "for webdav support"
+ "for webdav support"
optional_depends "openldap" \
"--with-openldap" \
"--disable-ldap" \
- "for LDAP support"
+ "for LDAP support"
optional_depends "Python" \
"--with-system-python" \
@@ -77,8 +77,8 @@ optional_depends "evolution-data-server" \
"for Evolution addressbook support"
optional_depends "gnome-vfs" \
- "--enable-gnome-vfs --enable-lockdown --enable-gio" \
- "--disable-gnome-vfs --disable-lockdown --disable-gio" \
+ "--enable-gnome-vfs --enable-lockdown --disable-gio" \
+ "--disable-gnome-vfs --disable-lockdown --enable-gio" \
"for GNOME-vfs integration"
optional_depends "kdelibs3" \
diff --git a/x11-apps/openoffice-src/DETAILS b/x11-apps/openoffice-src/DETAILS
index 7f690fa..b219c3f 100644
--- a/x11-apps/openoffice-src/DETAILS
+++ b/x11-apps/openoffice-src/DETAILS
@@ -1,5 +1,5 @@
- MODULE=openoffice-src
- VERSION=3.0.1
+ MODULE=openoffice-src
+ VERSION=3.1.0
SOURCE=OOo_${VERSION}_src_core.tar.bz2
SOURCE2=$MODULE-2.2.0-xauth.patch
SOURCE3=mozilla-source-1.7.5.tar.gz
@@ -7,8 +7,7 @@
SOURCE5=OOo_${VERSION}_src_system.tar.bz2
SOURCE6=OOo_${VERSION}_src_extensions.tar.bz2
SOURCE7=OOo_${VERSION}_src_binfilter.tar.bz2
- SOURCE8=OO-3..0.1-kde-GObject.patch
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/OOO300_m15
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/OOO310_m11
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/
@@ -16,18 +15,16 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/OOO300_m15
SOURCE5_URL=http://ftp.rz.tu-bs.de/pub/mirror/OpenOffice.org/stable/${VERSION}/
SOURCE6_URL=http://ftp.rz.tu-bs.de/pub/mirror/OpenOffice.org/stable/${VERSION}/
SOURCE7_URL=http://ftp.rz.tu-bs.de/pub/mirror/OpenOffice.org/stable/${VERSION}/
- SOURCE8_URL=$PATCH_URL
- SOURCE_VFY=sha1:2da6b2cf0b75873477f22cc9d69a4f0c8b43b435
+ SOURCE_VFY=sha1:7a2812823376c028d81c4d3aeaac56e00f89636c
SOURCE2_VFY=sha1:58c824ef969b017be5fcd7e4290d7681453aa354
SOURCE3_VFY=sha1:bb2a89b95d7626a63a3787208e0abb99ea595d24
- SOURCE4_VFY=sha1:13f1bf0989a09c52c57dbc1d6cf1feaec369a085
- SOURCE5_VFY=sha1:8c73821b542c9c96b071550fe0e3e813e21a1246
- SOURCE6_VFY=sha1:c695982d166422a838560ef7b134a5665bc61198
- SOURCE7_VFY=sha1:d84518159538ef736271177b7ebe4697fc4b811d
- SOURCE8_VFY=sha1:b02c888b771b87d35a63a545810b396a340c87d2
+ SOURCE4_VFY=sha1:3ba93e779492bc6cf4955394a211462529057f03
+ SOURCE5_VFY=sha1:a73c6aa867b7686d33611694e33d6351110d2a0a
+ SOURCE6_VFY=sha1:fd6dff089f722c9d647f2ee5dd0e818b1a7e6576
+ SOURCE7_VFY=sha1:7128a2f8af0b0f1163a2f03331057242ec254f34
WEB_SITE=http://www.openoffice.org
ENTERED=20030805
- UPDATED=20090130
+ UPDATED=20090505
PSAFE=no
SHORT="OpenOffice.org Office Suite"
cat << EOF
diff --git a/x11-apps/openoffice-src/DETAILS.x86_64 b/x11-apps/openoffice-src/DETAILS.x86_64
index b9cfded..b219c3f 100644
--- a/x11-apps/openoffice-src/DETAILS.x86_64
+++ b/x11-apps/openoffice-src/DETAILS.x86_64
@@ -1,5 +1,5 @@
MODULE=openoffice-src
- VERSION=3.0.1
+ VERSION=3.1.0
SOURCE=OOo_${VERSION}_src_core.tar.bz2
SOURCE2=$MODULE-2.2.0-xauth.patch
SOURCE3=mozilla-source-1.7.5.tar.gz
@@ -7,8 +7,7 @@
SOURCE5=OOo_${VERSION}_src_system.tar.bz2
SOURCE6=OOo_${VERSION}_src_extensions.tar.bz2
SOURCE7=OOo_${VERSION}_src_binfilter.tar.bz2
- SOURCE8=OO-3..0.1-kde-GObject.patch
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/OOO300_m15
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/OOO310_m11
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/
@@ -16,18 +15,16 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/OOO300_m15
SOURCE5_URL=http://ftp.rz.tu-bs.de/pub/mirror/OpenOffice.org/stable/${VERSION}/
SOURCE6_URL=http://ftp.rz.tu-bs.de/pub/mirror/OpenOffice.org/stable/${VERSION}/
SOURCE7_URL=http://ftp.rz.tu-bs.de/pub/mirror/OpenOffice.org/stable/${VERSION}/
- SOURCE8_URL=$PATCH_URL
- SOURCE_VFY=sha1:2da6b2cf0b75873477f22cc9d69a4f0c8b43b435
+ SOURCE_VFY=sha1:7a2812823376c028d81c4d3aeaac56e00f89636c
SOURCE2_VFY=sha1:58c824ef969b017be5fcd7e4290d7681453aa354
SOURCE3_VFY=sha1:bb2a89b95d7626a63a3787208e0abb99ea595d24
- SOURCE4_VFY=sha1:13f1bf0989a09c52c57dbc1d6cf1feaec369a085
- SOURCE5_VFY=sha1:8c73821b542c9c96b071550fe0e3e813e21a1246
- SOURCE6_VFY=sha1:c695982d166422a838560ef7b134a5665bc61198
- SOURCE7_VFY=sha1:d84518159538ef736271177b7ebe4697fc4b811d
- SOURCE8_VFY=sha1:b02c888b771b87d35a63a545810b396a340c87d2
+ SOURCE4_VFY=sha1:3ba93e779492bc6cf4955394a211462529057f03
+ SOURCE5_VFY=sha1:a73c6aa867b7686d33611694e33d6351110d2a0a
+ SOURCE6_VFY=sha1:fd6dff089f722c9d647f2ee5dd0e818b1a7e6576
+ SOURCE7_VFY=sha1:7128a2f8af0b0f1163a2f03331057242ec254f34
WEB_SITE=http://www.openoffice.org
ENTERED=20030805
- UPDATED=20090130
+ UPDATED=20090505
PSAFE=no
SHORT="OpenOffice.org Office Suite"
cat << EOF
diff --git a/x11-apps/openoffice-src/PRE_BUILD b/x11-apps/openoffice-src/PRE_BUILD
index 2444d6b..621449b 100644
--- a/x11-apps/openoffice-src/PRE_BUILD
+++ b/x11-apps/openoffice-src/PRE_BUILD
@@ -5,4 +5,4 @@ cd $SOURCE_DIRECTORY &&
tar xf $SOURCE_CACHE/$SOURCE4 --strip-components=1 &&
tar xf $SOURCE_CACHE/$SOURCE5 --strip-components=1 &&
tar xf $SOURCE_CACHE/$SOURCE7 --strip-components=1 &&
-tar xf $SOURCE_CACHE/$SOURCE6 --strip-components=1
+tar xf $SOURCE_CACHE/$SOURCE6 --strip-components=1
More information about the Lunar-commits
mailing list