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

commit e0a14a506b1b20a45ee329739de0b5c643e13911
Author: Miklos Vajna <[email protected]>
Date:   Mon Jun 15 11:16:34 2015 +0200

libreoffice-5.0.0.0.beta3-1-x86_64

- 4.4.4 -> 5.0 beta3
- require libwps>=0.4.0
- update langpack list
- whitelist one test, blacklist two other ones

diff --git a/source/xapps/libreoffice/FrugalBuild 
b/source/xapps/libreoffice/FrugalBuild
index 21bff52..a2e1800 100644
--- a/source/xapps/libreoffice/FrugalBuild
+++ b/source/xapps/libreoffice/FrugalBuild
@@ -5,7 +5,7 @@
options+=('asneeded')

pkgname=libreoffice
-pkgver=4.4.4.2
+pkgver=5.0.0.0.beta3
minor=${pkgver:0:5} # x.y.z
major=${pkgver:0:3} # x.y
pkgrel=1
@@ -75,7 +75,7 @@ makedepends=(
'junit'
'kdelibs-compiletime'
'krb5'
-       'libwps>=0.3'
+       'libwps>=0.4.0'
'mdbtools'
'mdds>=0.11.2'
'pentaho-reporting-flow-engine'
@@ -136,10 +136,10 @@ subinstall=("" "$_F_gnome_scriptlet" "" "")

# sed ':a;N;$!ba;s/\\\n//g' solenv/inc/langlist.mk|grep ^completelangiso=|sed 
's/completelangiso=//;s/en-US //'
completelangiso=(af am ar as ast be bg bn bn-IN bo br brx bs ca ca-valencia 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 ka kk km kmr-Latn kn ko kok ks lb lo lt lv mai mk ml mn mni mr 
my nb
-       ne nl nn nr nso oc om or pa-IN pl pt pt-BR ro ru rw sa-IN sat sd 
sr-Latn si sid
-       sk sl sq sr ss st sv sw-TZ ta te tg th tn tr ts tt ug uk uz ve vi xh 
zh-CN
+       cy da de dgo dz el en-GB en-ZA eo es et eu fa fi fr ga gd gl gu gug he 
hi hr hu
+       id is it ja ka kk km kmr-Latn kn ko kok ks lb lo lt lv mai mk ml mn mni 
mr my
+       nb ne nl nn nr nso oc om or pa-IN pl pt pt-BR ro ru rw sa-IN sat sd 
sr-Latn si
+       sid sk sl sq sr ss st sv sw-TZ ta te tg th tn tr ts tt ug 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' 'Amharic' 'Arabic' 'Assamese' 'Asturian'
@@ -147,19 +147,19 @@ completelangdescs=('Afrikaans' 'Amharic' 'Arabic' 
'Assamese' 'Asturian'
'Bodo' 'Bosnian' 'Catalan (Valencian)' 'Catalan (Valencian)' 'Czech' 'Welsh'
'Danish' 'German' 'Dogri' 'Dzongkha' 'Greek' 'English (United Kingdom)'
'English (South Africa)' 'Esperanto' 'Spanish' 'Estonian' 'Basque' 'Persian'
-       'Finnish' 'French' 'Irish' 'Scottish Gaelic' 'Galician' 'Gujarati' 
'Hebrew'
-       'Hindi' 'Croatian' 'Hungarian' 'Indonesian' 'Icelandic' 'Italian' 
'Japanese'
-       'Georgian' 'Kazakh' 'Kurdish' 'Kurdish' 'Kannada' 'Konkani' 'Konkani'
-       'Kashmiri' 'Luxembourgish' 'Lao' 'Lithuanian' 'Latvian' 'Maithili' 
'Macedonian'
-       'Malayalam' 'Manipuri' 'Manipuri' 'Marathi' 'Burmese' 'Norwegian 
(Bokmål)'
-       'Nepali' 'Dutch' 'Norwegian (Nynorsk)' 'Ndebele South' 'Northern Sotho'
-       'Occitan' 'Oromo' 'Oriya' 'Punjabi' 'Polish' 'Portuguese (Brazil)' 
'Portuguese
-       (Brazil)' 'Romanian' 'Russian' 'Kinyarwanda' 'Sanskrit (India)' 
'Santali'
-       'Sindhi' 'Serbian (Latin)' 'Sidama' 'Sidama' 'Slovak' 'Slovenian' 
'Albanian'
-       'Serbian (Cyrillic)' 'Swazi' 'Southern Sotho (Sutu)' 'Swedish' 'Swahili'
-       'Tamil' 'Telugu' 'Tajik' 'Thai' 'Tswana' 'Turkish' 'Tsonga' 'Tatar' 
'Uyghur'
-       'Ukrainian' 'Uzbek' 'Venda' 'Vietnamese' 'Xhosa' 'Chinese (simplified)'
-       'Chinese (traditional)' 'Zulu')
+       'Finnish' 'French' 'Irish' 'Scottish Gaelic' 'Galician' 'Guarani' 
'Guarani'
+       'Hebrew' 'Hindi' 'Croatian' 'Hungarian' 'Indonesian' 'Icelandic' 
'Italian'
+       'Japanese' 'Georgian' 'Kazakh' 'Kurdish' 'Kurdish' 'Kannada' 'Konkani'
+       'Konkani' 'Kashmiri' 'Luxembourgish' 'Lao' 'Lithuanian' 'Latvian' 
'Maithili'
+       'Macedonian' 'Malayalam' 'Manipuri' 'Manipuri' 'Marathi' 'Burmese'
+       'Norwegian (Bokmål)' 'Nepali' 'Dutch' 'Norwegian (Nynorsk)' 'Ndebele 
South'
+       'Northern Sotho' 'Occitan' 'Oromo' 'Odia' 'Punjabi' 'Polish' 
'Portuguese (Brazil)'
+       'Portuguese (Brazil)' 'Romanian' 'Russian' 'Kinyarwanda' 'Sanskrit 
(India)'
+       'Santali' 'Sindhi' 'Serbian (Latin)' 'Sidama' 'Sidama' 'Slovak' 
'Slovenian'
+       'Albanian' 'Serbian (Cyrillic)' 'Swazi' 'Southern Sotho (Sutu)' 
'Swedish'
+       'Swahili' 'Tamil' 'Telugu' 'Tajik' 'Thai' 'Tswana' 'Turkish' 'Tsonga' 
'Tatar'
+       'Uyghur' 'Ukrainian' 'Uzbek' 'Venda' 'Vietnamese' 'Xhosa'
+       'Chinese (simplified)' 'Chinese (traditional)' 'Zulu')

i=0
while [ $i -lt ${#completelangiso[@]} ]
@@ -269,7 +269,8 @@ build()
sed -i 's/add_check_targets/add_subsequentcheck_targets/' 
i18nlangtag/Module_i18nlangtag.mk
sed -i '/sw_ooxmlimport/d' sw/Module_sw.mk
sed -i '/sw_ww8import/d' sw/Module_sw.mk # only in 4.4.2, should be able to get 
rid of this in 4.4.3
-       sed -i '/sc_ucalc/d' sc/Module_sc.mk
+       sed -i '/sc_subsequent_filters_test/d' sc/Module_sc.mk
+       sed -i '/sd_tiledrendering/d' sd/Module_sd.mk

if [ ! -e src.built ]; then
make || return 1
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to