Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=wipv.git;a=commitdiff;h=ca16f7fdc1eec6f5cfb6c0b0c728bc6ce4affaa6

commit ca16f7fdc1eec6f5cfb6c0b0c728bc6ce4affaa6
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Thu Aug 5 00:09:03 2010 +0200

openoffice.org-3.2.1-4-i686

- no release bump, all changes affect USE_DEVEL builds only
- update to ooo330_m2 (which will become 3.3-alpha soon)
- add support for building from git directly
- add support for OOo-3.3-style extensions
- use --with-max-jobs instead of --with-num-cpus for smp builds
- use --with-build-version insetad of hacking configure.in to document
pkgver-pkgrel in the OOo about dialog

diff --git a/source/xapps/openoffice.org/FrugalBuild 
b/source/xapps/openoffice.org/FrugalBuild
index 3e8f1e9..ef6f86d 100644
--- a/source/xapps/openoffice.org/FrugalBuild
+++ b/source/xapps/openoffice.org/FrugalBuild
@@ -13,13 +13,12 @@ if ! Fuse $USE_DEVEL; then
pkgrel=4
snapshot=4-23-ge68b7f9
else
-       upstream=3.2.1
-       branch=-3-2-1
-       tree=ooo320
-       milestone=19
-       pkgver=$upstream${tree}_m$milestone
+       upstream=3.3.0
+       branch=
+       tree=ooo330
+       milestone=2
+       pkgver=$upstream${tree}_m$milestone.g2e0b9d4
pkgrel=1
-       snapshot=3-16-gc38220b
fi
pkgdesc="OpenOffice.org, a full office productivity suite."
url="http://www.openoffice.org/";
@@ -35,16 +34,20 @@ makedepends=('curl>=7.20.0-2' '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' 'kdelibs-compiletime' 'libwps' \
-            'libwpg' 'mdbtools' 'mdds')
+            'libwpg' 'mdbtools' 'mdds' 'junit')
groups=('xapps')
archs=('i686' 'x86_64')
if ! Fuse $USE_DEVEL; then
up2date="lynx -dump http://download.openoffice.org/source/|grep Source|sed 
's/.* \(.*\) .*/\1/;q'"
+       
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 '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' 
'' '' '' '')
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/'"
+       unset source signatures
+       _F_scm_type="git"
+       _F_scm_url="git://anongit.freedesktop.org/git/ooo-build/ooo-build"
+       _F_scm_tag=$pkgver
+       Finclude scm
fi
-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')

@@ -67,11 +70,11 @@ subgroups=('kde-extra' 'gnome-extra' 'devel-extra' 
'devel-extra' 'xapps')
subinstall=("" "$_F_gnome_scriptlet" "" "" "")

ooodicts="af cs da de es et fr gl hu it lt ne nl pl pt ru sk sl sr sv sw th vi 
zu ca he ro"
-ooosubpkgs=('de' 'es' 'fr' 'hu')
-ooosubdescs=('German' 'Spanish' 'French' 'Hungarian')
+ooosubpkgs=('de' 'es' 'fr' 'hu' 'it' 'pt')
+ooosubdescs=('German' 'Spanish' 'French' 'Hungarian' 'Italian' 'Portuguese')
if ! Fuse $USE_DEVEL; then
-       ooosubpkgs=(${ooosubpk...@]} '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' 'kn' 'sh' 'sr' 'uz' 'by' 
'gd' 'gu' 'mn' 'my' 'oc' 'brx' 'dgo' 'kk' 'kok' 'ks' 'mai' 'mni' 'ro' 'sa-IN' 
'sat' 'sc' 'sd' 'bo' 'is' 'kid' 'ky' 'om' 'pap' 'ps' 'si' 'ug')
-       ooosubdescs=(${ooosubdes...@]} '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' 'Kan
 nada' 'Serbo-Croatian' 'Serbian' 'Uzbek' 'Belarussian' 'Scottish Gaelic' 
