[Lunar-commits] <moonbase> openoffice-src: updated to 3.0.0
Zbigniew Luszpinski
zbiggy at lunar-linux.org
Fri Oct 31 01:49:17 CET 2008
commit 5d819f7ca3809ce6a82388aa9dcbd0e9f22d11c9
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date: Fri Oct 31 01:49:17 2008 +0100
openoffice-src: updated to 3.0.0
---
x11-apps/openoffice-src/BUILD | 53 ++++++++++++++++++------------
x11-apps/openoffice-src/BUILD.x86_64 | 59 ++++++++++++++++++++++-----------
x11-apps/openoffice-src/DEPENDS | 51 ++++++++++++++++++-----------
x11-apps/openoffice-src/DETAILS | 20 ++++++------
x11-apps/openoffice-src/PRE_BUILD | 1 +
5 files changed, 114 insertions(+), 70 deletions(-)
diff --git a/x11-apps/openoffice-src/BUILD b/x11-apps/openoffice-src/BUILD
index 3f1888d..75e7223 100644
--- a/x11-apps/openoffice-src/BUILD
+++ b/x11-apps/openoffice-src/BUILD
@@ -4,7 +4,12 @@
. /etc/profile.d/qt3.rc
fi &&
- OO_VER="`lvu version openoffice-src | cut -d. -f1-2`"
+ if module_installed kdelibs3; then
+ . /etc/profile.d/kde3.rc
+ fi &&
+
+ . /etc/profile.d/pkgconfig.rc &&
+
OO_DIR="/opt/lunar/openoffice-src"
RM_DESK_TOP="math extension printeradmin base calc draw impress writer"
@@ -17,30 +22,33 @@
done &&
sedit "/^ARCH_FLAGS\*=/d" solenv/inc/unxlngi{4,6}.mk &&
+ ARCH_FLAGS=$CXXFLAGS
# All of the options have been carefully chosen. Don't edit them unless you
# really know what you're doing
- OPTS="$OPTS --prefix=$OO_DIR --disable-qadevooo --enable-dbus \
- --disable-fontooo --disable-odk --enable-libart --disable-debug \
+ OPTS="$OPTS --prefix=$OO_DIR --enable-dbus --disable-dbgutil --disable-static-gtk \
+ --disable-fontooo --disable-odk --disable-debug --enable-opengl \
--disable-mathmldtd --enable-cairo --with-mozilla-version=1.7.5 \
--enable-mozilla --enable-binfilter --enable-xrender-link \
- --without-fonts --without-ppds --without-afms \
- --with-system-stdlibs --without-nas --with-system-zlib \
+ --without-fonts --without-ppds --without-afms \
+ --with-system-stdlibs --with-system-zlib --enable-minimizer \
--with-system-jpeg --with-system-expat --with-system-freetype \
- --with-system-libxml --with-system-db --disable-symbols \
- --with-system-xrender-headers --with-epm=internal \
+ --with-system-libxml --with-system-db --disable-symbols --enable-Xaw \
+ --with-system-xrender-headers --with-epm=internal --enable-pdfimport \
--with-use-shell=bash --with-x --with-package-format=native \
- --with-build-version=LunarLinux" &&
+ --with-build-version=LunarLinux --enable-presenter-console \
+ --enable-wiki-publisher --enable-ogltrans --enable-report-builder \
+ --with-system-cairo --with-lang=en --with-dict=ENUS" &&
if module_installed sane-backends ; then
OPTS="$OPTS --with-system-sane-header";
fi &&
if module_installed sun-jdk; then
-# hsqldb 3rdparty compilation fault will break OO build
-# we can pull out hsqldb 1.9.0 from svn,
-# or downgrade JDK to 1.5 only for OO build:
+ # hsqldb 3rdparty compilation fault will break OO build
+ # we can pull out hsqldb 1.9.0 from svn,
+ # or downgrade JDK to 1.5 only for OO build:
cd $SOURCE_DIRECTORY;
chmod +x $SOURCE8;
./$SOURCE8 --accept-license --unpack;
@@ -53,7 +61,6 @@
# Apply mandatory and optional patches
patch_it $SOURCE2 0 &&
-# patch_it $SOURCE6 0 &&
# As long as OOo-src does not compile against nss it needs its own mozilla
# tarball (and it also compiles its own mozilla)
@@ -83,29 +90,33 @@
cd instsetoo_native/unxlngi6.pro/OpenOffice/native/install/en-US/linux-2.6-intel/buildroot/opt &&
rm -rf $OO_DIR &&
- cp -rv openoffice.org${OO_VER} $OO_DIR &&
+ mkdir -p $OO_DIR &&
+ cp -rv openoffice.org* $OO_DIR &&
# Install icons for the .desktop files
- mkdir -p -m0755 /usr/share/icons/{HighContrast,hicolor} &&
+ mkdir -p -m0755 /usr/share/icons &&
cd $SOURCE_DIRECTORY/sysui/desktop/icons &&
- cp -rv HighContrast/*x* /usr/share/icons/HighContrast &&
- cp -rv hicolor/*x* /usr/share/icons/hicolor &&
+ (find . -name CVS -type d -exec rm -rf {} \; &> /dev/null || true) &&
+ cp -rv locolor /usr/share/icons &&
+ cp -rv hicolor /usr/share/icons &&
gtk-update-icon-cache --force /usr/share/icons/hicolor &&
# Desktop integration
mkdir -p -m0755 /usr/share/applications &&
- cd $OO_DIR/share/xdg &&
- sedit 's/bin\/sprinteradmin/bin\/spadmin/' printeradmin.desktop &&
-
+ cd $OO_DIR/openoffice.org3/share/xdg &&
+ rm -f qstart.desktop &&
for file in *.desktop ; do
sedit '/Exec/d' $file;
- echo "Exec=$OO_DIR/program/s`echo $file | sed 's/.desktop//'`" >> $file;
+ echo "Exec=$OO_DIR/openoffice.org3/program/s`echo $file | sed 's/.desktop//'`" >> $file;
sedit '/Icon/d' $file;
- echo "Icon=`echo $file | sed 's/.desktop//'`" >> $file;
+ echo "Icon=`echo ${file}.png | sed 's/.desktop//'`" >> $file;
install -m644 $file /usr/share/applications;
done &&
+ sedit 's/printeradmin/spadmin/g' printeradmin.desktop &&
+ install -m644 printeradmin.desktop /usr/share/applications &&
+
update-desktop-database
) > $C_FIFO 2>&1
diff --git a/x11-apps/openoffice-src/BUILD.x86_64 b/x11-apps/openoffice-src/BUILD.x86_64
index b01860f..ca89776 100644
--- a/x11-apps/openoffice-src/BUILD.x86_64
+++ b/x11-apps/openoffice-src/BUILD.x86_64
@@ -4,8 +4,14 @@
. /etc/profile.d/qt3.rc
fi &&
- OO_VER="`lvu version openoffice-src | cut -d. -f1-2`"
+ if module_installed kdelibs3; then
+ . /etc/profile.d/kde3.rc
+ fi &&
+
+ . /etc/profile.d/pkgconfig.rc &&
+
OO_DIR="/opt/lunar/openoffice-src"
+
RM_DESK_TOP="math extension printeradmin base calc draw impress writer"
# There are symlinks left over if openoffice-bin is installed and
@@ -15,30 +21,38 @@
rm -f /usr/share/applications/${FILE}.desktop || exit 1
done &&
-# sedit "/^ARCH_FLAGS\*=/d" solenv/inc/unxlngi{4,5,6}.mk &&
+ sedit "/^ARCH_FLAGS\*=/d" solenv/inc/unxlngi{4,6}.mk &&
+ ARCH_FLAGS=$CXXFLAGS
# All of the options have been carefully chosen. Don't edit them unless you
# really know what you're doing
- OPTS="$OPTS --prefix=$OO_DIR --disable-qadevooo --enable-dbus \
- --disable-fontooo --disable-odk --disable-debug \
+ OPTS="$OPTS --prefix=$OO_DIR --enable-dbus --disable-dbgutil --disable-static-gtk \
+ --disable-fontooo --disable-odk --disable-debug --enable-opengl \
--disable-mathmldtd --enable-cairo --with-mozilla-version=1.7.5 \
--enable-mozilla --enable-binfilter --enable-xrender-link \
- --without-fonts --without-ppds --without-afms \
- --with-system-stdlibs --without-nas --with-system-zlib \
+ --without-fonts --without-ppds --without-afms \
+ --with-system-stdlibs --with-system-zlib --enable-minimizer \
--with-system-jpeg --with-system-expat --with-system-freetype \
- --with-system-libxml --with-system-db --disable-symbols \
- --with-system-xrender-headers --enable-epm \
+ --with-system-libxml --with-system-db --disable-symbols --enable-Xaw \
+ --with-system-xrender-headers --with-epm=internal --enable-pdfimport \
--with-use-shell=bash --with-x --with-package-format=native \
- --with-build-version=LunarLinux" &&
+ --with-build-version=LunarLinux --enable-presenter-console \
+ --enable-wiki-publisher --enable-ogltrans --enable-report-builder \
+ --with-system-cairo --with-lang=en --with-dict=ENUS" &&
if module_installed sane-backends ; then
OPTS="$OPTS --with-system-sane-header";
fi &&
if module_installed sun-jdk; then
- JAVA_VERSION="`installed_version sun-jdk`"
- OPTS="$OPTS --with-jdk-home=/usr/lib/jdk${JAVA_VERSION}";
+ # hsqldb 3rdparty compilation fault will break OO build
+ # we can pull out hsqldb 1.9.0 from svn,
+ # or downgrade JDK to 1.5 only for OO build:
+ cd $SOURCE_DIRECTORY;
+ chmod +x $SOURCE8;
+ ./$SOURCE8 --accept-license --unpack;
+ OPTS="$OPTS --with-jdk-home=$SOURCE_DIRECTORY/jdk1.5.0_16";
else
JAVA_VERSION="`installed_version j2sdk`";
OPTS="$OPTS --with-jdk-home=/usr/lib/j2sdk${JAVA_VERSION}";
@@ -47,7 +61,6 @@
# Apply mandatory and optional patches
patch_it $SOURCE2 0 &&
-# patch_it $SOURCE6 0 &&
# As long as OOo-src does not compile against nss it needs its own mozilla
# tarball (and it also compiles its own mozilla)
@@ -76,27 +89,33 @@
# 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 &&
- cp -rv openoffice.org${OO_VER} $OO_DIR &&
+ mkdir -p $OO_DIR &&
+ cp -rv openoffice.org* $OO_DIR &&
# Install icons for the .desktop files
- mkdir -p -m0755 /usr/share/icons/{HighContrast,hicolor} &&
+ mkdir -p -m0755 /usr/share/icons &&
cd $SOURCE_DIRECTORY/sysui/desktop/icons &&
- cp -rv HighContrast/*x* /usr/share/icons/HighContrast &&
- cp -rv hicolor/*x* /usr/share/icons/hicolor &&
+ (find . -name CVS -type d -exec rm -rf {} \; &> /dev/null || true) &&
+ cp -rv locolor /usr/share/icons &&
+ cp -rv hicolor /usr/share/icons &&
gtk-update-icon-cache --force /usr/share/icons/hicolor &&
# Desktop integration
mkdir -p -m0755 /usr/share/applications &&
- cd $OO_DIR/share/xdg &&
- sedit 's/bin\/sprinteradmin/bin\/spadmin/' printeradmin.desktop &&
+ cd $OO_DIR/openoffice.org3/share/xdg &&
+ rm -f qstart.desktop &&
for file in *.desktop ; do
sedit '/Exec/d' $file;
- echo "Exec=$OO_DIR/program/s`echo $file | sed 's/.desktop//'`" >> $file;
+ echo "Exec=$OO_DIR/openoffice.org3/program/s`echo $file | sed 's/.desktop//'`" >> $file;
sedit '/Icon/d' $file;
- echo "Icon=`echo $file | sed 's/.desktop//'`" >> $file;
+ echo "Icon=`echo ${file}.png | sed 's/.desktop//'`" >> $file;
install -m644 $file /usr/share/applications;
done &&
+
+ sedit 's/printeradmin/spadmin/g' printeradmin.desktop &&
+ install -m644 printeradmin.desktop /usr/share/applications &&
+
update-desktop-database
) > $C_FIFO 2>&1
diff --git a/x11-apps/openoffice-src/DEPENDS b/x11-apps/openoffice-src/DEPENDS
index c2db869..2a3ffa8 100644
--- a/x11-apps/openoffice-src/DEPENDS
+++ b/x11-apps/openoffice-src/DEPENDS
@@ -11,6 +11,34 @@ 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"
+
+optional_depends "sun-jdk" \
+ "--with-java" \
+ "--without-java" \
+ "For java components, applets, XML filters support"
+
+optional_depends "openssl" \
+ "--with-system-openssl" \
+ "--without-system-openssl" \
+ "For openssl support"
+
+optional_depends "libwpd" \
+ "--with-system-libwpd" \
+ "--without-system-libwpd" \
+ "For WordPerfect support"
+
+optional_depends "icu4c" \
+ "--with-system-icu" \
+ "--without-system-icu" \
+ "For icu support"
optional_depends "boost" \
"--with-system-boost" \
@@ -48,13 +76,13 @@ optional_depends "evolution-data-server" \
"for Evolution addressbook support"
optional_depends "gnome-vfs" \
- "--enable-gnome-vfs --enable-lockdown" \
- "--disable-gnome-vfs --disable-lockdown" \
+ "--enable-gnome-vfs --enable-lockdown --enable-gio" \
+ "--disable-gnome-vfs --disable-lockdown --disable-gio" \
"for GNOME-vfs integration"
optional_depends "kdelibs3" \
- "--enable-kde" \
- "--disable-kde" \
+ "--enable-kde --enable-kdeab" \
+ "--disable-kde --disable-kdeab" \
"to enable KDE support"
optional_depends "Linux-PAM" \
@@ -62,26 +90,11 @@ optional_depends "Linux-PAM" \
"--disable-pam" \
"for Linux-PAM support"
-optional_depends "libsndfile" \
- "--with-system-sndfile" \
- "--without-system-sndfile" \
- "to enable sound output in Impress"
-
-optional_depends "startup-notification" \
- "--enable-libsn" \
- "--disable-libsn" \
- "for startup notification support"
-
optional_depends "boost" \
"--with-system-boost" \
"--without-system-boost" \
"to use the already installed boost"
-optional_depends "unixODBC" \
- "--with-system-odbc-headers" \
- "--without-system-odbc-headers" \
- "For Open Database Connectivity Support"
-
optional_depends "vigra" \
"--with-system-vigra" \
"--without-system-vigra" \
diff --git a/x11-apps/openoffice-src/DETAILS b/x11-apps/openoffice-src/DETAILS
index f45d0c0..574ea6f 100644
--- a/x11-apps/openoffice-src/DETAILS
+++ b/x11-apps/openoffice-src/DETAILS
@@ -1,33 +1,33 @@
MODULE=openoffice-src
- VERSION=2.4.1
+ VERSION=3.0.0
SOURCE=OOo_${VERSION}_src_core.tar.bz2
SOURCE2=$MODULE-2.2.0-xauth.patch
SOURCE3=mozilla-source-1.7.5.tar.gz
SOURCE4=OOo_${VERSION}_src_l10n.tar.bz2
SOURCE5=OOo_${VERSION}_src_system.tar.bz2
- SOURCE6=$MODULE-2.2.0-mozilla-cplusplus.patch
SOURCE7=OOo_${VERSION}_src_binfilter.tar.bz2
SOURCE8=jdk-5.0u16-dlj-linux-i586.bin
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/OOH680_m17
+ SOURCE9=OOo_${VERSION}_src_extensions.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/OOO300_m9
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/
SOURCE4_URL=http://ftp.rz.tu-bs.de/pub/mirror/OpenOffice.org/stable/${VERSION}/
SOURCE5_URL=http://ftp.rz.tu-bs.de/pub/mirror/OpenOffice.org/stable/${VERSION}/
- SOURCE6_URL=$PATCH_URL/
SOURCE7_URL=http://ftp.rz.tu-bs.de/pub/mirror/OpenOffice.org/stable/${VERSION}/
SOURCE8_URL=http://download.java.net/dlj/binaries/
- SOURCE_VFY=sha1:170642263c32f614ee7e9439a8af30410e00d318
+ SOURCE9_URL=http://ftp.rz.tu-bs.de/pub/mirror/OpenOffice.org/stable/${VERSION}/
+ SOURCE_VFY=sha1:8fc1e6140f8a0695accf8d34746253af431c2542
SOURCE2_VFY=sha1:58c824ef969b017be5fcd7e4290d7681453aa354
SOURCE3_VFY=sha1:bb2a89b95d7626a63a3787208e0abb99ea595d24
- SOURCE4_VFY=sha1:b21f4531ea8182d87ff6f5f68809086c1c063295
- SOURCE5_VFY=sha1:d42b8345b55ef6f0f2a4adb575c815bbb23ec00d
- SOURCE6_VFY=sha1:31ee26c90f43f4385a713a8ee64a9ed0801e61d8
- SOURCE7_VFY=sha1:a50c7f317643b756c2b0e8937fa9d64b99f05ed9
+ SOURCE4_VFY=sha1:0ee7f44cea5549a3d3473ff7669974e8914caf97
+ SOURCE5_VFY=sha1:b8af1787bd4651c808d298e81ee797bf2b7ebdcd
+ SOURCE7_VFY=sha1:09ff91fd871f00c696befa8064fe04d7a88a3c8a
SOURCE8_VFY=sha1:56e29e2d96fca31f6b0e34c208c13c82c523098d
+ SOURCE9_VFY=sha1:1632374bf75eb6080c0d36e88fd981529be17a0f
WEB_SITE=http://www.openoffice.org
ENTERED=20030805
- UPDATED=20080705
+ UPDATED=20081019
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 5e343f7..7696253 100644
--- a/x11-apps/openoffice-src/PRE_BUILD
+++ b/x11-apps/openoffice-src/PRE_BUILD
@@ -5,4 +5,5 @@ 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/$SOURCE9 --strip-components=1 &&
cp $SOURCE_CACHE/$SOURCE8 .
More information about the Lunar-commits
mailing list