Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c0e9b0bb96561afa85f3d074da076c8ab9bf8e41
commit c0e9b0bb96561afa85f3d074da076c8ab9bf8e41
Author: Miklos Vajna vmik...@frugalware.org
Date: Thu Jan 28 01:47:15 2010 +0100
openoffice.org-3.1.1-1-i686
- updated devel version to 3.2.0rc4
- added new l10n tarball to source()
- add missing subrodepends()
- depend on kdelibs=4.3.5
- drop mono-2.4 hack, no longer needed
- fix build breakage with xulrunner-1.9.1.7
diff --git a/source/xapps/openoffice.org/FrugalBuild
b/source/xapps/openoffice.org/FrugalBuild
index 28db14a..01b5868 100644
--- a/source/xapps/openoffice.org/FrugalBuild
+++ b/source/xapps/openoffice.org/FrugalBuild
@@ -8,20 +8,18 @@ if ! Fuse $USE_DEVEL; then
upstream=3.1.1
branch=-3-1-1
tree=ooo310
- dir=`echo $tree|tr [a-z] [A-Z]`
milestone=19
pkgver=$upstream
pkgrel=1
snapshot=1-20-gcbafe1f
else
- upstream=3.1.1
- branch=-3-1-1
- tree=ooo310
- dir=`echo $tree|tr [a-z] [A-Z]`
- milestone=18
+ upstream=3.2.0
+ branch=-3-2
+ tree=ooo320
+ milestone=11
pkgver=$upstream${tree}_m$milestone
pkgrel=1
- snapshot=9-g19a0671
+ snapshot=101-g91f019f
fi
pkgdesc=OpenOffice.org, a full office productivity suite.
url=http://www.openoffice.org/;
@@ -33,11 +31,10 @@ depends=('libxml2' 'libart_lgpl' 'libsndfile'
'libgcj-awt=4.4.0-2' 'nas' 'fontc
'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=(${makedepen...@]} 'curl' 'intltool' 'tcsh' 'pam-headers'
'apache-ant' 'kdelibs=3.5.10-3' \
-'evolution-data-server-ldap' 'boost' 'icu' 'hunspell' 'imake'
'gccmakedep' 'xalan-j' \
-'patch=2.5.9' 'openclipart' 'xorg-server' 'gstreamer'
'gst-plugins-base' 'gnome-vfs' \
-'libbonobo' 'procps' 'openldap' 'mono' 'gperf' 'xulrunner' \
-'java-gcj-compat=1.0.80-2' 'ecj')
+makedepends=('curl' 'intltool' 'tcsh' 'pam-headers' 'apache-ant' \
+'boost' 'icu' 'hunspell' 'imake' 'gccmakedep' 'xalan-j' \
+'patch=2.5.9' 'openclipart' 'xorg-server' 'gstreamer'
'gst-plugins-base' \
+'procps' 'openldap' 'gperf' 'xulrunner')
groups=('xapps')
archs=('i686' 'x86_64')
if ! Fuse $USE_DEVEL; then
@@ -45,9 +42,7 @@ if ! Fuse $USE_DEVEL; then
else
up2date=lynx -source -dump
http://cgit.freedesktop.org/ooo-build/ooo-build/plain/configure.in?h=ooo-build$branch
|grep ^DEFAULT_TAG|sed 's/DEFAULT_TAG=\(.*\)-\(.*\)/$upstream\1_\2/'
fi
-source=(http://ftp.frugalware.org/pub/other/sources/ooo-build/ooo-build$branch-$snapshot.tar.bz2
\
-http://download.go-oo.org/$dir/$tree-m$milestone-{ure,sdk,base,calc,writer,impress,artwork,filters,testing,bootstrap,libs-gui,libs-core,libs-extern,components,postprocess,libs-extern-sys,extensions,extras,help}.tar.bz2
\
-mono24-hack)
+source=(http://ftp.frugalware.org/pub/other/sources/ooo-build/ooo-build$branch-$snapshot.tar.bz2
http://git.frugalware.org/tarballs/openoffice.org/$tree-m$milestone-{artwork,base,bootstrap,calc,components,extras,filters,help,impress,libs-gui,libs-core,libs-extern,postprocess,sdk,testing,ure,writer,libs-extern-sys,extensions,l10n}.tar.bz2)
signatures=($source.asc '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' ''
'' '')
NOEXTRACT=1
options=(${optio...@]} 'scriptlet')
@@ -56,10 +51,16 @@ subpkgs=($pkgname-kde $pkgname-gnome $pkgname-sdk
$pkgname-mono $pkgnam
subdescs=($pkgname kde integration $pkgname gnome integration \
The OpenOffice.org Software Development Kit $pkgname mono integration \
$pkgname mozilla integration)
-subdepends=($pkgname=$pkgver kdelibs=3.5.5 \
- $pkgname=$pkgver gnome-vfs libbonobo evolution-data-server-ldap \
- $pkgname=$pkgver java-gcj-compat ecj \
- $pkgname=$pkgver mono \
+# TODO: use Finclude kde to get kde version
+subdepends=(kdelibs=4.3.5 \
+ gnome-vfs libbonobo evolution-data-server-ldap \
+ java-gcj-compat ecj gcc-gcj \
+ mono \
+ )
+subrodepends=($pkgname=$pkgver \
+ $pkgname=$pkgver \
+ $pkgname=$pkgver \
+ $pkgname=$pkgver \
$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')
@@ -100,7 +101,8 @@ done
i=0
while [ $i -lt ${#ooosubpk...@]} ]
do
-subdepends=(${subdepen...@]} openoffice.org=$pkgver)
+subdepends=(${subdepen...@]} )
+subrodepends=(${subrodepen...@]} openoffice.org=$pkgver)
subgroups=(${subgrou...@]} locale-extra)
subarchs=(${subarc...@]} i686 x86_64)
i=$(($i+1))
@@ -143,7 +145,7 @@ build()
Fmonoexport
Fextract ooo-build$branch-$snapshot.tar.bz2
Fcd ooo-build$branch-$snapshot
- cp -fv $Fsrcdir/mono24-hack patches/hotfixes/mono24-hack.diff || Fdie
+ #cp -fv $Fsrcdir/mono24-hack patches/hotfixes/mono24-hack.diff || Fdie
# Predownloaded tarballs
