Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=129e5f2763fc799f340843c874d80d385a047b09

commit 129e5f2763fc799f340843c874d80d385a047b09
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Sat Mar 12 01:08:54 2011 +0100

libreoffice-3.3.1.2-1-i686

- USE_DEVEL: 3.3.2rc1
- drop no longer necessary replaces

diff --git a/source/xapps/libreoffice/FrugalBuild 
b/source/xapps/libreoffice/FrugalBuild
index 0ad63a9..b989eb6 100644
--- a/source/xapps/libreoffice/FrugalBuild
+++ b/source/xapps/libreoffice/FrugalBuild
@@ -11,7 +11,7 @@ if ! Fuse $USE_DEVEL; then
pkgver=3.3.1.2
pkgrel=1
else
-       pkgver=3.3.1.2
+       pkgver=3.3.2.1
pkgrel=1
fi
pkgdesc="LibreOffice Productivity Suite, a fork of OpenOffice.org."
@@ -33,7 +33,7 @@ makedepends=('curl>=7.20.0-2' 'intltool' 'tcsh' 'ecj' 
'apache-ant' \
'mythes' 'hyphen')
groups=('xapps')
archs=('i686' 'x86_64')
-replaces=('openoffice.org' 'ooextras')
+replaces=('ooextras')
mirror="http://download.documentfoundation.org/libreoffice/src/";
_F_archive_name="libreoffice-build"
up2date="Flasttar $mirror"
@@ -89,7 +89,6 @@ subrodepends=("$pkgname=$pkgver" \
subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64')
subgroups=('kde-extra' 'gnome-extra' 'devel-extra' 'devel-extra' 'xapps')
subinstall=("" "$_F_gnome_scriptlet" "" "" "")
-subreplaces=('openoffice.org-kde' 'openoffice.org-gnome' 'openoffice.org-sdk' 
'openoffice.org-mono' 'openoffice.org-mozilla')

# sed ':a;N;$!ba;s/\\\n//g' solenv/inc/postset.mk|grep ^completelangiso=|sed 
's/completelangiso=//;s/en-US //'
completelangiso=(af ar as ast be-BY bo bg br brx bn bs ca ca-XV cs cy da
@@ -126,20 +125,7 @@ while [ $i -lt ${#completelangiso[@]} ]
do
subpkgs=("${subpkgs[@]}" "$pkgname-l10n-`echo ${completelangiso[$i]}|tr [A-Z] 
[a-z]`")
subdescs=("${subdescs[@]}" "Installs ${completelangdescs[$i]} support in 
LibreOffice")
-       subreplaces=("${subreplaces[@]}" "openoffice.org-i18n-`echo 
${completelangiso[$i]}|tr [A-Z] [a-z]`")
-       i=$(($i+1))
-done
-
-i=0
-while [ $i -lt ${#completelangiso[@]} ]
-do
subinstall=("${subinstall[@]}" '')
-       i=$(($i+1))
-done
-
-i=0
-while [ $i -lt ${#completelangiso[@]} ]
-do
subdepends=("${subdepends[@]}" "")
subrodepends=("${subrodepends[@]}" "$pkgname>=$pkgver")
subgroups=("${subgroups[@]}" "locale-extra")
@@ -167,6 +153,7 @@ build()
# FIXME --with-openclipart=/usr/share/openclipart does not fail,
# but slows down the build at the moment and in the end it does
# not do anything, so disable it for now.
+       # mono-2.8 and mdds-0.5 are not yet supported
Fconfopts="$Fconfopts \
--with-distro=Frugalware \
--with-gcc-speedup=ccache \
@@ -177,13 +164,13 @@ build()
--with-system-libwps \
--with-system-libwpg \
--with-system-mdbtools \
-               --with-system-mdds"
+               --without-system-mdds \
+               --disable-mono"

# Optimize build.
export ARCH_FLAGS="$CFLAGS"

-       # mono-2.8 and mdds-0.5 are not yet supported
-       Fconf --with-lang="en-US ${completelangiso[*]}" --disable-mono 
--without-system-mdds
+       Fconf --with-lang="en-US ${completelangiso[*]}"
# avoid problems with ixion for now
sed -i '/fields-table-formula.diff/d' patches/dev300/apply || return 1
mkdir -p src
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to