'Gujarati' 'Mongolian' 'Malay' 'Occitan' 'Bodo' 'Dogri' 'Kazakh' 'Konkani' 
'Kashmiri' 'Maithili' 'Manipuri' 'Romanian' 'Sanskrit' 'Santali' 'Sardinian' 
'Sindhi' 'Tibetan' 'Icelandic' 'Kid' 'Ky' 'Afan Oromo' 'Pap' 'Pashto' 'Sinhala' 
'Uyghur')
+       ooosubpkgs=(${ooosubpk...@]} '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' 'ja' 'km' 'kn-IN' 'ko' 'lo' 'lt' 'lv' 'mk' 
'ms' 'nb' 'ne' 'nl' 'nn' 'nr' 'ns' 'pa-IN' 'pl' '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' 'kn' 'sh' 'sr' 'uz' 'by' 'gd' 'gu' 
'mn' 'my' 'oc' 'brx' 'dgo' 'kk' 'kok' 'ks' 'mai' 'mni' 'ro' 'sa-IN' 'sat' 'sc' 
'sd' 'bo' 'is' 'kid' 'ky' 'om' 'pap' 'ps' 'si' 'ug')
+       ooosubdescs=(${ooosubdes...@]} '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' 'Japanese' 'Khmer (Cambodia)' 'Kannada' 
'Korean' 'Lao' 'Lithuanian' 'Latvian' 'Macedonian' 'Malay' 'Norwegian Bokmal' 
'Nepali' 'Dutch' 'Norwegian Nynorsk' 'Ndebele, South' 'NorthernSotho/Sepedi' 
'Punjabi' 'Polish' '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' 'Kannada' 'Serbo-Croatian' 
 'Serbian' 'Uzbek' 'Belarussian' 'Scottish Gaelic' 'Gujarati' 'Mongolian' 
'Malay' 'Occitan' 'Bodo' 'Dogri' 'Kazakh' 'Konkani' 'Kashmiri' 'Maithili' 
'Manipuri' 'Romanian' 'Sanskrit' 'Santali' 'Sardinian' 'Sindhi' 'Tibetan' 
'Icelandic' 'Kid' 'Ky' 'Afan Oromo' 'Pap' 'Pashto' 'Sinhala' 'Uyghur')
fi

