Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=3fc57ef2b8e9eface78b38897d9d1c6d1784b732
commit 3fc57ef2b8e9eface78b38897d9d1c6d1784b732
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date: Wed Jan 23 09:05:41 2008 +0100
openoffice.org-2.4ooh680_m3-1-i686
update to ooh680-m3 (prerelease of 2.4)
diff --git a/source/xapps/openoffice.org/FrugalBuild
b/source/xapps/openoffice.org/FrugalBuild
index db72ca3..8425ab3 100644
--- a/source/xapps/openoffice.org/FrugalBuild
+++ b/source/xapps/openoffice.org/FrugalBuild
@@ -4,46 +4,46 @@
pkgname=openoffice.org
USE_DEVEL=${USE_DEVEL:-"y"}
-if ! [ $USE_DEVEL ]; then
- upstream=2.2.1
- branch=2-2
- tree=oof680
- milestone=18
+if ! Fuse $USE_DEVEL; then
+ upstream=2.3.1
+ branch=-2-3
+ tree=oog680
+ milestone=9
pkgver=$upstream
- pkgrel=2
- snapshot=20070628
+ pkgrel=1
+ snapshot=20071205
else
- upstream=2.3
- tree=oog680
- milestone=5
+ upstream=2.4
+ branch=
+ tree=ooh680
+ milestone=3
pkgver=$upstream${tree}_m$milestone
pkgrel=1
- snapshot=20070912
+ snapshot=r11351
fi
pkgdesc="OpenOffice.org, a full office productivity suite."
url="http://www.openoffice.org/";
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')
+ 'unixodbc' 'libxaw' 'libxslt' 'startup-notification' 'libwpd>=0.8.13')
# this is here as gstreamer is only a makedepend
rodepends=('flac')
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' \
- 'libbonobo' 'procps' 'openldap' 'mono' 'gperf' 'xulrunner')
+ 'libbonobo' 'procps' 'openldap' 'mono' 'gperf' 'xulrunner' \
+ 'java-gcj-compat>=1.0.72-7' 'ecj')
groups=('xapps')
archs=('i686' 'x86_64')
-if ! [ $USE_DEVEL ]; then
+if ! Fuse $USE_DEVEL; then
up2date="lynx -dump $url |grep version:|sed 's/.*: //'"
-
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.2.0/SDF/hu.sdf.bz2)
- signatures=($source.asc '')
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/'"
-
source=(http://ftp.frugalware.org/pub/other/sources/ooo-build/ooo-build-$snapshot.tar.bz2
\
-
http://hu.openoffice.org/source/browse/*checkout*/hu/src/2.2.0/SDF/hu.sdf.bz2)
- signatures=($source.asc '')
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-with-java.diff)
+signatures=($source.asc '' '')
options=([EMAIL PROTECTED] 'scriptlet')
_F_gnome_desktop="y"
Finclude gnome-scriptlet mono
@@ -59,9 +59,9 @@ subinstall=("" "$_F_gnome_scriptlet")
ooosubpkgs=('de' 'es' 'fr' 'hu')
ooosubdescs=('German' 'Spanish' 'French' 'Hungarian')
-if ! [ $USE_DEVEL ]; then
- ooosubpkgs=([EMAIL PROTECTED] 'af' 'ar' 'be-BY' 'bg' 'bn' 'bn-BD'
'bn-IN' 'br' 'bs' 'ca' 'cy' 'cs' 'da' 'el' 'en-GB' 'en-ZA' 'eo' 'et' 'eu' 'fi'
'ga' 'gl' 'gu-IN' 'he' 'hi-IN' 'hr' 'it' 'ja' 'km' 'kn-IN' 'ko' 'lo' 'lt' 'lv'
'mk' 'ms' 'nb' 'ne' 'nl' 'nn' 'nr' 'ns' 'pa-IN' 'pl' 'pt' 'pt-BR' 'ru' 'rw'
'sh-YU' 'sk' 'sl' 'sr-CS' 'ss' 'st' 'sv' 'sw' 'sw-TZ' 'sx' 'ta-IN' 'th' 'tn'
'tr' 'ts' 've' 'vi' 'xh' 'zh-CN' 'zh-TW' 'zu' 'fa' 'ku' 'as-IN' 'ml-IN' 'mr-IN'
'or-IN' 'te-IN' 'tg' 'ti-ER' 'uk' 'ur-IN' 'dz')
- ooosubdescs=([EMAIL PROTECTED] 'Afrikaans' 'Arabic' 'Belarusian'
'Bulgarian' 'Bengali' 'Bengali (Bangladesh)' 'Bengali (India)' 'Breton'
'Bosnian' 'Catalan' 'Welsh' 'Czech' 'Danish' 'Greek' 'English (GB)' 'English
(South Africa)' 'Esperanto' 'Estonian' 'Basque' 'Finnish' 'Irish' 'Galician'
'Gujarati' 'Hebrew' 'Hindi' 'Croatian' 'Italian' 'Japanese' 'Khmer (Cambodia)'
'Kannada' 'Korean' 'Lao' 'Lithuanian' 'Latvian' 'Macedonian' 'Malay' 'Norwegian
Bokmal' 'Nepali' 'Dutch' 'Norwegian Nynorsk' 'Ndebele, South'
'NorthernSotho/Sepedi' 'Punjabi' 'Polish' 'Portuguese' 'Brazil (Port.)'
'Russian' 'Kinyarwanda' 'Serbian Latin' 'Slovak' 'Slovenian' 'Serbian Cyrillic'
'Swati' 'Sotho' 'Swedish' 'Swahili' 'Swahili ' 'South Georgian' 'Tamil' 'Thai'
'Tswana' 'Turkish' 'Tsonga' 'Venda' 'Vietnamese' 'Xhosa' 'Chinese (simplified)'
'Chinese (traditional)' 'Zulu' 'Persian' 'Kurdish' 'Assamese' 'Malayalam'
'Marathi' 'Oriya' 'Telugu' 'Tajik' 'Tigrinya' 'Ukrainian' 'Urdu' 'Dzongkha')
+if ! Fuse $USE_DEVEL; then
+ ooosubpkgs=([EMAIL PROTECTED] 'af' 'ar' 'be-BY' 'bg' 'bn' 'bn-BD'
'bn-IN' 'br' 'bs' 'ca' 'cy' 'cs' 'da' 'el' 'en-GB' 'en-ZA' 'eo' 'et' 'eu' 'fi'
'ga' 'gl' 'gu-IN' 'he' 'hi-IN' 'hr' 'it' 'ja' 'km' 'kn-IN' 'ko' 'lo' 'lt' 'lv'
'mk' 'ms' 'nb' 'ne' 'nl' 'nn' 'nr' 'ns' 'pa-IN' 'pl' 'pt' 'pt-BR' 'ru' 'rw'
'sh-YU' 'sk' 'sl' 'sr-CS' 'ss' 'st' 'sv' 'sw' 'sw-TZ' 'sx' 'ta-IN' 'th' 'tn'
'tr' 'ts' 've' 'vi' 'xh' 'zh-CN' 'zh-TW' 'zu' 'fa' 'ku' 'as-IN' 'ml-IN' 'mr-IN'
'or-IN' 'te-IN' 'tg' 'ti-ER' 'uk' 'ur-IN' 'dz' 'ka')
+ ooosubdescs=([EMAIL PROTECTED] 'Afrikaans' 'Arabic' 'Belarusian'
'Bulgarian' 'Bengali' 'Bengali (Bangladesh)' 'Bengali (India)' 'Breton'
'Bosnian' 'Catalan' 'Welsh' 'Czech' 'Danish' 'Greek' 'English (GB)' 'English
(South Africa)' 'Esperanto' 'Estonian' 'Basque' 'Finnish' 'Irish' 'Galician'
'Gujarati' 'Hebrew' 'Hindi' 'Croatian' 'Italian' 'Japanese' 'Khmer (Cambodia)'
'Kannada' 'Korean' 'Lao' 'Lithuanian' 'Latvian' 'Macedonian' 'Malay' 'Norwegian
Bokmal' 'Nepali' 'Dutch' 'Norwegian Nynorsk' 'Ndebele, South'
'NorthernSotho/Sepedi' 'Punjabi' 'Polish' 'Portuguese' 'Brazil (Port.)'
'Russian' 'Kinyarwanda' 'Serbian Latin' 'Slovak' 'Slovenian' 'Serbian Cyrillic'
'Swati' 'Sotho' 'Swedish' 'Swahili' 'Swahili ' 'South Georgian' 'Tamil' 'Thai'
'Tswana' 'Turkish' 'Tsonga' 'Venda' 'Vietnamese' 'Xhosa' 'Chinese (simplified)'
'Chinese (traditional)' 'Zulu' 'Persian' 'Kurdish' 'Assamese' 'Malayalam'
'Marathi' 'Oriya' 'Telugu' 'Tajik' 'Tigrinya' 'Ukrainian' 'Urdu' 'Dzongkha'
'Georgian')
fi
if [ [EMAIL PROTECTED] -ne [EMAIL PROTECTED] ]; then
@@ -98,9 +98,8 @@ done
build() {
Fmonoexport
- if ! [ $USE_DEVEL ]; then
- Fcd ooo-build-${branch//-/.}
- rm -f patches/src680/fix-invisible-text.diff
+ if [ -n "$branch" ]; then
+ Fcd ooo-build-$(echo $branch|sed 's/^-//;s/-/./g')
else
Fcd ooo-build
fi
@@ -109,10 +108,12 @@ build() {
cp $Fsrcdir/hu.sdf src/GSI_hu.sdf || return 1
# Remove our patches so that incremental build will be possible.
+ #rm -f patches/src680/fix-invisible-text.diff
Fpatchall
# 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}"
unset MAKEFLAGS
fi
@@ -136,9 +137,12 @@ build() {
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 [ $USE_DEVEL ]; then
+ if Fuse $USE_DEVEL; then
Fconf --with-lang="en-US de es fr hu" --enable-separate-helpcontent
else
Fconf --with-lang=ALL
@@ -150,6 +154,9 @@ build() {
Fmakeinstall
+ # Permission fixes
+ find $Fdestdir/usr/lib/openoffice.org/program -name "*.so" ! -perm 755
-exec chmod 755 {} \;
+
# Enable the mozilla plugin
Fmkdir /usr/lib/mozilla/plugins
Fln /usr/lib/openoffice.org/program/libnpsoplugin.so /usr/lib/mozilla/plugins/
@@ -177,7 +184,9 @@ build() {
done
## Split KDE stuff
- for kde in fps_kde.uno.so kdebe*.uno.so kdefilepicker kde-open-url
libvclplug_kde*.so; do
+ for kde in fps_kde.uno.so kdebe*.uno.so kdefilepicker kde-open-url
libvclplug_kde*.so \
+ libkabdrv*.so
+ do
Fsplit $pkgname-kde usr/lib/openoffice.org/program/$kde
done
## Split GNOME stuff
diff --git a/source/xapps/openoffice.org/no-with-java.diff
b/source/xapps/openoffice.org/no-with-java.diff
new file mode 100644
index 0000000..e5bf4cb
--- /dev/null
+++ b/source/xapps/openoffice.org/no-with-java.diff
@@ -0,0 +1,13 @@
+diff --git a/distro-configs/Frugalware.conf.in
b/distro-configs/Frugalware.conf.in
+index c902868..76efc9a 100644
+--- a/distro-configs/Frugalware.conf.in
++++ b/distro-configs/Frugalware.conf.in
+@@ -15,7 +15,7 @@
+ --with-serializer-jar=/usr/share/java/serializer.jar
+ --with-system-xerces
+ --with-system-xml-apis
+---with-java=gij
++--with-jdk-home=/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0
+ --enable-libsn
+ --enable-kde
+ --enable-crashdump=yes
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
