[Lunar-commits] <moonbase> openoffice-src: Version bump. Consolidating the DETAILS and BUILD files. Needed to add
Dennis `stumbles` Veatch
stumbles at lunar-linux.org
Sun Mar 7 02:13:09 CET 2010
commit aee0b00778399d28f37476bc1ccd5f4a40c953cf
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date: Sat Mar 6 20:13:09 2010 -0500
openoffice-src: Version bump. Consolidating the DETAILS and BUILD files. Needed to add
xulrunner as a depends, it was the only way I found to get around it wanting seamonkey-1.7.5.
Yes, it was PSAFE on x86_64 and don't see why it would not be on x86. Easy enough to
rectify if that is not the case.
---
x11-apps/openoffice-src/BUILD | 60 +++++++++------
x11-apps/openoffice-src/BUILD.x86_64 | 127 --------------------------------
x11-apps/openoffice-src/DEPENDS | 17 ++++
x11-apps/openoffice-src/DETAILS | 43 +++++------
x11-apps/openoffice-src/DETAILS.x86_64 | 38 ----------
x11-apps/openoffice-src/PRE_BUILD | 5 +-
6 files changed, 73 insertions(+), 217 deletions(-)
diff --git a/x11-apps/openoffice-src/BUILD b/x11-apps/openoffice-src/BUILD
index aaf2f96..2466d41 100644
--- a/x11-apps/openoffice-src/BUILD
+++ b/x11-apps/openoffice-src/BUILD
@@ -36,23 +36,31 @@
# 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 \
+ --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-ppds --without-afms --with-system-mozilla=mozilla \
+ --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-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" &&
- if module_installed sane-backends ; then
- OPTS="$OPTS --with-system-sane-header";
+ if in_depends $MODULE kdepim4 ; then
+ . /etc/profile.d/qt4.rc &&
+ . /etc/profile.d/kde4.rc &&
+ QT4DIR=$QTDIR &&
+ QT4INC=$QTDIR/include &&
+ QT4LIB=$QTDIR/lib &&
+ KDE4DIR=$KDE4_INSTALL_DIR &&
+ export QT4DIR &&
+ export QT4INC &&
+ export QT4LIB &&
+ export KDE4DIR
fi &&
-
if module_installed sun-jdk ; then
OPTS="$OPTS --with-jdk-home=$JAVA_HOME";
else
@@ -61,19 +69,10 @@
fi
fi &&
- # Apply mandatory and optional patches
-
- patch_it $SOURCE2 0 &&
-# A glibc related patch.
- patch_it $SOURCE_CACHE/$SOURCE8 0 &&
-# Another glibc related patch.
- patch_it $SOURCE_CACHE/$SOURCE9 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/ &&
-
+ cp $SOURCE_CACHE/$SOURCE2 $SOURCE_DIRECTORY/moz/download/ &&
autoreconf &&
default_config &&
@@ -83,16 +82,27 @@
cd $SOURCE_DIRECTORY &&
- ./bootstrap &&
- sedit "s/-lxml2/-lxml2\ -lexpat/g" LinuxX86Env.Set.sh &&
- source LinuxX86Env.Set.sh &&
+ if [ "`arch`" == "x86_64" ] ; then
+ ./bootstrap &&
+ sedit "s/-lxml2/-lxml2\ -lexpat/g" LinuxX86-64Env.Set.sh &&
+ source LinuxX86-64Env.Set.sh
+ else
+ ./bootstrap &&
+ sedit "s/-lxml2/-lxml2\ -lexpat/g" LinuxX86Env.Set.sh &&
+ source LinuxX86Env.Set.sh
+ fi &&
+
dmake &&
prepare_install &&
# make install is not reliable
# FIXME: How do we detect this directory in an elegant way?
- cd instsetoo_native/unxlngi6.pro/OpenOffice/native/install/en-US/linux-2.6-intel/buildroot/opt &&
+ if [ "`arch`" == "x86_64" ] ; then
+ cd instsetoo_native/unxlngx6.pro/OpenOffice/native/install/en-US/linux-2.6-x86_64/buildroot/opt
+ else
+ cd instsetoo_native/unxlngi6.pro/OpenOffice/native/install/en-US/linux-2.6-intel/buildroot/opt
+ fi &&
rm -rf $OO_DIR &&
mkdir -p $OO_DIR &&
diff --git a/x11-apps/openoffice-src/BUILD.x86_64 b/x11-apps/openoffice-src/BUILD.x86_64
deleted file mode 100644
index ea7fabc..0000000
--- a/x11-apps/openoffice-src/BUILD.x86_64
+++ /dev/null
@@ -1,127 +0,0 @@
-(
-
-# This sedit is needed for the configure to complete with current db.
- sedit "s:seq 1 7:seq 1 8:" configure.in &&
-
- 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 - &&
-
- . /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
- # 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 &&
-
- 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 --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 \
- --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" &&
-
- if module_installed sane-backends ; then
- OPTS="$OPTS --with-system-sane-header";
- fi &&
-
- if module_installed sun-jdk ; then
- OPTS="$OPTS --with-jdk-home=$JAVA_HOME";
- else
- if module_installed j2sdk ; then
- OPTS="$OPTS --with-jdk-home=$JAVA_HOME";
- fi
- fi &&
-
- # Apply mandatory and optional patches
-
- patch_it $SOURCE2 0 &&
-# A glibc related patch.
- patch_it $SOURCE_CACHE/$SOURCE8 0 &&
-# Another glibc related patch.
- patch_it $SOURCE_CACHE/$SOURCE9 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/ &&
-
- 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 &&
- mkdir -p $OO_DIR &&
- cp -rv openoffice.org* $OO_DIR &&
-
- # Install icons for the .desktop files
- mkdir -p -m0755 /usr/share/icons &&
- cd $SOURCE_DIRECTORY/sysui/desktop/icons &&
- (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/openoffice.org3/share/xdg &&
- rm -f qstart.desktop &&
-
- for file in *.desktop ; do
- sedit '/Exec/d' $file;
- echo "Exec=$OO_DIR/openoffice.org3/program/s`echo $file | sed 's/.desktop//'`" >> $file;
- sedit '/Icon/d' $file;
- echo "Icon=`echo ${file}.png | sed 's/.desktop//'`" >> $file;
- install -m644 $file /usr/share/applications;
- done &&
-
- sedit 's/sprinteradmin$/spadmin/' 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 1e56f61..17def73 100644
--- a/x11-apps/openoffice-src/DEPENDS
+++ b/x11-apps/openoffice-src/DEPENDS
@@ -1,5 +1,6 @@
depends %JAVA_SDK
depends apache-ant
+depends xulrunner
depends libIDL
depends XML-Parser
depends libxml2
@@ -16,6 +17,12 @@ depends gperf
depends jpeg
depends expat
+
+optional_depends "kdepim4" \
+ "--enable-kde4" \
+ "--disable-kde4" \
+ "for Qt4/KDE4 vclplug support"
+
optional_depends "libxslt" \
"--with-system-libxslt" \
"--without-system-libxslt" \
@@ -95,3 +102,13 @@ optional_depends "vigra" \
"--with-system-vigra" \
"--without-system-vigra" \
"For generic algorithm support"
+
+optional_depends "hunspell" \
+ "--with-system-hunspell" \
+ "--without-system-hunspell" \
+ "for spell checking support"
+
+optional_depends "sane-backends" \
+ "--with-system-sane-header" \
+ "--without-system-sane-header" \
+ "for scanner support"
diff --git a/x11-apps/openoffice-src/DETAILS b/x11-apps/openoffice-src/DETAILS
index 6e318c7..e0de122 100644
--- a/x11-apps/openoffice-src/DETAILS
+++ b/x11-apps/openoffice-src/DETAILS
@@ -1,37 +1,30 @@
MODULE=openoffice-src
- VERSION=3.1.1
+ VERSION=3.2.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=OOo_${VERSION}_src_extensions.tar.bz2
- SOURCE7=OOo_${VERSION}_src_binfilter.tar.bz2
- SOURCE8=soltools-mkdepend-getline.diff
- SOURCE9=buildfix-sw-printf.diff
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/OOO310_m19
+ SOURCE2=mozilla-source-1.7.5.tar.gz
+ SOURCE3=OOo_${VERSION}_src_l10n.tar.bz2
+ SOURCE4=OOo_${VERSION}_src_system.tar.bz2
+ SOURCE5=OOo_${VERSION}_src_extensions.tar.bz2
+ SOURCE6=OOo_${VERSION}_src_binfilter.tar.bz2
+ SOURCE7=OOo_${VERSION}_src_testautomation.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/OOO320_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/
+ SOURCE2_URL=ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla1.7.5/source/
+ SOURCE3_URL=http://ftp.rz.tu-bs.de/pub/mirror/OpenOffice.org/stable/${VERSION}/
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}/
- SOURCE8_URL=$PATCH_URL
- SOURCE9_URL=$PATCH_URL
- SOURCE_VFY=sha1:e4e68570d488061e7e2e513e33916ce192dd1348
- SOURCE2_VFY=sha1:58c824ef969b017be5fcd7e4290d7681453aa354
- SOURCE3_VFY=sha1:bb2a89b95d7626a63a3787208e0abb99ea595d24
- SOURCE4_VFY=sha1:24ceb884c9d97722a2359e5ffe6a24e118a3918d
- SOURCE5_VFY=sha1:c8a6348a2259ae8df30a0bc3a72d09280a57988c
- SOURCE6_VFY=sha1:dba308a76a75320507c0d67a4cf5d2dac3dd01b0
- SOURCE7_VFY=sha1:3b4d0d312a1bed9bdb1bbdfb172fa7361533b498
- SOURCE8_VFY=sha1:d2e91ae7c374214dcd59a6fbdd732386a2040855
- SOURCE9_VFY=sha1:768ab295dc5bac786abe00cbb5bf8b2eaa85efe0
+ SOURCE_VFY=sha1:0246b77b0cb8445eb0c3ee9fb43f6e00ca54a61b
+ SOURCE2_VFY=sha1:bb2a89b95d7626a63a3787208e0abb99ea595d24
+ SOURCE3_VFY=sha1:7fefe877a551b4910ad40f7c828024d64ad92abd
+ SOURCE4_VFY=sha1:ea0cdaa50ac620219671deb30070d3c52d0e509c
+ SOURCE5_VFY=sha1:860262cc0f3c6bf0e49d34ad495b956512265ad3
+ SOURCE6_VFY=sha1:ef1041645ae444395f004eef4dbe31c472501476
+ SOURCE7_VFY=sha1:2ceb738b76f70feb4b4459308180dd65fcedf7e5
WEB_SITE=http://www.openoffice.org
ENTERED=20030805
- UPDATED=20090909
- PSAFE=no
+ UPDATED=20100306
SHORT="OpenOffice.org Office Suite"
cat << EOF
OpenOffice.org Office Suite
diff --git a/x11-apps/openoffice-src/DETAILS.x86_64 b/x11-apps/openoffice-src/DETAILS.x86_64
deleted file mode 100644
index 6e318c7..0000000
--- a/x11-apps/openoffice-src/DETAILS.x86_64
+++ /dev/null
@@ -1,38 +0,0 @@
- MODULE=openoffice-src
- VERSION=3.1.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
- SOURCE8=soltools-mkdepend-getline.diff
- SOURCE9=buildfix-sw-printf.diff
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/OOO310_m19
- 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}/
- SOURCE8_URL=$PATCH_URL
- SOURCE9_URL=$PATCH_URL
- SOURCE_VFY=sha1:e4e68570d488061e7e2e513e33916ce192dd1348
- SOURCE2_VFY=sha1:58c824ef969b017be5fcd7e4290d7681453aa354
- SOURCE3_VFY=sha1:bb2a89b95d7626a63a3787208e0abb99ea595d24
- SOURCE4_VFY=sha1:24ceb884c9d97722a2359e5ffe6a24e118a3918d
- SOURCE5_VFY=sha1:c8a6348a2259ae8df30a0bc3a72d09280a57988c
- SOURCE6_VFY=sha1:dba308a76a75320507c0d67a4cf5d2dac3dd01b0
- SOURCE7_VFY=sha1:3b4d0d312a1bed9bdb1bbdfb172fa7361533b498
- SOURCE8_VFY=sha1:d2e91ae7c374214dcd59a6fbdd732386a2040855
- SOURCE9_VFY=sha1:768ab295dc5bac786abe00cbb5bf8b2eaa85efe0
- WEB_SITE=http://www.openoffice.org
- ENTERED=20030805
- UPDATED=20090909
- PSAFE=no
- SHORT="OpenOffice.org Office Suite"
-cat << EOF
-OpenOffice.org Office Suite
-EOF
diff --git a/x11-apps/openoffice-src/PRE_BUILD b/x11-apps/openoffice-src/PRE_BUILD
index 621449b..044cc2a 100644
--- a/x11-apps/openoffice-src/PRE_BUILD
+++ b/x11-apps/openoffice-src/PRE_BUILD
@@ -2,7 +2,8 @@ default_pre_build &&
cd $SOURCE_DIRECTORY &&
+tar xf $SOURCE_CACHE/$SOURCE3 --strip-components=1 &&
tar xf $SOURCE_CACHE/$SOURCE4 --strip-components=1 &&
+tar xf $SOURCE_CACHE/$SOURCE6 --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/$SOURCE7 --strip-components=1
More information about the Lunar-commits
mailing list