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

commit 4d6489195ef6279934b77192628568b3ffafaac6
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Sat Aug 7 15:11:28 2010 +0200

openoffice.org-3.2.1-4-i686

- USE_DEVEL:
* don't add non-existing files to subinstall()
* build with system lucene
* switch to openjdk, which allows us to enable odk again

diff --git a/source/xapps/openoffice.org/FrugalBuild 
b/source/xapps/openoffice.org/FrugalBuild
index ef6f86d..74d0779 100644
--- a/source/xapps/openoffice.org/FrugalBuild
+++ b/source/xapps/openoffice.org/FrugalBuild
@@ -17,24 +17,25 @@ else
branch=
tree=ooo330
milestone=2
-       pkgver=$upstream${tree}_m$milestone.g2e0b9d4
+       pkgver=$upstream${tree}_m$milestone.14834.gc2258e4
pkgrel=1
fi
pkgdesc="OpenOffice.org, a full office productivity suite."
url="http://www.openoffice.org/";
_F_gnome_desktop="y"
-Finclude gnome-scriptlet mono java kde
+Finclude gnome-scriptlet mono kde
install=openoffice.org.install
depends=('libxml2' 'libart_lgpl' 'libsndfile' 'libgcj-awt>=4.4.0-2' 'nas' 
'fontconfig' 'libpng>=1.4.1' 'imagemagick' \
'flex' 'neon>=0.26.1' 'bison' 'zip' 'unzip' 'expat' 'cups' 'desktop-file-utils' 
'perl-archive-zip' \
'unixodbc' 'libxaw>=1.0.5' 'libxslt' 'startup-notification>=0.9-3' 
'libwpd>=0.8.13' 'poppler')
# this is here as gstreamer is only a makedepend
rodepends=('flac' 'dejavu-ttf')
-makedepends=('curl>=7.20.0-2' 'intltool' 'tcsh' 'pam-headers' 'apache-ant' \
+# lucene can be any 2.x version actually
+makedepends=('curl>=7.20.0-2' 'intltool' 'tcsh' 'pam-headers' 'gcc-gcj' 
'apache-ant' \
'boost' 'icu' 'hunspell' 'imake' 'gccmakedep' 'xalan-j' \
'patch>=2.5.9' 'openclipart' 'xorg-server' 'gstreamer' 'gst-plugins-base' \
'procps' 'openldap' 'gperf' 'xulrunner' 'kdelibs-compiletime' 'libwps' \
-            'libwpg' 'mdbtools' 'mdds' 'junit')
+            'libwpg' 'mdbtools' 'mdds' 'junit' 'lucene=2.9.3')
groups=('xapps')
archs=('i686' 'x86_64')
if ! Fuse $USE_DEVEL; then
@@ -57,7 +58,7 @@ subdescs=("$pkgname kde integration" "$pkgname gnome 
integration" \
"$pkgname mozilla integration")
subdepends=("kdelibs>=$_F_kde_ver" \
"gnome-vfs libbonobo evolution-data-server-ldap" \
-       "java-gcj-compat ecj gcc-gcj" \
+       "openjdk>=6" \
"mono" \
"")
subrodepends=("$pkgname=$pkgver" \
@@ -93,7 +94,7 @@ done
i=0
while [ $i -lt ${#ooosubpk...@]} ]
do
-       if echo "$ooodicts"|grep -q ${ooosubpkgs[$i]}; then
+       if ! Fuse $USE_DEVEL && echo "$ooodicts"|grep -q ${ooosubpkgs[$i]}; then
subinstall=("${subinsta...@]}" "openoffice.org-i18n-${ooosubpkgs[$i]}.install")
else
subinstall=("${subinsta...@]}" '')
@@ -192,7 +193,6 @@ build()
--with-openclipart=/usr/share/openclipart \
--with-binsuffix=no \
--with-installed-ooo-dirname=openoffice.org\
-               --disable-odk \
--with-system-cairo \
--with-system-libwpd \
--with-system-libwps \
@@ -207,7 +207,7 @@ build()
Fconf --with-lang=ALL --without-git \
--with-build-version="openoffice.org-$pkgver-$pkgrel-$CARCH 
(ooo-build-${snapshot##*g})"
else
-               Fconf --with-lang="en-US de es fr hu"
+               Fconf --with-lang="en-US de es fr hu it pt"
fi

./download || return 1
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to