rpms/openoffice.org/devel openoffice.org.spec, 1.2237, 1.2238 workspace.locales33a.patch, 1.1, 1.2 openoffice.org-3.3.0.ooo111152.i18npool.viramacursor.patch, 1.1, NONE
Caolan McNamara
caolanm at fedoraproject.org
Fri Jun 11 07:45:16 UTC 2010
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv27760
Modified Files:
openoffice.org.spec workspace.locales33a.patch
Removed Files:
openoffice.org-3.3.0.ooo111152.i18npool.viramacursor.patch
Log Message:
merge patches into accepted upstream workspace
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2237
retrieving revision 1.2238
diff -u -p -r1.2237 -r1.2238
--- openoffice.org.spec 11 Jun 2010 07:43:36 -0000 1.2237
+++ openoffice.org.spec 11 Jun 2010 07:45:16 -0000 1.2238
@@ -129,26 +129,25 @@ Patch58: workspace.koheicsvimport.patch
Patch59: workspace.odfmetadata4.patch
Patch60: workspace.tl80.patch
Patch61: openoffice.org-3.2.0.ooo110142.svx.safercolornames.patch
-Patch62: openoffice.org-3.3.0.ooo111152.i18npool.viramacursor.patch
-Patch63: workspace.vcl111.patch
-Patch64: workspace.sw33bf04.patch
-Patch65: workspace.mba33issues01.patch
-Patch66: openoffice.org-3.3.0.ooo111446.writerfilter.avoidcrash.patch
-Patch67: workspace.chart47.patch
-Patch68: openoffice.org-3.3.0.ooo111699.svx.nullfield.patch
-Patch69: openoffice.org-3.3.0.ooo111758.sd.xerror.patch
-Patch70: workspace.extras330.patch
-Patch71: openoffice.org-3.2.0.ooo111741.extras.malformed-xml-file.patch
-Patch72: openoffice.org-3.2.0.ooo111886.sw.layout.workaround.patch
-Patch73: workspace.cmcfixes64.patch
-Patch74: workspace.cmcfixes75.patch
-Patch75: workspace.writerfilter08.patch
-Patch76: openoffice.org-3.3.0.ooo112059.sw.avoid-null-ptr-deref.patch
-Patch77: workspace.os140.patch
-Patch78: workspace.vcl112.patch
-Patch79: openoffice.org-3.3.0.ooo107490.cppu.lifecycle.patch
-Patch80: openoffice.org-3.3.0.ooo100686.wizards.types.not.mediatypes.patch
-Patch81: openoffice.org-3.3.0.ooo112247.vcl.workaround.overlarge.replacements.patch
+Patch62: workspace.vcl111.patch
+Patch63: workspace.sw33bf04.patch
+Patch64: workspace.mba33issues01.patch
+Patch65: openoffice.org-3.3.0.ooo111446.writerfilter.avoidcrash.patch
+Patch66: workspace.chart47.patch
+Patch67: openoffice.org-3.3.0.ooo111699.svx.nullfield.patch
+Patch68: openoffice.org-3.3.0.ooo111758.sd.xerror.patch
+Patch69: workspace.extras330.patch
+Patch70: openoffice.org-3.2.0.ooo111741.extras.malformed-xml-file.patch
+Patch71: openoffice.org-3.2.0.ooo111886.sw.layout.workaround.patch
+Patch72: workspace.cmcfixes64.patch
+Patch73: workspace.cmcfixes75.patch
+Patch74: workspace.writerfilter08.patch
+Patch75: openoffice.org-3.3.0.ooo112059.sw.avoid-null-ptr-deref.patch
+Patch76: workspace.os140.patch
+Patch77: workspace.vcl112.patch
+Patch78: openoffice.org-3.3.0.ooo107490.cppu.lifecycle.patch
+Patch79: openoffice.org-3.3.0.ooo100686.wizards.types.not.mediatypes.patch
+Patch80: openoffice.org-3.3.0.ooo112247.vcl.workaround.overlarge.replacements.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir}
@@ -1691,26 +1690,25 @@ cp -p %{SOURCE5} external/unowinreg/unow
%patch59 -p1 -b .workspace.odfmetadata4.patch
%patch60 -p1 -b .workspace.tl80.patch
%patch61 -p0 -b .ooo110142.svx.safercolornames.patch
-%patch62 -p1 -b .ooo111152.i18npool.viramacursor.patch
-%patch63 -p1 -b .workspace.vcl111.patch
-%patch64 -p1 -b .workspace.sw33bf04.patch
-%patch65 -p1 -b .workspace.mba33issues01.patch
-%patch66 -p0 -b .ooo111446.writerfilter.avoidcrash.patch
-%patch67 -p0 -b .workspace.chart47.patch
-%patch68 -p0 -b .ooo111699.svx.nullfield.patch
-%patch69 -p0 -b .ooo111758.sd.xerror.patch
-%patch70 -p1 -b .workspace.extras330.patch
-%patch71 -p1 -b .ooo111741.extras.malformed-xml-file.patch
-%patch72 -p0 -b .ooo111886.sw.layout.workaround.patch
-%patch73 -p1 -b .workspace.cmcfixes64.patch
-%patch74 -p1 -b .workspace.cmcfixes75.patch
-%patch75 -p0 -b .workspace.writerfilter08.patch
-%patch76 -p1 -b .ooo112059.sw.avoid-null-ptr-deref.patch
-%patch77 -p1 -b .workspace.os140.patch
-%patch78 -p1 -b .workspace.vcl112.patch
-%patch79 -p1 -b .ooo107490.cppu.lifecycle.patch
-%patch80 -p0 -b .openoffice.org-3.3.0.ooo100686.wizards.types.not.mediatypes.patch
-%patch81 -p0 -b .openoffice.org-3.3.0.ooo112247.vcl.workaround.overlarge.replacements.patch
+%patch62 -p1 -b .workspace.vcl111.patch
+%patch63 -p1 -b .workspace.sw33bf04.patch
+%patch64 -p1 -b .workspace.mba33issues01.patch
+%patch65 -p0 -b .ooo111446.writerfilter.avoidcrash.patch
+%patch66 -p0 -b .workspace.chart47.patch
+%patch67 -p0 -b .ooo111699.svx.nullfield.patch
+%patch66 -p0 -b .ooo111758.sd.xerror.patch
+%patch69 -p1 -b .workspace.extras330.patch
+%patch70 -p1 -b .ooo111741.extras.malformed-xml-file.patch
+%patch71 -p0 -b .ooo111886.sw.layout.workaround.patch
+%patch72 -p1 -b .workspace.cmcfixes64.patch
+%patch73 -p1 -b .workspace.cmcfixes75.patch
+%patch74 -p0 -b .workspace.writerfilter08.patch
+%patch75 -p1 -b .ooo112059.sw.avoid-null-ptr-deref.patch
+%patch76 -p1 -b .workspace.os140.patch
+%patch77 -p1 -b .workspace.vcl112.patch
+%patch78 -p1 -b .ooo107490.cppu.lifecycle.patch
+%patch79 -p0 -b .openoffice.org-3.3.0.ooo100686.wizards.types.not.mediatypes.patch
+%patch80 -p0 -b .openoffice.org-3.3.0.ooo112247.vcl.workaround.overlarge.replacements.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
workspace.locales33a.patch:
b/i18npool/source/localedata/data/mai_IN.xml | 357 ++++++++++++++++++
i18npool/source/breakiterator/data/char_in.txt | 112 ++++-
i18npool/source/localedata/data/localedata_others.map | 17
i18npool/source/localedata/data/makefile.mk | 2
i18npool/source/localedata/localedata.cxx | 1
5 files changed, 463 insertions(+), 26 deletions(-)
Index: workspace.locales33a.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.locales33a.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- workspace.locales33a.patch 11 Jun 2010 07:43:37 -0000 1.1
+++ workspace.locales33a.patch 11 Jun 2010 07:45:16 -0000 1.2
@@ -537,3 +537,141 @@ diff -r 345841e986e1 -r 19e0e06e8f27 i18
static const sal_Unicode under = sal_Unicode('_');
+diff -r 03068afc23c6 i18npool/source/breakiterator/data/char_in.txt
+--- a/i18npool/source/breakiterator/data/char_in.txt Sun Apr 25 15:43:24 2010 +0100
++++ b/i18npool/source/breakiterator/data/char_in.txt Mon Apr 26 10:21:41 2010 +0100
+@@ -1,48 +1,108 @@
+ #
+-# Copyright (C) 2002-2003, International Business Machines Corporation and others.
++# Copyright (C) 2002-2009, International Business Machines Corporation and others.
+ # All Rights Reserved.
+ #
+ # file: char.txt
+ #
+ # ICU Character Break Rules, also known as Grapheme Cluster Boundaries
+ # See Unicode Standard Annex #29.
+-# These rules are based on TR29 Version 4.0.0
++# These rules are based on TR29 Revision 13, for Unicode Version 5.1
+ #
+
+ #
+ # Character Class Definitions.
+-# The names are those from TR29.
+ #
+-$CR = \r;
+-$LF = \n;
+-$Control = [[:Zl:] [:Zp:] [:Cc:] [:Cf:]];
+-
+-# add Japanese Half Width voicing marks to $Extend
+-$VoiceMarks = [\uff9e\uff9f];
+-$cmcextend = [ \u0903 \u093e-\u0940 \u0949-\u094C \u09bf-\u09c0 \u09c7-\u09c8 \u09cb-\u09cc \u0bc1-\u0bc2 \u0bc6-\u0bc8 \u0bca-\u0bcc \u0c01-\u0c03 \u0c41-\u0c44];
+-$Extend = [[:Grapheme_Extend = TRUE:] $VoiceMarks $cmcextend];
++$CR = [\p{Grapheme_Cluster_Break = CR}];
++$LF = [\p{Grapheme_Cluster_Break = LF}];
++$Control = [\p{Grapheme_Cluster_Break = Control}];
++$Prepend = [\p{Grapheme_Cluster_Break = Prepend}];
++$Extend = [\p{Grapheme_Cluster_Break = Extend}];
++$SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}];
++$BengaliLetter = [\u0985-\u09B9 \u09CE \u09DC-\u09E1 \u09F0-\u09F1];
++$BengaliSignVirama = \u09CD;
++$GujaratiLetter = [\u0A85-\u0A8C \u0A8F-\u0A90 \u0A93-\u0AB9 \u0AE0-\u0AE1];
++$GujaratiSignVirama = \u0ACD;
++$DevanagariLetter = [\u0904-\u0939 \u0958-\u0961 \u0972-\u097F];
++$DevanagariSignVirama = \u094D;
++$KannadaLetter = [\u0C85-\u0CB9 \u0CDE-\u0CE1];
++$KannadaSignVirama = \u0CCD;
++$MalayalamLetter = [\u0D05-\u0D39 \u0D60-\u0D61 \u0D7A-\u0D7F];
++$MalayalamSignVirama = \u0D4D;
++$OriyaLetter = [\u0B05-\u0B39 \u0B5C-\u0B61 \u0B71];
++$OriyaSignVirama = \u0B4D;
++$GurmukhiLetter = [\u0A05-\u0A39 \u0A59-\u0A5E];
++$GurmukhiSignVirama = \u0A4D;
++$TamilLetter = [\u0B85-\u0BB9];
++$TamilSignVirama = \u0BCD;
++$TeluguLetter = [\u0C05-\u0C39 \u0C58-\u0C61];
++$TeluguSignVirama = \u0C4D;
+
+ #
+ # Korean Syllable Definitions
+ #
+-$L = [:Hangul_Syllable_Type = L:];
+-$V = [:Hangul_Syllable_Type = V:];
+-$T = [:Hangul_Syllable_Type = T:];
++$L = [\p{Grapheme_Cluster_Break = L}];
++$V = [\p{Grapheme_Cluster_Break = V}];
++$T = [\p{Grapheme_Cluster_Break = T}];
+
+-$LV = [:Hangul_Syllable_Type = LV:];
+-$LVT = [:Hangul_Syllable_Type = LVT:];
++$LV = [\p{Grapheme_Cluster_Break = LV}];
++$LVT = [\p{Grapheme_Cluster_Break = LVT}];
+
+-$HangulSyllable = $L+ | ($L* ($LV? $V+ | $LV | $LVT) $T*) | $T+;
+
+-#
+-# Forward Break Rules
+-#
++## -------------------------------------------------
++!!chain;
++
++!!forward;
++
+ $CR $LF;
+-([^$Control] | $HangulSyllable) $Extend*;
+-.;
+
++$BengaliLetter ($BengaliSignVirama $BengaliLetter?)+;
++$GujaratiLetter ($GujaratiSignVirama $GujaratiLetter?)+;
++$DevanagariLetter ($DevanagariSignVirama $DevanagariLetter?)+;
++$KannadaLetter ($KannadaSignVirama $KannadaLetter?)+;
++$MalayalamLetter ($MalayalamSignVirama $MalayalamLetter?)+;
++$OriyaLetter ($OriyaSignVirama $OriyaLetter?)+;
++$GurmukhiLetter ($GurmukhiSignVirama $GurmukhiLetter?)+;
++$TamilLetter ($TamilSignVirama $TamilLetter?)+;
++$TeluguLetter ($TeluguSignVirama $TeluguLetter?)+;
+
+-#
+-# Reverse Rule, back up to the beginning of some preceding grapheme cluster.
+-#
+-! ($Extend | $V | $T )* ($LF $CR | ($LV | $LVT)?$L* | .);
++$L ($L | $V | $LV | $LVT);
++($LV | $V) ($V | $T);
++($LVT | $T) $T;
++
++[^$Control $CR $LF] $Extend;
++
++[^$Control $CR $LF] $SpacingMark;
++$Prepend [^$Control $CR $LF];
++
++
++## -------------------------------------------------
++
++!!reverse;
++$LF $CR;
++($BengaliLetter? $BengaliSignVirama)+ $BengaliLetter;
++($GujaratiLetter? $GujaratiSignVirama)+ $GujaratiLetter;
++($DevanagariLetter? $DevanagariSignVirama)+ $DevanagariLetter;
++($KannadaLetter? $KannadaSignVirama)+ $KannadaLetter;
++($MalayalamLetter? $MalayalamSignVirama)+ $MalayalamLetter;
++($OriyaLetter? $OriyaSignVirama)+ $OriyaLetter;
++($GurmukhiLetter? $GurmukhiSignVirama)+ $GurmukhiLetter;
++($TamilLetter? $TamilSignVirama)+ $TamilLetter;
++($TeluguLetter? $TeluguSignVirama)+ $TeluguLetter;
++($L | $V | $LV | $LVT) $L;
++($V | $T) ($LV | $V);
++$T ($LVT | $T);
++
++$Extend [^$Control $CR $LF];
++$SpacingMark [^$Control $CR $LF];
++[^$Control $CR $LF] $Prepend;
++
++
++## -------------------------------------------------
++
++!!safe_reverse;
++
++
++## -------------------------------------------------
++
++!!safe_forward;
++
--- openoffice.org-3.3.0.ooo111152.i18npool.viramacursor.patch DELETED ---
More information about the scm-commits
mailing list