[Lunar-commits] <moonbase> openoffice-src: these twiddles should work better for x86_64. We don't need SOURCE8, use the 64 java modules in moonbase.
Dennis 'stumbles' Veatch
stumbles at lunar-linux.org
Fri Feb 20 02:07:16 CET 2009
commit 2cc432d0c5505631380b38bdf355b2b4df033142
Author: Dennis 'stumbles' Veatch <stumbles at lunar-linux.org>
Date: Thu Feb 19 20:07:16 2009 -0500
openoffice-src: these twiddles should work better for x86_64. We don't need
SOURCE8, use the 64 java modules in moonbase.
---
x11-apps/openoffice-src/BUILD.x86_64 | 82 ++++++++++++------------
x11-apps/openoffice-src/DEPENDS.x86_64 | 102 ++++++++++++++++++++++++++++++
x11-apps/openoffice-src/DETAILS.x86_64 | 32 +++++++++
x11-apps/openoffice-src/PRE_BUILD.x86_64 | 8 +++
4 files changed, 182 insertions(+), 42 deletions(-)
diff --git a/x11-apps/openoffice-src/BUILD.x86_64 b/x11-apps/openoffice-src/BUILD.x86_64
index f357fc9..50846f5 100644
--- a/x11-apps/openoffice-src/BUILD.x86_64
+++ b/x11-apps/openoffice-src/BUILD.x86_64
@@ -1,12 +1,12 @@
-(
+(
if module_installed qt3; then
- . /etc/profile.d/qt3.rc
- fi &&
+ . /etc/profile.d/qt3.rc
+ fi &&
if module_installed kdelibs3; then
- . /etc/profile.d/kde3.rc
- fi &&
+ . /etc/profile.d/kde3.rc
+ fi &&
. /etc/profile.d/pkgconfig.rc &&
@@ -16,56 +16,54 @@
# There are symlinks left over if openoffice-bin is installed and
# they do not get removed and the BUILD will tank near the end of
- # the compile, this takes care of that.
- for FILE in ${RM_DESK_TOP} ; do
- rm -f /usr/share/applications/${FILE}.desktop || exit 1
- done &&
+ # the compile, this takes care of that.
+ for FILE in ${RM_DESK_TOP} ; do
+ rm -f /usr/share/applications/${FILE}.desktop || exit 1
+ done &&
sedit "/^ARCH_FLAGS\*=/d" solenv/inc/unxlngi{4,6}.mk &&
- ARCH_FLAGS=$CXXFLAGS
+ ARCH_FLAGS=$CXXFLAGS
# All of the options have been carefully chosen. Don't edit them unless you
- # really know what you're doing
+ # really know what you're doing
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 --with-system-zlib --enable-minimizer \
- --with-system-jpeg --with-system-expat --with-system-freetype \
- --with-system-libxml --with-system-db --disable-symbols --enable-Xaw \
+ --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 --with-system-zlib --enable-minimizer \
+ --with-system-jpeg --with-system-expat --with-system-freetype \
+ --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 --enable-presenter-console \
- --enable-wiki-publisher --enable-ogltrans --enable-report-builder \
- --with-system-cairo --with-lang=en --with-dict=ENUS" &&
+ --with-use-shell=bash --with-x --with-package-format=native \
+ --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:
- cd $SOURCE_DIRECTORY;
- chmod +x $SOURCE8;
- ./$SOURCE8 --accept-license --unpack;
- OPTS="$OPTS --with-jdk-home=$SOURCE_DIRECTORY/jdk1.5.0_17";
- else
- JAVA_VERSION="`installed_version j2sdk`";
+ fi &&
+
+ if module_installed sun-jdk ; then
+ JAVA_VERSION="`installed_version sun-jdk`";
+ OPTS="$OPTS --with-jdk-home=/usr/lib/jdk${JAVA_VERSION}";
+ elif module_installed j2sdk ; then
+ JAVA_VERSION="`installed_version j2sdk`";
OPTS="$OPTS --with-jdk-home=/usr/lib/j2sdk${JAVA_VERSION}";
- fi &&
+ elif module_installed sun-jre ; then
+ JAVA_VERSION="`installed_version sun-jre`";
+ OPTS="$OPTS --with-jdk-home=/usr/lib/jre${JAVA_VERSION}";
+ fi &&
# Apply mandatory and optional patches
patch_it $SOURCE2 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/ &&
+ # 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 &&
@@ -73,15 +71,15 @@
default_config &&
# OOo might fail if those are set to some strange values
- umask 0022 &&
- unset LANG LC_ALL &&
+ 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 &&
+ source LinuxX86-64Env.Set.sh &&
+ dmake &&
prepare_install &&
diff --git a/x11-apps/openoffice-src/DEPENDS.x86_64 b/x11-apps/openoffice-src/DEPENDS.x86_64
new file mode 100644
index 0000000..9a01fb6
--- /dev/null
+++ b/x11-apps/openoffice-src/DEPENDS.x86_64
@@ -0,0 +1,102 @@
+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"
+
+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" \
+ "--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 "neon" \
+ "--enable-neon --with-system-neon" \
+ "--disable-neon" \
+ "for webdav support"
+
+optional_depends "openldap" \
+ "--with-openldap" \
+ "--disable-ldap" \
+ "for LDAP 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 "gnome-vfs" \
+ "--enable-gnome-vfs --enable-lockdown --enable-gio" \
+ "--disable-gnome-vfs --disable-lockdown --disable-gio" \
+ "for GNOME-vfs integration"
+
+optional_depends "kdelibs3" \
+ "--enable-kde --enable-kdeab" \
+ "--disable-kde --disable-kdeab" \
+ "to enable KDE support"
+
+optional_depends "Linux-PAM" \
+ "--enable-pam-link" \
+ "--disable-pam" \
+ "for Linux-PAM support"
+
+optional_depends "boost" \
+ "--with-system-boost" \
+ "--without-system-boost" \
+ "to use the already installed boost"
+
+optional_depends "vigra" \
+ "--with-system-vigra" \
+ "--without-system-vigra" \
+ "For generic algorithm support"
diff --git a/x11-apps/openoffice-src/DETAILS.x86_64 b/x11-apps/openoffice-src/DETAILS.x86_64
new file mode 100644
index 0000000..137cc94
--- /dev/null
+++ b/x11-apps/openoffice-src/DETAILS.x86_64
@@ -0,0 +1,32 @@
+ MODULE=openoffice-src
+ VERSION=3.0.1
+ 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=OOo_${VERSION}_src_extensions.tar.bz2
+ SOURCE7=OOo_${VERSION}_src_binfilter.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/OOO300_m15
+ 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=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}/
+ SOURCE_VFY=sha1:2da6b2cf0b75873477f22cc9d69a4f0c8b43b435
+ SOURCE2_VFY=sha1:58c824ef969b017be5fcd7e4290d7681453aa354
+ SOURCE3_VFY=sha1:bb2a89b95d7626a63a3787208e0abb99ea595d24
+ SOURCE4_VFY=sha1:13f1bf0989a09c52c57dbc1d6cf1feaec369a085
+ SOURCE5_VFY=sha1:8c73821b542c9c96b071550fe0e3e813e21a1246
+ SOURCE6_VFY=sha1:c695982d166422a838560ef7b134a5665bc61198
+ SOURCE7_VFY=sha1:d84518159538ef736271177b7ebe4697fc4b811d
+ WEB_SITE=http://www.openoffice.org
+ ENTERED=20030805
+ UPDATED=20090130
+ PSAFE=no
+ SHORT="OpenOffice.org Office Suite"
+cat << EOF
+OpenOffice.org Office Suite
+EOF
diff --git a/x11-apps/openoffice-src/PRE_BUILD.x86_64 b/x11-apps/openoffice-src/PRE_BUILD.x86_64
new file mode 100644
index 0000000..621449b
--- /dev/null
+++ b/x11-apps/openoffice-src/PRE_BUILD.x86_64
@@ -0,0 +1,8 @@
+default_pre_build &&
+
+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
More information about the Lunar-commits
mailing list