rpms/openoffice.org/devel openoffice.org.spec, 1.2038, 1.2039 workspace.vcl106.patch, 1.3, 1.4 openoffice.org-3.2.0.ooo105815.officecfg.default-font-for-si-locale.patch, 1.1, NONE openoffice.org-3.2.0.ooo105914.officecfg.default-fonts-for-indic-locales.patch, 1.1, NONE
Caolan McNamara
caolanm at fedoraproject.org
Thu Oct 15 08:10:08 UTC 2009
- Previous message (by thread): rpms/openoffice.org/F-12 workspace.vcl106.patch, NONE, 1.1 openoffice.org.spec, 1.2018, 1.2019 openoffice.org-3.1.1.ooo105613.vcl.a11y.exceptions.patch, 1.1, NONE openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch, 1.1, NONE openoffice.org-3.2.0.ooo105815.officecfg.default-font-for-si-locale.patch, 1.1, NONE openoffice.org-3.2.0.ooo105914.officecfg.default-fonts-for-indic-locales.patch, 1.1, NONE
- Next message (by thread): rpms/kernel/F-11 config-generic, 1.293, 1.294 kernel.spec, 1.1763, 1.1764
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9462/devel
Modified Files:
openoffice.org.spec workspace.vcl106.patch
Removed Files:
openoffice.org-3.2.0.ooo105815.officecfg.default-font-for-si-locale.patch
openoffice.org-3.2.0.ooo105914.officecfg.default-fonts-for-indic-locales.patch
Log Message:
merge patches into accepted workspace
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2038
retrieving revision 1.2039
diff -u -p -r1.2038 -r1.2039
--- openoffice.org.spec 15 Oct 2009 06:38:31 -0000 1.2038
+++ openoffice.org.spec 15 Oct 2009 08:10:07 -0000 1.2039
@@ -115,9 +115,7 @@ Patch41: openoffice.org-3.1.1.oooXXXXXX.
Patch42: workspace.vcl106.patch
Patch43: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
Patch44: workspace.dba32h.patch
-Patch45: openoffice.org-3.2.0.ooo105815.officecfg.default-font-for-si-locale.patch
-Patch46: openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch
-Patch47: openoffice.org-3.2.0.ooo105914.officecfg.default-fonts-for-indic-locales.patch
+Patch45: openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch
%define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
%define instdir %{_libdir}
@@ -1622,9 +1620,7 @@ cat %{PATCH10} >> svtools/source/dialogs
%patch42 -p0 -b .workspace.vcl106.patch
%patch43 -p0 -b .ooo105784.vcl.sniffscriptforsubs.patch
%patch44 -p0 -b .workspace.dba32h.patch
-%patch45 -p0 -b .ooo105815.officecfg.default-font-for-si-locale.patch
-%patch46 -p0 -b .ooo105827.filter.xpath-on-rtf-not-allowed.patch
-%patch47 -p0 -b .ooo105914.officecfg.default-fonts-for-indic-locales.patch
+%patch45 -p0 -b .ooo105827.filter.xpath-on-rtf-not-allowed.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
workspace.vcl106.patch:
officecfg/registry/data/org/openoffice/VCL.xcu | 160 +++++++++++++++++++++++++
unx/gtk/a11y/atkutil.cxx | 13 +-
vcl/source/fontsubset/gsub.cxx | 10 +
vcl/source/glyphs/gcach_ftyp.cxx | 11 +
4 files changed, 187 insertions(+), 7 deletions(-)
Index: workspace.vcl106.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.vcl106.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- workspace.vcl106.patch 13 Oct 2009 14:06:00 -0000 1.3
+++ workspace.vcl106.patch 15 Oct 2009 08:10:07 -0000 1.4
@@ -78,3 +78,195 @@ diff -ru vcl.orig/source/fontsubset/gsub
}
}
break;
+Index: officecfg/registry/data/org/openoffice/VCL.xcu
+===================================================================
+--- officecfg/registry/data/org/openoffice/VCL.xcu (revision 276736)
++++ officecfg/registry/data/org/openoffice/VCL.xcu (working copy)
+@@ -825,6 +825,46 @@
+ <value>Lohit Nepali;Kalimati;Samanata;Sans</value>
+ </prop>
+ </node>
++ <node oor:name="as-IN" oor:op="replace">
++ <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
++ <value>Lohit Assamese;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 Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++ </prop>
++ <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
++ <value>Lohit Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++ </prop>
++ <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
++ <value>Lohit Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++ </prop>
++ <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
++ <value>Lohit Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++ </prop>
++ <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
++ <value>Lohit Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++ </prop>
++ </node>
++ <node oor:name="bn-IN" oor:op="replace">
++ <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
++ <value>Lohit Bengali;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 Bengali;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++ </prop>
++ <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
++ <value>Lohit Bengali;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++ </prop>
++ <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
++ <value>Lohit Bengali;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++ </prop>
++ <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
++ <value>Lohit Bengali;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++ </prop>
++ <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
++ <value>Lohit Bengali;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++ </prop>
++ </node>
+ <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>
+@@ -865,6 +905,86 @@
+ <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+ </prop>
+ </node>
++ <node oor:name="kn-IN" oor:op="replace">
++ <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
++ <value>Lohit Kannada;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 Kannada;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++ </prop>
++ <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
++ <value>Lohit Kannada;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++ </prop>
++ <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
++ <value>Lohit Kannada;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++ </prop>
++ <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
++ <value>Lohit Kannada;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++ </prop>
++ <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
++ <value>Lohit Kannada;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++ </prop>
++ </node>
++ <node oor:name="mai-IN" oor:op="replace">
++ <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
++ <value>Lohit Maithili;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 Maithili;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++ </prop>
++ <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
++ <value>Lohit Maithili;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++ </prop>
++ <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
++ <value>Lohit Maithili;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++ </prop>
++ <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
++ <value>Lohit Maithili;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++ </prop>
++ <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
++ <value>Lohit Maithili;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++ </prop>
++ </node>
++ <node oor:name="ml-IN" oor:op="replace">
++ <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
++ <value>Meera;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>Meera;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++ </prop>
++ <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
++ <value>Meera;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++ </prop>
++ <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
++ <value>Meera;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++ </prop>
++ <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
++ <value>Meera;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++ </prop>
++ <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
++ <value>Meera;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++ </prop>
++ </node>
++ <node oor:name="mr-IN" oor:op="replace">
++ <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
++ <value>Lohit Marathi;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 Marathi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++ </prop>
++ <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
++ <value>Lohit Marathi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++ </prop>
++ <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
++ <value>Lohit Marathi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++ </prop>
++ <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
++ <value>Lohit Marathi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++ </prop>
++ <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
++ <value>Lohit Marathi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++ </prop>
++ </node>
+ <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>
+@@ -925,6 +1045,26 @@
+ <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+ </prop>
+ </node>
++ <node oor:name="te-IN" oor:op="replace">
++ <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
++ <value>Lohit Telugu;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 Telugu;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++ </prop>
++ <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
++ <value>Lohit Telugu;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++ </prop>
++ <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
++ <value>Lohit Telugu;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++ </prop>
++ <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
++ <value>Lohit Telugu;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++ </prop>
++ <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
++ <value>Lohit Telugu;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++ </prop>
++ </node>
+
+ <node oor:name="ak-GH" oor:op="replace">
+ <prop oor:name="LATIN_DISPLAY" oor:type="xs:string" oor:op="replace">
+@@ -1022,6 +1162,26 @@
+ </node>
+ <node oor:name="rw" oor:op="replace">
+ </node>
++ <node oor:name="si" oor:op="replace">
++ <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
++ <value>LKLUG;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>LKLUG;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++ </prop>
++ <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
++ <value>LKLUG;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++ </prop>
++ <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
++ <value>LKLUG;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++ </prop>
++ <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
++ <value>LKLUG;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++ </prop>
++ <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
++ <value>LKLUG;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++ </prop>
++ </node>
+ </node>
+ <node oor:name="FontSubstitutions">
+ <node oor:name="en" oor:op="replace">
--- openoffice.org-3.2.0.ooo105815.officecfg.default-font-for-si-locale.patch DELETED ---
--- openoffice.org-3.2.0.ooo105914.officecfg.default-fonts-for-indic-locales.patch DELETED ---
- Previous message (by thread): rpms/openoffice.org/F-12 workspace.vcl106.patch, NONE, 1.1 openoffice.org.spec, 1.2018, 1.2019 openoffice.org-3.1.1.ooo105613.vcl.a11y.exceptions.patch, 1.1, NONE openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch, 1.1, NONE openoffice.org-3.2.0.ooo105815.officecfg.default-font-for-si-locale.patch, 1.1, NONE openoffice.org-3.2.0.ooo105914.officecfg.default-fonts-for-indic-locales.patch, 1.1, NONE
- Next message (by thread): rpms/kernel/F-11 config-generic, 1.293, 1.294 kernel.spec, 1.1763, 1.1764
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list