Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdetesting2.git;a=commitdiff;h=6530cb3e7a21a0bf04ae85f88d8620634b814705

commit 6530cb3e7a21a0bf04ae85f88d8620634b814705
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Fri Jan 14 16:26:04 2011 +0100

openoffice.org-3.2.1-6-i686

- USE_DEVEL:
- up to libreoffice 3.3rc3
- use signatures() instead of sha1sums()
- disable system-mdds, mdds-0.5 is not yet supported
- handle parallel make install errors

diff --git a/source/xapps/openoffice.org/FrugalBuild 
b/source/xapps/openoffice.org/FrugalBuild
index 9a38106..02b980d 100644
--- a/source/xapps/openoffice.org/FrugalBuild
+++ b/source/xapps/openoffice.org/FrugalBuild
@@ -29,7 +29,7 @@ else
milestone=7
pkgver=$upstream${tree}_m$milestone.15035.g955ee5e
else
-               pkgver=3.3.0.2
+               pkgver=3.3.0.3
fi
pkgrel=1
fi
@@ -75,73 +75,38 @@ else
mirror="http://download.documentfoundation.org/libreoffice/src/";
_F_archive_name="libreoffice-build"
up2date="Flasttar $mirror"
-               source=($mirror/libreoffice-artwork-$pkgver.tar.bz2
-                       $mirror/libreoffice-base-$pkgver.tar.bz2
-                       $mirror/libreoffice-bootstrap-$pkgver.tar.bz2
-                       $mirror/libreoffice-calc-$pkgver.tar.bz2
-                       $mirror/libreoffice-components-$pkgver.tar.bz2
-                       $mirror/libreoffice-extensions-$pkgver.tar.bz2
-                       $mirror/libreoffice-extras-$pkgver.tar.bz2
-                       $mirror/libreoffice-filters-$pkgver.tar.bz2
-                       $mirror/libreoffice-help-$pkgver.tar.bz2
-                       $mirror/libreoffice-impress-$pkgver.tar.bz2
-                       $mirror/libreoffice-l10n-$pkgver.tar.bz2
-                       $mirror/libreoffice-libs-core-$pkgver.tar.bz2
-                       $mirror/libreoffice-libs-extern-sys-$pkgver.tar.bz2
-                       $mirror/libreoffice-libs-extern-$pkgver.tar.bz2
-                       $mirror/libreoffice-libs-gui-$pkgver.tar.bz2
-                       $mirror/libreoffice-postprocess-$pkgver.tar.bz2
-                       $mirror/libreoffice-sdk-$pkgver.tar.bz2
-                       $mirror/libreoffice-testing-$pkgver.tar.bz2
-                       $mirror/libreoffice-ure-$pkgver.tar.bz2
-                       $mirror/libreoffice-writer-$pkgver.tar.bz2
-                       $mirror/libreoffice-build-$pkgver.tar.gz \
-                       
http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll)
+               modules=('artwork' 'base' 'bootstrap' 'calc'
+                       'components' 'extensions' 'extras' 'filters' 'help'
+                       'impress' 'l10n' 'libs-core' 'libs-extern-sys'
+                       'libs-extern' 'libs-gui' 'postprocess' 'sdk' 'testing'
+                       'ure' 'writer' 'build')
+               source=()
+               for i in ${modules[@]}
+               do
+                       [ $i == build ] && ext=gz || ext=bz2
+                       source=(${source[@]} 
$mirror/libreoffice-$i-$pkgver.tar.$ext)
+                       signatures=(${signatures[@]} 
$mirror/libreoffice-$i-$pkgver.tar.$ext.asc)
+               done
+               source=(${source[@]} 
http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll)
+               signatures=("${signatures[@]}" '')
ext_source=(18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz \
fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz \
ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip \
1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz \
798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip \
-                       35c94d2df8893241173de1d16b6034c0-swingExSrc.zip)
+                       35c94d2df8893241173de1d16b6034c0-swingExSrc.zip \
+                       cf8a6967f7de535ae257fa411c98eb88-mdds_0.3.0.tar.bz2)
for i in ${ext_source[@]}
do
source=(${source[@]} http://hg.services.openoffice.org/binaries/$i)
+                       signatures=("${signatures[@]}" '')
done
go_oo_source=(extras-3.1.tar.bz2 biblio.tar.bz2)
for i in ${go_oo_source[@]}
do
source=(${source[@]} http://download.go-oo.org/SRC680/$i)
+                       signatures=("${signatures[@]}" '')
done
-               sha1sums=('ff837dbc5ac4d8431e4041ba6d58832005cae074' \
-          'ac81bc4d8621ad2a74c6318fb4226d994d02d13f' \
-          '9ac24e7908a34a5fe640fc7f7e049d6db23a2f5f' \
-          '37ee6b4e7fcbf841829501bbcab613fad739f2ee' \
-          'aaa2bbe5f5d088e209c31573a5dd5db4ce0369e7' \
-          '3642fc3dc39f3421241f0f29cc4a0fdc028329b4' \
-          'a00d41c752d82e56fe57616b812ef45dd56b9617' \
-          '09ab1f9e1afac6819961dff33480171672213c62' \
-          'a36c57ec6e5ce9c4eb9c252f52168a4fe8bd4887' \
-          '6c4febd38622eab7ae031607abbd33b4b2dacd42' \
-          '072c3c843a59b79a3a3c9ab7f0f531eb3fc1d999' \
-          'e894917e50f47b4acb4db98850c64f9fb3948073' \
-          '40e2bb092318b07a04b74f85578ff4305edf909d' \
-          '95d9076b9a8d1b48b0b07dbaf4dd928998386f9a' \
-          '58e0f159e45300aafe5a91c2ca34831431449a4c' \
-          '6e078c211d66f797552fcf565fd61d03c7ec7e62' \
-          '4d094cf5765d36b917911600b433f16b76a68932' \
-          'cb32ee5d48e39a97ca4085f2b411c733202ee12f' \
-          'a54885c0363a229100ad9876852126d6353d6815' \
-          'e8fda650937e2f4b39f4dcedfadd807f81ca6688' \
-          '49bb9d14ce84ae15a7782e81c7185d8f55efd8f2' \
-          '712720da502d36175cd7aa05cb1862ee0330638c' \
-          '1dcd28d3fc7af42ceb63006cdc56aa55ac66d355' \
-          '6e836945719e137596df1ca82f0afa809e8a2e88' \
-          '528dc8fa11343fa2a5d584dd2f8d5e2238ed78ba' \
-          '8f949ae74a6d66278a595bd063f13e0ad196d14a' \
-          '8a90669029e107b61953b90ba11545fef586c2ca' \
-          '1acea86fd399ed7817879d36370d3d1f8b109050' \
-          'c4e9c3ed2502c584f1b6e4b7d650afc8c33fccb6' \
-          '5a12014afa75ecb51b9688497450115d64f1c167')
fi
fi
NOEXTRACT=1
@@ -326,8 +291,8 @@ build()
if Fuse $USE_GIT; then
Fconf --with-git=http://frugalware.org/git/pub/other/sources/libreoffice
else
-                       # mono-2.8 not yet supported
-                       Fconf --disable-mono
+                       # mono-2.8 and mdds-0.5 are not yet supported
+                       Fconf --disable-mono --without-system-mdds
# avoid problems with ixion for now
sed -i '/fields-table-formula.diff/d' patches/dev300/apply || return 1
mkdir -p src
@@ -357,7 +322,11 @@ build()
make || return 1
fi

-       Fmakeinstall
+       # same for make install
+       if ! make DESTDIR=$Fdestdir install; then
+               Fsed "^MAX_JOBS=.*" "MAX_JOBS='1'" bin/setup
+               make DESTDIR=$Fdestdir install || return 1
+       fi

if Fuse $USE_DEVEL; then
# Install artwork
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to