Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1985e991043a75698f8bcdcb5e39fc82d2fbe707
commit 1985e991043a75698f8bcdcb5e39fc82d2fbe707
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date: Thu Jun 12 01:12:03 2008 +0200
openoffice.org-2.4.1-1-i686
- version bump
- no-oc.diff is now in upstream
diff --git a/source/xapps/openoffice.org/FrugalBuild
b/source/xapps/openoffice.org/FrugalBuild
index d4ad7c3..097b413 100644
--- a/source/xapps/openoffice.org/FrugalBuild
+++ b/source/xapps/openoffice.org/FrugalBuild
@@ -5,29 +5,34 @@
pkgname=openoffice.org
USE_DEVEL=${USE_DEVEL:-"n"}
if ! Fuse $USE_DEVEL; then
- upstream=2.4
- branch=
+ upstream=2.4.1
+ branch=-2-4-1
tree=ooh680
- milestone=12
+ dir=`echo $tree|tr [a-z] [A-Z]`
+ milestone=17
pkgver=$upstream
pkgrel=1
- snapshot=r12054
+ snapshot=r12728
else
- upstream=2.4
- branch=
+ upstream=2.4.1
+ branch=-2-4-1
tree=ooh680
- milestone=6
+ dir=`echo $tree|tr [a-z] [A-Z]`
+ milestone=17
pkgver=$upstream${tree}_m$milestone
pkgrel=1
- snapshot=r11544
+ snapshot=r12728
fi
pkgdesc="OpenOffice.org, a full office productivity suite."
url="http://www.openoffice.org/";
+_F_gnome_desktop="y"
+Finclude gnome-scriptlet mono java
+unset install
depends=('libxml2' 'libart_lgpl' 'libsndfile' 'libgcj-awt>=4.1.1-6' 'nas'
'fontconfig' 'libpng' 'imagemagick' \
'flex' 'neon>=0.26.1' 'bison' 'zip' 'unzip' 'expat' 'cups' 'desktop-file-utils'
'perl-archive-zip' \
'unixodbc' 'libxaw' 'libxslt' 'startup-notification' 'libwpd>=0.8.13')
# this is here as gstreamer is only a makedepend
-rodepends=('flac')
+rodepends=('flac' 'dejavu-ttf')
makedepends=('curl' 'intltool' 'tcsh' 'pam-headers' 'firefox' 'apache-ant'
'gcc-gcj' 'kdelibs>=3.5.5' \
'evolution-data-server-ldap' 'boost' 'icu' 'hunspell' 'imake' 'gccmakedep'
'xalan-j' \
'patch>=2.5.9' 'openclipart' 'xorg-server' 'gstreamer' 'gst-plugins-base'
'gnome-vfs' \
@@ -41,13 +46,12 @@ else
up2date="lynx -dump
http://svn.gnome.org/viewcvs/ooo-build/trunk/configure.in?view=markup |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://hu.openoffice.org/source/browse/*checkout*/hu/src/2.3.0/SDF/hu.sdf \
- no-oc.diff)
-signatures=($source.asc '' '')
+ http://download.go-oo.org/$dir/$tree-m$milestone-core.tar.bz2 \
+ http://download.go-oo.org/$dir/$tree-m$milestone-lang.tar.bz2 \
+ http://download.go-oo.org/$dir/$tree-m$milestone-system.tar.bz2)
+signatures=($source.asc '' '' '')
+NOEXTRACT=1
options=([EMAIL PROTECTED] 'scriptlet')
-_F_gnome_desktop="y"
-Finclude gnome-scriptlet mono
-unset install
subpkgs=("$pkgname-kde" "$pkgname-gnome")
subdescs=("$pkgname kde integration" "$pkgname gnome integration")
@@ -98,25 +102,27 @@ done
build() {
Fmonoexport
+ Fextract ooo-build$branch-$snapshot.tar.bz2
if [ -n "$branch" ]; then
Fcd ooo-build-$(echo $branch|sed 's/^-//;s/-/./g')
else
Fcd ooo-build
fi
- # Extra localizations
- cp $Fsrcdir/hu.sdf src/GSI_hu.sdf || return 1
+ # Predownloaded tarballs
+ for i in $Fsrcdir/$tree-m$milestone-*
+ do
+ ln -sf $i src/
+ done
# Remove our patches so that incremental build will be possible.
- rm -f patches/src680/no-oc.diff
+ #rm -f patches/src680/no-oc.diff
Fpatchall
- # this would fail to apply
- sed -i '/xulrunner-1.9.diff/d' patches/src680/apply
# SMP build
if [ ! -z "$MAKEFLAGS" ]; then
- # Uncomment this if you really want an smp build. It may or may
not work.
- #Fconfopts="$Fconfopts --with-num-cpus=${MAKEFLAGS/-j}"
+ # Comment this out if you think the build failed because of
being SMP.
+ Fconfopts="$Fconfopts --with-num-cpus=${MAKEFLAGS/-j}"
unset MAKEFLAGS
fi
@@ -130,19 +136,14 @@ build() {
--enable-hunspell \
--with-binsuffix=no \
--disable-dependency-tracking \
- --with-fonts \
--with-installed-ooo-dirname=openoffice.org \
- --with-mono-gac-root=/usr/lib \
- --with-system-mozilla=firefox"
+ --with-mono-gac-root=/usr/lib"
# Set our version.
Fsed "AC_PACKAGE_VERSION" "$pkgver-$pkgrel" configure.in
autoconf || return 1
# Optimize build.
- ## HACK! don't remove or it eats your box got killed here while
- ## eating 3G mem ...
- export CFLAGS="$(echo $CFLAGS|sed 's/-O2/-O0/')"
export ARCH_FLAGS="$CFLAGS"
if ! Fuse $USE_DEVEL; then
diff --git a/source/xapps/openoffice.org/no-oc.diff
b/source/xapps/openoffice.org/no-oc.diff
deleted file mode 100644
index 51b5401..0000000
--- a/source/xapps/openoffice.org/no-oc.diff
+++ /dev/null
@@ -1,46 +0,0 @@
- ... languages oc ...
- ... creating language pack: oc !
- ... analyzing files ...
- WARNING: Using autotextshare_en-US.zip instead of
autotextshare_oc.zip
- WARNING: Using palettes_en-US.zip instead of palettes_oc.zip
- WARNING: Using tpllayoutimpr_en-US.zip instead of
tpllayoutimpr_oc.zip
- WARNING: Using tplpresntimpr_en-US.zip instead of
tplpresntimpr_oc.zip
- WARNING: Using tplwizagenda_en-US.zip instead of tplwizagenda_oc.zip
- WARNING: Using tplwizdesktop_en-US.zip instead of
tplwizdesktop_oc.zip
- WARNING: Using tplwizfax_en-US.zip instead of tplwizfax_oc.zip
- WARNING: Using tplwizletter_en-US.zip instead of tplwizletter_oc.zip
- WARNING: Using tplwizreport_en-US.zip instead of tplwizreport_oc.zip
- WARNING: Using tplwizstyles_en-US.zip instead of tplwizstyles_oc.zip
- WARNING: Using wordbook_en-US.zip instead of wordbook_oc.zip
- ... analyzing files with flag ARCHIVE ...
-
- **************************************************
- ERROR: ERROR: No packages defined!
-diff --git a/patches/src680/apply b/patches/src680/apply
-index 66b489d..ec5f68e 100644
---- a/patches/src680/apply
-+++ b/patches/src680/apply
-@@ -968,6 +968,7 @@ SectionOwner => davidf
-
- [ FrugalwareOnly ]
- gcc401-stlport45-include.diff, gghibo
-+no-oc.diff, vmiklos
-
-
- # ( [EMAIL PROTECTED] deals with defaults apparently )
-diff --git a/patches/src680/no-oc.diff b/patches/src680/no-oc.diff
-new file mode 100644
-index 0000000..337310a
---- /dev/null
-+++ b/patches/src680/no-oc.diff
-@@ -0,0 +1,10 @@
-+--- solenv/inc/postset.mk.orig 2008-02-13 13:40:48.000000000 +0100
-++++ solenv/inc/postset.mk 2008-02-13 13:41:03.000000000 +0100
-+@@ -39,6 +39,6 @@
-+ defaultlangiso=en-US
-+
-+ # Complete list of all supported ISO codes
-+-completelangiso=af ar as-IN be-BY bg br bn bn-BD bn-IN bs ca cs cy da de dz
el en-GB en-US en-ZA eo es et eu fa fi fr ga gl gu-IN he hi-IN hr hu it ja ka
km kn ko ku lo lt lv mk ms ml-IN mr-IN ne nb nl nn nr ns oc or-IN pa-IN pl pt
pt-BR ru rw sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER ta-IN th tn tr ts tg
ur-IN uk uz ve vi xh zh-CN zh-TW zu
-++completelangiso=af ar as-IN be-BY bg br bn bn-BD bn-IN bs ca cs cy da de dz
el en-GB en-US en-ZA eo es et eu fa fi fr ga gl gu-IN he hi-IN hr hu it ja ka
km kn ko ku lo lt lv mk ms ml-IN mr-IN ne nb nl nn nr ns or-IN pa-IN pl pt
pt-BR ru rw sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER ta-IN th tn tr ts tg
ur-IN uk uz ve vi xh zh-CN zh-TW zu
-+
-+ alllangiso=$(strip $(defaultlangiso) $(subst,$(defaultlangiso), $(uniq
$(subst,ALL,$(completelangiso) $(WITH_LANG)))))
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
