[Lunar-commits] <moonbase> openoffice-src: version bump.
Dennis 'stumbles' Veatch
stumbles at lunar-linux.org
Mon Apr 14 18:49:58 CEST 2008
commit 047ea7cdff922822e839f58293363227f691eb3d
Author: Dennis 'stumbles' Veatch <stumbles at lunar-linux.org>
Date: Mon Apr 14 12:49:58 2008 -0400
openoffice-src: version bump.
This works on x86_64 if you choose j2sdk, see its DETAILS.x86_64.
There is some jiggling/simplification, etc that could be done here
where x86 and x86_64 could be merged into one set of scripts but I
iz tired atm. So if there is anyone that wants to diddle with the
x86 side of things.... feel free and enjoy.
---
x11-apps/openoffice-src/BUILD.x86_64 | 93 ++++++++++++++++++++++++
x11-apps/openoffice-src/CONFLICTS | 1 +
x11-apps/openoffice-src/DEPENDS | 128 +++++++++++++++++++---------------
x11-apps/openoffice-src/DETAILS | 14 ++--
4 files changed, 172 insertions(+), 64 deletions(-)
diff --git a/x11-apps/openoffice-src/BUILD.x86_64 b/x11-apps/openoffice-src/BUILD.x86_64
new file mode 100644
index 0000000..907f92f
--- /dev/null
+++ b/x11-apps/openoffice-src/BUILD.x86_64
@@ -0,0 +1,93 @@
+(
+
+ if module_installed qt3; then
+ . /etc/profile.d/qt3.rc
+ fi &&
+
+ OO_DIR="/opt/lunar/openoffice-src"
+
+# sedit "/^ARCH_FLAGS\*=/d" solenv/inc/unxlngi{4,5,6}.mk &&
+
+ # 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\
+ --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 \
+ --with-system-jpeg --with-system-expat --with-system-freetype \
+ --with-system-libxml --with-system-db --disable-symbols\
+ --with-system-xrender-headers --enable-epm \
+ --with-use-shell=bash --with-x --with-package-format=native \
+ --with-build-version=LunarLinux --with-system-boost" &&
+
+ 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}";
+ else
+ JAVA_VERSION="`installed_version j2sdk`";
+ OPTS="$OPTS --with-jdk-home=/usr/lib/j2sdk${JAVA_VERSION}";
+ fi &&
+
+ # 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)
+ mkdir -p $SOURCE_DIRECTORY/moz/download &&
+ cp $SOURCE_CACHE/$SOURCE3 $SOURCE_DIRECTORY/moz/download/ &&
+
+ cd $SOURCE_DIRECTORY/config_office &&
+
+ autoreconf &&
+ default_config &&
+
+ # OOo might fail if those are set to some strange values
+ umask 0022 &&
+ unset LANG LC_ALL &&
+
+ cd $SOURCE_DIRECTORY &&
+
+ ./bootstrap &&
+ # sedit "s/-lxml2/-lxml2\ -lexpat/g" LinuxX86Env.Set.sh &&
+ source LinuxX86-64Env.Set.sh &&
+ dmake &&
+
+ prepare_install &&
+
+ # 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 &&
+ cp -rv openoffice.org2.4 $OO_DIR &&
+
+ # Install icons for the .desktop files
+ mkdir -p -m0755 /usr/share/icons/{HighContrast,hicolor} &&
+ cd $SOURCE_DIRECTORY/sysui/desktop/icons &&
+ cp -rv HighContrast/*x* /usr/share/icons/HighContrast &&
+ cp -rv hicolor/*x* /usr/share/icons/hicolor &&
+ 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 &&
+
+ for file in *.desktop ; do
+ sedit '/Exec/d' $file;
+ echo "Exec=$OO_DIR/program/s`echo $file | sed 's/.desktop//'`" >> $file;
+ sedit '/Icon/d' $file;
+ echo "Icon=`echo $file | sed 's/.desktop//'`" >> $file;
+ install -m644 $file /usr/share/applications;
+ done &&
+ update-desktop-database
+
+) > $C_FIFO 2>&1
diff --git a/x11-apps/openoffice-src/CONFLICTS b/x11-apps/openoffice-src/CONFLICTS
new file mode 100644
index 0000000..4f3fd28
--- /dev/null
+++ b/x11-apps/openoffice-src/CONFLICTS
@@ -0,0 +1 @@
+conflicts openoffice-bin
diff --git a/x11-apps/openoffice-src/DEPENDS b/x11-apps/openoffice-src/DEPENDS
index 21ac0a8..16aa1ad 100644
--- a/x11-apps/openoffice-src/DEPENDS
+++ b/x11-apps/openoffice-src/DEPENDS
@@ -1,73 +1,87 @@
-depends apache-ant &&
-depends libIDL &&
-depends libart_lgpl &&
-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 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
-optional_depends "cups" \
- "--enable-cups" \
- "--disable-cups" \
- "enable the OpenOffice printing backend" &&
+optional_depends "boost" \
+ "--with-system-boost" \
+ "--without-system-boost" \
+ "For boost support"
+
+optional_depends "cups" \
+ "--enable-cups" \
+ "--disable-cups" \
+ "enable the OpenOffice printing backend"
-optional_depends "curl" \
- "--with-system-curl" \
- "--without-system-curl" \
- "to link against the system cURL library" &&
+optional_depends "curl" \
+ "--with-system-curl" \
+ "--without-system-curl" \
+ "to link against the system cURL library"
-optional_depends "neon" \
+optional_depends "neon" \
"--enable-neon --with-system-neon" \
- "--disable-neon" \
- "for webdav support" &&
+ "--disable-neon" \
+ "for webdav support"
-optional_depends "openldap" \
+optional_depends "openldap" \
"--with-openldap" \
- "--disable-ldap" \
- "for LDAP support" &&
+ "--disable-ldap" \
+ "for LDAP support"
-optional_depends "Python" \
- "--with-system-python" \
- "--without-system-python" \
- "for native Python support" &&
+optional_depends "Python" \
+ "--with-system-python" \
+ "--without-system-python" \
+ "for native Python support"
-optional_depends "evolution-data-server" \
- "--enable-evolution2" \
- "--disable-evolution2" \
- "for Evolution addressbook support" &&
+optional_depends "evolution-data-server" \
+ "--enable-evolution2" \
+ "--disable-evolution2" \
+ "for Evolution addressbook support"
-optional_depends "gnome-vfs2" \
- "--enable-gnome-vfs --enable-lockdown" \
+optional_depends "gnome-vfs2" \
+ "--enable-gnome-vfs --enable-lockdown" \
"--disable-gnome-vfs --disable-lockdown" \
- "for GNOME-vfs integration" &&
+ "for GNOME-vfs integration"
-optional_depends "kdelibs3" \
- "--enable-kde" \
- "--disable-kde" \
- "to enable KDE support" &&
+optional_depends "kdelibs3" \
+ "--enable-kde" \
+ "--disable-kde" \
+ "to enable KDE support"
-optional_depends "Linux-PAM" \
- "--enable-pam-link" \
- "--disable-pam" \
- "for Linux-PAM support" &&
+optional_depends "Linux-PAM" \
+ "--enable-pam-link" \
+ "--disable-pam" \
+ "for Linux-PAM support"
-optional_depends "libsndfile" \
- "--with-system-sndfile" \
- "--without-system-sndfile" \
- "to enable sound output in Impress" &&
+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 "startup-notification" \
+ "--enable-libsn" \
+ "--disable-libsn" \
+ "for startup notification support"
-optional_depends "boost" \
- "--with-system-boost" \
- "--without-system-boost" \
+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" \
+ "For generic algorithm support"
diff --git a/x11-apps/openoffice-src/DETAILS b/x11-apps/openoffice-src/DETAILS
index 7c9663d..354e2b1 100644
--- a/x11-apps/openoffice-src/DETAILS
+++ b/x11-apps/openoffice-src/DETAILS
@@ -1,5 +1,5 @@
MODULE=openoffice-src
- VERSION=2.3.1
+ VERSION=2.4.0
SOURCE=OOo_${VERSION}_src_core.tar.bz2
SOURCE2=$MODULE-2.2.0-xauth.patch
SOURCE3=mozilla-source-1.7.5.tar.gz
@@ -7,7 +7,7 @@
SOURCE5=OOo_${VERSION}_src_system.tar.bz2
SOURCE6=$MODULE-2.2.0-mozilla-cplusplus.patch
SOURCE7=OOo_${VERSION}_src_binfilter.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/OOG680_m9
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/OOH680_m12
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/
@@ -15,16 +15,16 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/OOG680_m9
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}/
- SOURCE_VFY=sha1:de189e03a329cdd334823a52b800fad0c033ab4d
+ SOURCE_VFY=sha1:1f775a0f2b755ad1c4cb7d14df93d86948424e7f
SOURCE2_VFY=sha1:58c824ef969b017be5fcd7e4290d7681453aa354
SOURCE3_VFY=sha1:bb2a89b95d7626a63a3787208e0abb99ea595d24
- SOURCE4_VFY=sha1:004defae1496cf4b953a233abb20fd4c7e162423
- SOURCE5_VFY=sha1:ebc835f9c00ef60b9d8da1004a8f31f8a88aef6f
+ SOURCE4_VFY=sha1:3ef13fbaa6c41ab920ba9a9f4494f6c4f805c28e
+ SOURCE5_VFY=sha1:cbefb4655987fb70b929b6922c2b27beb1e5db18
SOURCE6_VFY=sha1:31ee26c90f43f4385a713a8ee64a9ed0801e61d8
- SOURCE7_VFY=sha1:0643c52da3850a164928342e7651897b7a76ca1f
+ SOURCE7_VFY=sha1:6196fd2d2b5b37635d9a08a36f5476d57b14e0d8
WEB_SITE=http://www.openoffice.org
ENTERED=20030805
- UPDATED=20080205
+ UPDATED=20080414
PSAFE=no
SHORT="OpenOffice.org Office Suite"
cat << EOF
More information about the Lunar-commits
mailing list