if [ ${#ooosubpk...@]} -ne ${#ooosubdes...@]} ]; then
@@ -108,7 +111,12 @@ do
i=$(($i+1))
done

-dictpath="/usr/lib/openoffice.org/share/extension/install"
+if ! Fuse $USE_DEVEL; then
+       dictpath="/usr/lib/openoffice.org/share/extension/install"
+else
+       dictpath="/usr/lib/openoffice.org/share/extensions"
+fi
+
gen_dict_scriptlet()
{
lang=$1
@@ -143,29 +151,36 @@ EOF
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
+       if ! Fuse $USE_DEVEL; then
+               Fextract ooo-build$branch-$snapshot.tar.bz2
+               Fcd ooo-build$branch-$snapshot
+               #cp -fv $Fsrcdir/mono24-hack patches/hotfixes/mono24-hack.diff 
|| Fdie

-       # Predownloaded tarballs
-       for i in $Fsrcdir/$tree-m$milestone-*
-       do
-               ln -sf $i src/
-       done
+               # Predownloaded tarballs
+               for i in $Fsrcdir/$tree-m$milestone-*
+               do
+                       ln -sf $i src/
+               done
+       else
+               Funpack_scm
+               NOCONFIGURE=1 ./autogen.sh || return 1
+       fi

-       # Generate the dict scriptlets
-       gen_dict_scriptlet en openoffice.org.install
-       for i in $ooodicts
-       do
-               gen_dict_scriptlet $i openoffice.org-i18n-$i.install
-       done
+       if ! Fuse $USE_DEVEL; then
+               # Generate the dict scriptlets
+               gen_dict_scriptlet en openoffice.org.install
+               for i in $ooodicts
+               do
+                       gen_dict_scriptlet $i openoffice.org-i18n-$i.install
+               done
+       fi

Fpatchall

# SMP build
if [ ! -z "$MAKEFLAGS" ]; then
# Comment this out if you think the build failed because of being SMP.
-               Fconfopts="$Fconfopts --with-num-cpus=${MAKEFLAGS/-j}"
+               Fconfopts="$Fconfopts --with-max-jobs=${MAKEFLAGS/-j}"
unset MAKEFLAGS
fi

@@ -178,7 +193,6 @@ build()
--with-binsuffix=no \
--with-installed-ooo-dirname=openoffice.org\
--disable-odk \
-               --without-git \
--with-system-cairo \
--with-system-libwpd \
--with-system-libwps \
@@ -186,15 +200,12 @@ build()
--with-system-mdbtools \
--with-system-mdds"

-       # Set our version.
-       Fsed "AC_PACKAGE_VERSION" "$pkgver-$pkgrel" configure.in
-       autoconf || return 1
-
# Optimize build.
export ARCH_FLAGS="$CFLAGS"

if ! Fuse $USE_DEVEL; then
-               Fconf --with-lang=ALL
+               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"
fi
@@ -232,16 +243,21 @@ build()
fi
done
rm build/lang_${upkg}_list.txt
+               if ! Fuse $USE_DEVEL; then
+                       dictext=".oxt"
+               else
+                       dictext=""
+               fi
if [ "$i" = "de" ]; then
-                       Fsplit openoffice.org-i18n-$spkg 
$dictpath/dict-de-AT.oxt
-                       Fsplit openoffice.org-i18n-$spkg 
$dictpath/dict-de-CH.oxt
-                       Fsplit openoffice.org-i18n-$spkg 
$dictpath/dict-de-DE.oxt
+                       Fsplit openoffice.org-i18n-$spkg 
$dictpath/dict-de-AT$dictext
+                       Fsplit openoffice.org-i18n-$spkg 
$dictpath/dict-de-CH$dictext
+                       Fsplit openoffice.org-i18n-$spkg 
$dictpath/dict-de-DE$dictext
elif [ "$i" = "nb" ]; then
-                       Fsplit openoffice.org-i18n-$spkg $dictpath/dict-no.oxt
+                       Fsplit openoffice.org-i18n-$spkg 
$dictpath/dict-no$dictext
elif [ "$i" = "ku" ]; then
-                       Fsplit openoffice.org-i18n-$spkg 
$dictpath/dict-ku-TR.oxt
-               elif echo "$ooodicts"|grep -q $i && [ -e 
$Fdestdir/$dictpath/dict-$i.oxt ]; then
-                       Fsplit openoffice.org-i18n-$spkg $dictpath/dict-$i.oxt
+                       Fsplit openoffice.org-i18n-$spkg 
$dictpath/dict-ku-TR$dictext
+               elif echo "$ooodicts"|grep -q $i && [ -e 
$Fdestdir/$dictpath/dict-$i$dictext ]; then
+                       Fsplit openoffice.org-i18n-$spkg 
$dictpath/dict-$i$dictext
fi
done

@@ -274,13 +290,15 @@ build()
return 1
fi

+       # Check for missing dict packs.
if ! Fuse $USE_DEVEL; then
-               # Check for missing dict packs.
missdicts="`find $Fdestdir -type f |grep dict-.*oxt |sed 
's/.*dict-\(.*\).oxt/\1/'|grep -v en|sort -u`"
-               if [ -n "$missdicts" ]; then
-                       Fmessage "Unsplitted dicts: $missdicts"
-                       return 1
-               fi
+       else
+               missdicts="`find $Fdestdir -type d |grep 'dict-[^/]\+$' |sed 
's/.*dict-\(.*\)/\1/'|grep -v en|sort -u`"
+       fi
+       if [ -n "$missdicts" ]; then
+               Fmessage "Unsplitted dicts: $missdicts"
+               return 1
fi

# Check for missing subpkgs.
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to