rpms/openoffice.org/F-12 workspace.vcl106.patch,1.3,1.4
Caolan McNamara
caolanm at fedoraproject.org
Sun Oct 18 14:48:48 UTC 2009
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29160
Modified Files:
workspace.vcl106.patch
Log Message:
tweak apply
workspace.vcl106.patch:
officecfg/registry/data/org/openoffice/VCL.xcu | 228 ++++++++++++++++++++++---
psprint/source/fontsubset/gsub.cxx | 10 -
unx/gtk/a11y/atkutil.cxx | 13 +
vcl/source/glyphs/gcach_ftyp.cxx | 11 -
4 files changed, 231 insertions(+), 31 deletions(-)
Index: workspace.vcl106.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-12/workspace.vcl106.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- workspace.vcl106.patch 18 Oct 2009 14:32:48 -0000 1.3
+++ workspace.vcl106.patch 18 Oct 2009 14:48:46 -0000 1.4
@@ -82,7 +82,7 @@ Index: officecfg/registry/data/org/openo
===================================================================
--- officecfg/registry/data/org/openoffice/VCL.xcu (revision 276736)
+++ officecfg/registry/data/org/openoffice/VCL.xcu (working copy)
-@@ -825,64 +822,184 @@
+@@ -825,64 +825,184 @@
<value>Lohit Nepali;Kalimati;Samanata;Sans</value>
</prop>
</node>
@@ -129,72 +129,52 @@ Index: officecfg/registry/data/org/openo
<node oor:name="hi-IN" oor:op="replace">
<prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
- <value>Lohit Hindi;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
-- </prop>
-- <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
-- <value>Lohit Hindi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-- </prop>
-- <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
-- <value>Lohit Hindi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-- </prop>
-- <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
-- <value>Lohit Hindi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-- </prop>
-- <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
-- <value>Lohit Hindi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-- </prop>
-- <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
-- <value>Lohit Hindi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+ <value>Lohit Hindi;Mangal;Lucidasans;Lucida Sans;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value>
-+ </prop>
-+ <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+ </prop>
+ <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+- <value>Lohit Hindi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+ <value>Lohit Hindi;Mangal;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-+ </prop>
-+ <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+ </prop>
+ <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+- <value>Lohit Hindi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+ <value>Lohit Hindi;Mangal;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-+ </prop>
-+ <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+ </prop>
+ <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+- <value>Lohit Hindi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+ <value>Lohit Hindi;Mangal;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-+ </prop>
-+ <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+ </prop>
+ <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+- <value>Lohit Hindi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+ <value>Lohit Hindi;Mangal;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-+ </prop>
-+ <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+ </prop>
+ <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+- <value>Lohit Hindi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+ <value>Lohit Hindi;Mangal;Lucidasans;Lucida Sans;Arial Unicode MS</value>
</prop>
</node>
<node oor:name="gu-IN" oor:op="replace">
<prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
- <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
-- </prop>
-- <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
-- <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-- </prop>
-- <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
-- <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-- </prop>
-- <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
-- <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-- </prop>
-- <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
-- <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-- </prop>
-- <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
-- <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+ <value>Lohit Gujarati;Shruti;Lucidasans;Lucida Sans;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value>
-+ </prop>
-+ <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+ </prop>
+ <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+- <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+ <value>Lohit Gujarati;Shruti;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-+ </prop>
-+ <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+ </prop>
+ <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+- <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+ <value>Lohit Gujarati;Shruti;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-+ </prop>
-+ <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+ </prop>
+ <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+- <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+ <value>Lohit Gujarati;Shruti;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-+ </prop>
-+ <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+ </prop>
+ <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+- <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+ <value>Lohit Gujarati;Shruti;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-+ </prop>
-+ <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+ </prop>
+ <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+- <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+ <value>Lohit Gujarati;Shruti;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+ </prop>
+ </node>
@@ -281,60 +261,35 @@ Index: officecfg/registry/data/org/openo
<node oor:name="or-IN" oor:op="replace">
<prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
- <value>utkal;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
-- </prop>
-- <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
-- <value>utkal;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-- </prop>
-- <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
-- <value>utkal;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-- </prop>
-- <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
-- <value>utkal;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-- </prop>
-- <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
-- <value>utkal;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-- </prop>
-- <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
-- <value>utkal;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+ <value>utkal;Kalinga;Lohit Oriya;Samyak Oriya;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value>
-+ </prop>
-+ <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+ </prop>
+ <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+- <value>utkal;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+ <value>utkal;Kalinga;Lohit Oriya;Samyak Oriya;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-+ </prop>
-+ <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+ </prop>
+ <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+- <value>utkal;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+ <value>utkal;Kalinga;Lohit Oriya;Samyak Oriya;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-+ </prop>
-+ <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+ </prop>
+ <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+- <value>utkal;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+ <value>utkal;Kalinga;Lohit Oriya;Samyak Oriya;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-+ </prop>
-+ <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+ </prop>
+ <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+- <value>utkal;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+ <value>utkal;Kalinga;Lohit Oriya;Samyak Oriya;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-+ </prop>
-+ <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+ </prop>
+ <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+- <value>utkal;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+ <value>utkal;Kalinga;Lohit Oriya;Samyak Oriya;Lucidasans;Lucida Sans;Arial Unicode MS</value>
</prop>
</node>
<node oor:name="pa-IN" oor:op="replace">
-@@ -907,22 +1024,62 @@
+@@ -907,22 +1027,62 @@
</node>
<node oor:name="ta-IN" oor:op="replace">
<prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
-- <value>Lohit Tamil;Tahoma;Sans Serif</value>
-- </prop>
-- <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
-- <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-- </prop>
-- <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
-- <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-- </prop>
-- <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
-- <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-- </prop>
-- <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
-- <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-- </prop>
-- <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
-- <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+- <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
+ <value>Lohit Tamil;Latha;Sans Serif</value>
+ </prop>
+ <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
@@ -356,20 +311,25 @@ Index: officecfg/registry/data/org/openo
+ <node oor:name="te-IN" oor:op="replace">
+ <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
+ <value>Lohit Telugu;Gautami;Lucidasans;Lucida Sans;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value>
-+ </prop>
-+ <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+ </prop>
+ <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+- <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+ <value>Lohit Telugu;Gautami;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-+ </prop>
-+ <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+ </prop>
+ <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+- <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+ <value>Lohit Telugu;Gautami;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-+ </prop>
-+ <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+ </prop>
+ <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+- <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+ <value>Lohit Telugu;Gautami;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-+ </prop>
-+ <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+ </prop>
+ <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+- <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+ <value>Lohit Telugu;Gautami;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-+ </prop>
-+ <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+ </prop>
+ <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+- <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+ <value>Lohit Telugu;Gautami;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+ </prop>
+ </node>
@@ -394,7 +354,7 @@ Index: officecfg/registry/data/org/openo
</prop>
</node>
-@@ -1022,6 +1179,26 @@
+@@ -1022,6 +1182,26 @@
</node>
<node oor:name="rw" oor:op="replace">
</node>
More information about the fedora-extras-commits
mailing list