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

commit d3ab421f1596fcebff4bb0630f0c00c3c0e6c202
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Tue Jan 25 12:43:16 2011 +0100

libreoffice-3.3.0.4-3-i686

- new package, renamed from openoffice.org
- disable broken gallery support for now (it just horribly slowed down
build but resulted in nothing)

diff --git a/source/xapps/openoffice.org/FrugalBuild 
b/source/xapps/libreoffice/FrugalBuild
similarity index 66%
rename from source/xapps/openoffice.org/FrugalBuild
rename to source/xapps/libreoffice/FrugalBuild
index 810f997..ad746b0 100644
--- a/source/xapps/openoffice.org/FrugalBuild
+++ b/source/xapps/libreoffice/FrugalBuild
@@ -1,9 +1,9 @@
-# Compiling time: 262.13 SBU
+# Compiling time: 232.03 SBU
# Maintainer: Janos Kovacs <ja...@frugalware.org>
# Contributor: Laszlo Dvornik <dvor...@gnome.hu>

# build released development version
-USE_DEVEL=${USE_DEVEL:-"n"}
+USE_DEVEL=${USE_DEVEL:-"y"}
# build directly from git
USE_GIT=${USE_GIT:-"n"}
Fuse $USE_GIT && USE_DEVEL="y"
@@ -28,10 +28,11 @@ else
tree=ooo330
milestone=7
pkgver=$upstream${tree}_m$milestone.15035.g955ee5e
+               pkgrel=1
else
pkgver=3.3.0.4
+               pkgrel=3
fi
-       pkgrel=1
fi
if ! Fuse $USE_DEVEL; then
pkgdesc="OpenOffice.org, a full office productivity suite."
@@ -135,33 +136,60 @@ fi

if ! Fuse $USE_DEVEL; then
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' 'it' 'pt' '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=('German' 'Spanish' 'French' 'Hungarian' 'Italian' 
'Portuguese' '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' 'Dzo
 ngkha' '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')
+       completelangiso=('de' 'es' 'fr' 'hu' 'it' 'pt' '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')
+       completelangdescs=('German' 'Spanish' 'French' 'Hungarian' 'Italian' 
'Portuguese' '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')
+else
+       # sed ':a;N;$!ba;s/\\\n//g' solenv/inc/postset.mk|grep 
^completelangiso=|sed 's/completelangiso=//;s/en-US //'
+       completelangiso=(af ar as ast be-BY bo bg br brx bn bs ca ca-XV cs cy
+       da de dgo dz el en-GB en-ZA eo es et eu fa fi fr ga gd gl gu he hi hr 
hu id is
+       it ja ky ka kk km kn ko kok ks ku lo lt lv mai mk mn mni ms ml mr my ne 
nb nl
+       nn nr ns om oc or pap pa-IN pl ps pt pt-BR ro ru rw sat sa-IN si sd sq 
sk sl sh
+       sr ss st sv sw-TZ te ti ta th tn tr ts tg ug ur uk uz ve vi xh zh-CN 
zh-TW zu)
+       # for i in ${completelangiso[@]}; do echo -n "'$(grep -1 
STR_NAME_MODULE_LANGPACK_$(echo $i|tr '[a-z]' '[A-Z]'|tr '-' '_') 
scp2/source/ooo/module_langpack.ulf|sed -n 's/.*"\(.*\)"/\1/;$ p')' "; done
+       completelangdescs=('Afrikaans' 'Arabic' 'Assamese' 'Asturian'
+       'Belarusian' 'Tibetan' 'Bulgarian' 'Bodo' 'Bodo' 'Bengali (India)' 
'Bosnian'
+       'Catalan (Valencian)' 'Catalan (Valencian)' 'Czech' 'Welsh' 'Danish' 
'German'
+       'Dogri' 'Dzongkha' 'Greek' 'English (United Kingdom)' 'English (South 
Africa)'
+       'Esperanto' 'Spanish' 'Estonian' 'Basque' 'Farsi' 'Finnish' 'French' 
'Irish'
+       'Scottish Gaelic' 'Galician' 'Gujarati' 'Hebrew' 'Hindi' 'Croatian' 
'Hungarian'
+       'Indonesian' 'Icelandic' 'Italian' 'Japanese' 'Kyrgyz' 'Georgian' 
'Kazakh'
+       'Khmer' 'Kannada' 'Konkani' 'Konkani' 'Kashmiri' 'Kurdish' 'Lao' 
'Lithuanian'
+       'Latvian' 'Maithili' 'Macedonian' 'Manipuri' 'Manipuri' 'Malay 
(Malaysian)'
+       'Malayalam' 'Marathi' 'Burmese' 'Nepali' 'Norwegian (Bokmål)' 'Dutch'
+       'Norwegian (Nynorsk)' 'Ndebele South' 'Northern Sotho' 'Oromo' 'Occitan'
+       'Oriya' 'Papiamento' 'Punjabi' 'Polish' 'Pashto' 'Portuguese (Brazil)'
+       'Portuguese (Brazil)' 'Romanian' 'Russian' 'Kinyarwanda' 'Santali' 
'Sanskrit
+       (India)' 'Sinhala' 'Sindhi' 'Albanian' 'Slovak' 'Slovenian' 'Serbian 
(Latin)'
+       'Serbian (Cyrillic)' 'Swazi' 'Southern Sotho (Sutu)' 'Swedish' 'Swahili'
+       'Telugu' 'Tigrinya' 'Tamil' 'Thai' 'Tswana' 'Turkish' 'Tsonga' 'Tajik' 
'Uyghur'
+       'Urdu' 'Ukrainian' 'Uzbek' 'Venda' 'Vietnamese' 'Xhosa' 'Chinese 
(simplified)'
+       'Chinese (traditional)' 'Zulu')
fi

