ooo-build r12448 - in branches/ooo-build-2-4: . patches/src680

[vmiklos svn gnome org]

Author: vmiklos
Date: Sat May  3 20:28:57 2008
New Revision: 12448
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12448&view=rev

Log:
2008-05-03  Miklos Vajna  <viklos frugalware org>

       * patches/src680/no-oc.diff: workaround for i#88955.
       * patches/src680/apply: apply the new patch.


Added:
   branches/ooo-build-2-4/patches/src680/no-oc.diff
Modified:
   branches/ooo-build-2-4/ChangeLog
   branches/ooo-build-2-4/patches/src680/apply

Modified: branches/ooo-build-2-4/patches/src680/apply
==============================================================================
--- branches/ooo-build-2-4/patches/src680/apply	(original)
+++ branches/ooo-build-2-4/patches/src680/apply	Sat May  3 20:28:57 2008
@@ -976,6 +976,7 @@
 
 [ FrugalwareOnly ]
 gcc401-stlport45-include.diff, gghibo
+no-oc.diff, i#88955, vmiklos
 
 
 # ( mmp oo o deals with defaults apparently )

Added: branches/ooo-build-2-4/patches/src680/no-oc.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-2-4/patches/src680/no-oc.diff	Sat May  3 20:28:57 2008
@@ -0,0 +1,28 @@
+	... languages oc ...
+	... creating language pack: oc !
+	... analyzing files ...
+	    WARNING: Using autotextshare_en-US.zip instead of autotextshare_oc.zip
+	    WARNING: Using palettes_en-US.zip instead of palettes_oc.zip
+	    WARNING: Using tpllayoutimpr_en-US.zip instead of tpllayoutimpr_oc.zip
+	    WARNING: Using tplpresntimpr_en-US.zip instead of tplpresntimpr_oc.zip
+	    WARNING: Using tplwizagenda_en-US.zip instead of tplwizagenda_oc.zip
+	    WARNING: Using tplwizdesktop_en-US.zip instead of tplwizdesktop_oc.zip
+	    WARNING: Using tplwizfax_en-US.zip instead of tplwizfax_oc.zip
+	    WARNING: Using tplwizletter_en-US.zip instead of tplwizletter_oc.zip
+	    WARNING: Using tplwizreport_en-US.zip instead of tplwizreport_oc.zip
+	    WARNING: Using tplwizstyles_en-US.zip instead of tplwizstyles_oc.zip
+	    WARNING: Using wordbook_en-US.zip instead of wordbook_oc.zip
+	... analyzing files with flag ARCHIVE ...
+
+	**************************************************
+	ERROR: ERROR: No packages defined!
+--- solenv/inc/postset.mk.orig	2008-02-13 13:40:48.000000000 +0100
++++ solenv/inc/postset.mk	2008-02-13 13:41:03.000000000 +0100
+@@ -39,6 +39,6 @@
+ defaultlangiso=en-US
+ 
+ # Complete list of all supported ISO codes
+-completelangiso=af ar as-IN be-BY bg br bn bn-BD bn-IN bs ca cs cy da de dz el en-GB en-US en-ZA eo es et eu fa fi fr ga gl gu-IN he hi-IN hr hu it ja ka km kn ko ku lo lt lv mk ms ml-IN mr-IN ne nb nl nn nr ns oc or-IN pa-IN pl pt pt-BR ru rw sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER ta-IN th tn tr ts tg ur-IN uk uz ve vi xh zh-CN zh-TW zu
++completelangiso=af ar as-IN be-BY bg br bn bn-BD bn-IN bs ca cs cy da de dz el en-GB en-US en-ZA eo es et eu fa fi fr ga gl gu-IN he hi-IN hr hu it ja ka km kn ko ku lo lt lv mk ms ml-IN mr-IN ne nb nl nn nr ns or-IN pa-IN pl pt pt-BR ru rw sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER ta-IN th tn tr ts tg ur-IN uk uz ve vi xh zh-CN zh-TW zu
+ 
+ alllangiso=$(strip $(defaultlangiso) $(subst,$(defaultlangiso), $(uniq $(subst,ALL,$(completelangiso) $(WITH_LANG)))))