Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=8d3b3dda0030de4475002bb0b512587bc750faf0

commit 8d3b3dda0030de4475002bb0b512587bc750faf0
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date:   Tue Oct 14 23:18:18 2008 +0200

openoffice.org-3.0ooo300_m9-3-i686

- split the dictionaries with the language packs as well

diff --git a/source/xapps/openoffice.org/FrugalBuild 
b/source/xapps/openoffice.org/FrugalBuild
index 53abf08..9b83fdb 100644
--- a/source/xapps/openoffice.org/FrugalBuild
+++ b/source/xapps/openoffice.org/FrugalBuild
@@ -65,6 +65,7 @@ subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64')
subgroups=('kde-extra' 'gnome-extra' 'devel-extra')
subinstall=("" "$_F_gnome_scriptlet" "")

+ooodicts="af cs da de es et fr gl hu it lt ne nl pl pt ru sk sl sv sw th vi zu"
ooosubpkgs=('de' 'es' 'fr' 'hu')
ooosubdescs=('German' 'Spanish' 'French' 'Hungarian')
if ! Fuse $USE_DEVEL; then
@@ -88,7 +89,11 @@ done
i=0
while [ $i -lt [EMAIL PROTECTED] ]
do
-       subinstall=("[EMAIL PROTECTED]" '')
+       if echo "$ooodicts"|grep -q ${ooosubpkgs[$i]}; then
+               subinstall=("[EMAIL PROTECTED]" 
"openoffice.org-i18n-${ooosubpkgs[$i]}.install")
+       else
+               subinstall=("[EMAIL PROTECTED]" '')
+       fi
i=$(($i+1))
done

@@ -101,10 +106,39 @@ do
i=$(($i+1))
done

-# You can find a few random notes about building OOo here:
-# http://wiki.frugalware.org/OOo_building
+gen_dict_scriptlet()
+{
+       lang=$1
+       out=$2
+       cat >${Fsrcdir%/src}/$out <<EOF
+post_install()
+{
+       unopkg add --shared 
/usr/lib/openoffice.org/share/extension/install/dict-$lang.oxt 2>/dev/null
+}
+
+pre_upgrade()
+{
+       pre_remove
+}
+
+post_upgrade()
+{
+       post_install
+}
+
+pre_remove()
+{
+       unopkg remove --shared \$(unopkg list --shared|grep "^Identifier: 
org.openoffice.$lang"|sed 's/Identifier: //')
+}

-build() {
+op=\$1
+shift
+\$op \$*
+EOF
+}
+
+build()
+{
Fmonoexport
Fextract ooo-build$branch-$snapshot.tar.bz2
if [ -n "$branch" ]; then
@@ -119,6 +153,13 @@ build() {
ln -sf $i src/
done

+       # 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
+
# Remove our patches so that incremental build will be possible.
#rm -f patches/src680/ecj-is-gcj.diff
Fpatchall
@@ -126,7 +167,7 @@ build() {
# 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-num-cpus=${MAKEFLAGS/-j}"
unset MAKEFLAGS
fi

@@ -178,6 +219,9 @@ build() {
# en-GB -> en_GB
upkg=`echo $i|sed 's/-/_/g'`
Fsplit openoffice.org-i18n-$spkg $(grep -v '^%dir' build/lang_${upkg}_list.txt)
+               if echo "$ooodicts"|grep -q $i; then
+                       Fsplit openoffice.org-i18n-$spkg 
/usr/lib/openoffice.org/share/extension/install/dict-$i.oxt
+               fi
done

## Split KDE stuff
@@ -197,6 +241,15 @@ build() {
Fmessage "Unsplitted languages: $misslangs"
return 1
fi
+
+       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
+       fi
Fmonocleanup
}

diff --git a/source/xapps/openoffice.org/openoffice.org.install 
b/source/xapps/openoffice.org/openoffice.org.install
deleted file mode 100644
index 7e3da69..0000000
--- a/source/xapps/openoffice.org/openoffice.org.install
+++ /dev/null
@@ -1,29 +0,0 @@
-post_install()
-{
-       for i in /usr/lib/openoffice.org/share/extension/install/*.oxt
-       do
-               unopkg add --shared $i 2>/dev/null
-       done
-}
-
-pre_upgrade()
-{
-       pre_remove
-}
-
-post_upgrade()
-{
-       post_install
-}
-
-pre_remove()
-{
-       for i in $(unopkg list --shared|grep ^Identifier|sed 's/Identifier: //')
-       do
-               unopkg remove --shared $i
-       done
-}
-
-op=$1
-shift
-$op $*
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to