-if [ ${#ooosubpkgs[@]} -ne ${#ooosubdescs[@]} ]; then
-       error '${#ooosubpkgs[@]} != ${#ooosubdescs[@]}'
+if [ ${#completelangiso[@]} -ne ${#completelangdescs[@]} ]; then
+       error '${#completelangiso[@]} != ${#completelangdescs[@]}'
Fdie
fi

i=0
-while [ $i -lt ${#ooosubpkgs[@]} ]
+while [ $i -lt ${#completelangiso[@]} ]
do
-       subpkgs=("${subpkgs[@]}" "$pkgname-i18n-`echo ${ooosubpkgs[$i]}|tr 
[A-Z] [a-z]`")
if ! Fuse $USE_DEVEL; then
-       subdescs=("${subdescs[@]}" "${ooosubdescs[$i]} Localization for 
OpenOffice.org.")
+       subpkgs=("${subpkgs[@]}" "$pkgname-i18n-`echo ${completelangiso[$i]}|tr 
[A-Z] [a-z]`")
+       subdescs=("${subdescs[@]}" "${completelangdescs[$i]} Localization for 
OpenOffice.org.")
else
-       subdescs=("${subdescs[@]}" "${ooosubdescs[$i]} Localization for 
LibreOffice.")
-       subreplaces=("${subreplaces[@]}" "openoffice.org-i18n-`echo 
${ooosubpkgs[$i]}|tr [A-Z] [a-z]`")
+       subpkgs=("${subpkgs[@]}" "$pkgname-l10n-`echo ${completelangiso[$i]}|tr 
[A-Z] [a-z]`")
+       subdescs=("${subdescs[@]}" "Installs ${completelangdescs[$i]} support 
in LibreOffice")
+       subreplaces=("${subreplaces[@]}" "openoffice.org-i18n-`echo 
${completelangiso[$i]}|tr [A-Z] [a-z]`")
fi
i=$(($i+1))
done

i=0
-while [ $i -lt ${#ooosubpkgs[@]} ]
+while [ $i -lt ${#completelangiso[@]} ]
do
-       if ! Fuse $USE_DEVEL && echo "$ooodicts"|grep -q ${ooosubpkgs[$i]}; then
-               subinstall=("${subinstall[@]}" 
"$pkgname.org-i18n-${ooosubpkgs[$i]}.install")
+       if ! Fuse $USE_DEVEL && echo "$ooodicts"|grep -q 
${completelangiso[$i]}; then
+               subinstall=("${subinstall[@]}" 
"$pkgname.org-i18n-${completelangiso[$i]}.install")
else
subinstall=("${subinstall[@]}" '')
fi
@@ -169,7 +197,7 @@ do
done

i=0
-while [ $i -lt ${#ooosubpkgs[@]} ]
+while [ $i -lt ${#completelangiso[@]} ]
do
subdepends=("${subdepends[@]}" "")
subrodepends=("${subrodepends[@]}" "$pkgname>=$pkgver")
@@ -263,10 +291,12 @@ build()
fi

# Other options.
+       # FIXME --with-openclipart=/usr/share/openclipart does not fail,
+       # but slows down the build at the moment and in the end it does
+       # not do anything, so disable it for now.
Fconfopts="$Fconfopts \
--with-distro=Frugalware \
--with-gcc-speedup=ccache \
-               --with-openclipart=/usr/share/openclipart \
--with-binsuffix=no \
--with-installed-ooo-dirname=$pkgname\
--with-system-cairo \
@@ -292,7 +322,7 @@ build()
Fconf --with-git=http://frugalware.org/git/pub/other/sources/libreoffice
else
# mono-2.8 and mdds-0.5 are not yet supported
-                       Fconf --disable-mono --without-system-mdds
+                       Fconf --with-lang="en-US ${completelangiso[*]}" 
--disable-mono --without-system-mdds
# avoid problems with ixion for now
sed -i '/fields-table-formula.diff/d' patches/dev300/apply || return 1
mkdir -p src
@@ -360,8 +390,8 @@ build()
usr/lib/mozilla/plugins/libnpsoplugin.so \
usr/lib/$pkgname/program/libnpsoplugin.so

-       # Split out the i18n stuff
-       for i in "${ooosubpkgs[@]}"
+       # Split out the l10n stuff
+       for i in "${completelangiso[@]}"
do
# en-GB -> en-gb
spkg=`echo $i|tr [A-Z] [a-z]`
@@ -370,25 +400,23 @@ build()
for j in $(grep -v '^%dir' build/lang_${upkg}_list.txt)
do
if [ -e $Fdestdir/$j ]; then
-                               Fsplit $pkgname-i18n-$spkg $j
+                               Fsplit $pkgname-l10n-$spkg $j
fi
done
rm build/lang_${upkg}_list.txt
if ! Fuse $USE_DEVEL; then
dictext=".oxt"
-               else
-                       dictext=""
-               fi
-               if [ "$i" = "de" ]; then
-                       Fsplit $pkgname-i18n-$spkg $dictpath/dict-de-AT$dictext
-                       Fsplit $pkgname-i18n-$spkg $dictpath/dict-de-CH$dictext
-                       Fsplit $pkgname-i18n-$spkg $dictpath/dict-de-DE$dictext
-               elif [ "$i" = "nb" ]; then
-                       Fsplit $pkgname-i18n-$spkg $dictpath/dict-no$dictext
-               elif [ "$i" = "ku" ]; then
-                       Fsplit $pkgname-i18n-$spkg $dictpath/dict-ku-TR$dictext
-               elif echo "$ooodicts"|grep -q $i && [ -e 
$Fdestdir/$dictpath/dict-$i$dictext ]; then
-                       Fsplit $pkgname-i18n-$spkg $dictpath/dict-$i$dictext
+                       if [ "$i" = "de" ]; then
+                               Fsplit $pkgname-i18n-$spkg 
$dictpath/dict-de-AT$dictext
+                               Fsplit $pkgname-i18n-$spkg 
$dictpath/dict-de-CH$dictext
+                               Fsplit $pkgname-i18n-$spkg 
$dictpath/dict-de-DE$dictext
+                       elif [ "$i" = "nb" ]; then
+                               Fsplit $pkgname-i18n-$spkg 
$dictpath/dict-no$dictext
+                       elif [ "$i" = "ku" ]; then
+                               Fsplit $pkgname-i18n-$spkg 
$dictpath/dict-ku-TR$dictext
+                       elif echo "$ooodicts"|grep -q $i && [ -e 
$Fdestdir/$dictpath/dict-$i$dictext ]; then
+                               Fsplit $pkgname-i18n-$spkg 
$dictpath/dict-$i$dictext
+                       fi
fi
done

diff --git a/source/xapps/openoffice.org/SA40775.diff 
b/source/xapps/libreoffice/SA40775.diff
similarity index 100%
rename from source/xapps/openoffice.org/SA40775.diff
rename to source/xapps/libreoffice/SA40775.diff
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to