Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=b2712f7e30dfca1ca9bcd1192404badcb60fd75d
commit b2712f7e30dfca1ca9bcd1192404badcb60fd75d
Author: Miklos Vajna <vmik...@frugalware.org>
Date: Fri Feb 18 23:03:50 2011 +0100
libreoffice-3.3.0.4-3-i686
- USE_DEVEL: up to 3.3.1rc2
- fix hunspell dependency
- drop 7 unneeded (not translated) langpack
- check for missing / unneeded langpacks
diff --git a/source/xapps/libreoffice/FrugalBuild
b/source/xapps/libreoffice/FrugalBuild
index 1e09ee5..fefea30 100644
--- a/source/xapps/libreoffice/FrugalBuild
+++ b/source/xapps/libreoffice/FrugalBuild
@@ -20,7 +20,7 @@ else
pkgver=3.3.0.4
pkgrel=3
else
- pkgver=3.3.1.1
+ pkgver=3.3.1.2
pkgrel=1
fi
fi
@@ -36,7 +36,7 @@ depends=('libxml2' 'libart_lgpl' 'libsndfile' 'openjre' 'nas'
'fontconfig' 'libp
# this is here as gstreamer is only a makedepend
rodepends=('flac' 'dejavu-ttf')
makedepends=('curl>=7.20.0-2' 'intltool' 'tcsh' 'ecj' 'apache-ant' \
- 'boost' 'icu' 'hunspell' 'imake' 'gccmakedep' 'xalan-j' \
+ 'boost' 'icu' 'hunspell>=1.3.1-2' 'imake' 'gccmakedep' 'xalan-j' \
'patch>=2.5.9' 'openclipart' 'xorg-server' 'gstreamer>=0.10.30-2'
'gst-plugins-base' \
'procps' 'openldap' 'gperf' 'xulrunner' 'kdelibs-compiletime' 'libwps' \
'libwpg' 'mdbtools' 'mdds' 'junit' 'lucene' 'cppunit' 'hsqldb' 'bsh' 'vigra' \
@@ -110,29 +110,28 @@ subinstall=("" "$_F_gnome_scriptlet" "" "" "")
subreplaces=('openoffice.org-kde' 'openoffice.org-gnome' 'openoffice.org-sdk'
'openoffice.org-mono' 'openoffice.org-mozilla')
# 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)
+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 gl gu he hi hr hu id is
+ it ja ka kk km kn ko kok ks ku lo lt lv mai mk mn mni ml mr my ne nb nl
+ nn nr ns om oc or pa-IN pl pt pt-BR ro ru rw sat sa-IN si sd sq sk sl sh
+ sr ss st sv sw-TZ te ta th tn tr ts tg 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' '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)'
+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)'
+ 'Galician' 'Gujarati' 'Hebrew' 'Hindi' 'Croatian' 'Hungarian'
'Indonesian'
+ 'Icelandic' 'Italian' 'Japanese' 'Georgian' 'Kazakh' 'Khmer' 'Kannada'
+ 'Konkani' 'Konkani' 'Kashmiri' 'Kurdish' 'Lao' 'Lithuanian' 'Latvian'
+ 'Maithili' 'Macedonian' 'Manipuri' 'Manipuri' 'Malayalam' 'Marathi'
'Burmese'
+ 'Nepali' 'Norwegian (Bokmål)' 'Dutch' 'Norwegian (Nynorsk)' 'Ndebele
South'
+ 'Northern Sotho' 'Oromo' 'Occitan' 'Oriya' 'Punjabi' 'Polish'
'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' 'Tamil' 'Thai' 'Tswana' 'Turkish' 'Tsonga' 'Tajik'
'Uyghur'
+ 'Ukrainian' 'Uzbek' 'Venda' 'Vietnamese' 'Xhosa' 'Chinese (simplified)'
'Chinese (traditional)' 'Zulu')
if [ ${#completelangiso[@]} -ne ${#completelangdescs[@]} ]; then
@@ -166,8 +165,6 @@ do
i=$(($i+1))
done
-dictpath="/usr/lib/$pkgname/share/extensions"
-
build()
{
Fmonoexport
@@ -231,6 +228,15 @@ build()
# make patch be less strict
Fsed '--fuzz=0 ' '' patches/apply.pl
+ # Check for missing language packs.
+ make unpack || return 1
+ langfile="build/libreoffice*/solenv/inc/postset.mk"
+ langs=$(sed ':a;N;$!ba;s/\\\n//g' $langfile|grep ^completelangiso=|sed
's/completelangiso=//;s/en-US //')
+ if [ "$langs" != "${completelangiso[*]}" ]; then
+ Fmessage "Update completelangiso, '$langs' !=
'${completelangiso[*]}'"
+ return 1
+ fi
+
# on failure make a stab at rebuilding un-parallel
if ! make; then
Fsed "^MAX_JOBS=.*" "MAX_JOBS='1'" bin/setup
@@ -310,16 +316,6 @@ build()
Fsplit $pkgname-mono $(grep -v '^%dir' build/mono_list.txt)
rm build/mono_list.txt
- if false; then
- # FIXME move this to the start of the build
- # Check for missing language packs.
- misslangs="`find $Fdestdir -type f |grep
registry/res/.*/org|sed 's|.*registry/res/\(.*\)/org.*|\1|'|grep -v en-US|sort
-u`"
- if [ -n "$misslangs" ]; then
- Fmessage "Unsplit languages: $misslangs"
- return 1
- fi
- fi
-
# Check for missing subpkgs.
# It's OK not to split these
rm build/{common,lang_en_US,nld}_list.txt
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
