1 |
scarabeus 12/04/03 16:07:36 |
2 |
|
3 |
Modified: libreoffice-3.5.2-icu-49.patch |
4 |
Removed: libreoffice-3.5.2-icu-49-part2.patch |
5 |
Log: |
6 |
Deal with the icu49 for good now. |
7 |
|
8 |
(Portage version: 2.2.0_alpha98/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.2 app-office/libreoffice/files/libreoffice-3.5.2-icu-49.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-3.5.2-icu-49.patch?rev=1.2&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-3.5.2-icu-49.patch?rev=1.2&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-3.5.2-icu-49.patch?r1=1.1&r2=1.2 |
16 |
|
17 |
Index: libreoffice-3.5.2-icu-49.patch |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/files/libreoffice-3.5.2-icu-49.patch,v |
20 |
retrieving revision 1.1 |
21 |
retrieving revision 1.2 |
22 |
diff -u -r1.1 -r1.2 |
23 |
--- libreoffice-3.5.2-icu-49.patch 2 Apr 2012 16:58:15 -0000 1.1 |
24 |
+++ libreoffice-3.5.2-icu-49.patch 3 Apr 2012 16:07:36 -0000 1.2 |
25 |
@@ -1,54 +1,87 @@ |
26 |
-From 0c08a84c04b166ab6479716e2c33cd444d7e3dbe Mon Sep 17 00:00:00 2001 |
27 |
-From: Arfrever Frehtes Taifersar Arahesis <Arfrever@××××××.Org> |
28 |
-Date: Mon, 2 Apr 2012 18:46:32 +0200 |
29 |
-Subject: [PATCH] Make ICU build with icu-49 by removing no-longer used variables. |
30 |
+From ba3550bc82b8fb697b905c9913e399e1835b7cc0 Mon Sep 17 00:00:00 2001 |
31 |
+From: Eike Rathke <erack@××××××.com> |
32 |
+Date: Tue, 03 Apr 2012 14:15:48 +0000 |
33 |
+Subject: as of ICU 4.9 RBBI the Prepend property is empty |
34 |
|
35 |
-Signed-off-by: Tomas Chvatal <tchvatal@××××.cz> |
36 |
---- |
37 |
- i18npool/source/breakiterator/data/char.txt | 1 - |
38 |
- i18npool/source/breakiterator/data/char_in.txt | 3 --- |
39 |
- 2 files changed, 0 insertions(+), 4 deletions(-) |
40 |
- |
41 |
-diff --git a/i18npool/source/breakiterator/data/char.txt b/i18npool/source/breakiterator/data/char.txt |
42 |
-index 8e49a56..acb932e 100644 |
43 |
---- a/i18npool/source/breakiterator/data/char.txt |
44 |
-+++ b/i18npool/source/breakiterator/data/char.txt |
45 |
-@@ -16,7 +16,6 @@ |
46 |
- $CR = [\p{Grapheme_Cluster_Break = CR}]; |
47 |
- $LF = [\p{Grapheme_Cluster_Break = LF}]; |
48 |
- $Control = [\p{Grapheme_Cluster_Break = Control}]; |
49 |
--$Prepend = [\p{Grapheme_Cluster_Break = Prepend}]; |
50 |
- $Extend = [\p{Grapheme_Cluster_Break = Extend}]; |
51 |
- $SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}]; |
52 |
- # True Indic wants to move by syllables. Break up SpacingMark. This based on Unicode 6.0 data |
53 |
-diff --git a/i18npool/source/breakiterator/data/char_in.txt b/i18npool/source/breakiterator/data/char_in.txt |
54 |
-index 5e1ed67..5ad12a7 100644 |
55 |
---- a/i18npool/source/breakiterator/data/char_in.txt |
56 |
-+++ b/i18npool/source/breakiterator/data/char_in.txt |
57 |
-@@ -15,7 +15,6 @@ |
58 |
- $CR = [\p{Grapheme_Cluster_Break = CR}]; |
59 |
- $LF = [\p{Grapheme_Cluster_Break = LF}]; |
60 |
- $Control = [\p{Grapheme_Cluster_Break = Control}]; |
61 |
--$Prepend = [\p{Grapheme_Cluster_Break = Prepend}]; |
62 |
- $Extend = [\p{Grapheme_Cluster_Break = Extend}]; |
63 |
- $SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}]; |
64 |
- $BengaliLetter = [\u0985-\u09B9 \u09CE \u09DC-\u09E1 \u09F0-\u09F1]; |
65 |
-@@ -72,7 +71,6 @@ $L ($L | $V | $LV | $LVT); |
66 |
- [^$Control $CR $LF] $Extend; |
67 |
- |
68 |
- [^$Control $CR $LF] $SpacingMark; |
69 |
--$Prepend [^$Control $CR $LF]; |
70 |
- |
71 |
- |
72 |
- ## ------------------------------------------------- |
73 |
-@@ -94,7 +92,6 @@ $T ($LVT | $T); |
74 |
- |
75 |
- $Extend [^$Control $CR $LF]; |
76 |
- $SpacingMark [^$Control $CR $LF]; |
77 |
--[^$Control $CR $LF] $Prepend; |
78 |
- |
79 |
- |
80 |
- ## ------------------------------------------------- |
81 |
--- |
82 |
-1.7.3.4 |
83 |
+Backport of 43084e8b30c101a44510b7a8267d5c2b316a17bb |
84 |
+* config_host.mk doesn't exist, instead changes to set_soenv.in |
85 |
+* i18npool/CustomTarget_breakiterator.mk doesn't exist, instead same changes |
86 |
+ to i18npool/source/breakiterator/Makefile |
87 |
+* char.txt and char_in.txt unchanged |
88 |
|
89 |
+Signed-off-by: Tomáš Chvátal <tomas.chvatal@×××××.com> |
90 |
+--- |
91 |
+diff --git a/configure.in b/configure.in |
92 |
+index ea959e6..8e45756 100644 |
93 |
+--- a/configure.in |
94 |
++++ b/configure.in |
95 |
+@@ -6162,6 +6162,7 @@ ICU_MAJOR= |
96 |
+ ICU_MINOR= |
97 |
+ ICU_MICRO= |
98 |
+ ICU_RECLASSIFIED_CLOSE_PARENTHESIS= |
99 |
++ICU_RECLASSIFIED_PREPEND_SET_EMPTY= |
100 |
+ AC_MSG_CHECKING([which icu to use]) |
101 |
+ if test "$with_system_icu" = "yes"; then |
102 |
+ AC_MSG_RESULT([external]) |
103 |
+@@ -6207,6 +6208,9 @@ if test "$with_system_icu" = "yes"; then |
104 |
+ if test "$ICU_MAJOR" -ge "5" -o "$ICU_MAJOR" = "4" -a "$ICU_MINOR" -ge "4"; then |
105 |
+ ICU_RECLASSIFIED_CLOSE_PARENTHESIS="YES" |
106 |
+ fi |
107 |
++ if test "$ICU_MAJOR" -ge "5" -o "$ICU_MAJOR" = "4" -a "$ICU_MINOR" -ge "9"; then |
108 |
++ ICU_RECLASSIFIED_PREPEND_SET_EMPTY="YES" |
109 |
++ fi |
110 |
+ fi |
111 |
+ |
112 |
+ MINGW_EXTERNAL_DLLS="$MINGW_EXTERNAL_DLLS icui18n$ICU_MAJOR$ICU_MINOR.dll icuuc$ICU_MAJOR$ICU_MINOR.dll icudata$ICU_MAJOR$ICU_MINOR.dll" |
113 |
+@@ -6214,6 +6218,7 @@ else |
114 |
+ AC_MSG_RESULT([internal]) |
115 |
+ SYSTEM_ICU="NO" |
116 |
+ ICU_RECLASSIFIED_CLOSE_PARENTHESIS="YES" |
117 |
++ # ICU_RECLASSIFIED_PREPEND_SET_EMPTY not applied for our internal ICU 4.4.2 |
118 |
+ BUILD_TYPE="$BUILD_TYPE ICU" |
119 |
+ fi |
120 |
+ AC_SUBST(SYSTEM_ICU) |
121 |
+@@ -6224,6 +6229,7 @@ AC_SUBST(ICU_MAJOR) |
122 |
+ AC_SUBST(ICU_MINOR) |
123 |
+ AC_SUBST(ICU_MICRO) |
124 |
+ AC_SUBST(ICU_RECLASSIFIED_CLOSE_PARENTHESIS) |
125 |
++AC_SUBST(ICU_RECLASSIFIED_PREPEND_SET_EMPTY) |
126 |
+ |
127 |
+ dnl =================================================================== |
128 |
+ dnl Graphite |
129 |
+diff --git a/i18npool/source/breakiterator/Makefile b/i18npool/source/breakiterator/Makefile |
130 |
+index b34217a..6aed8b2 100644 |
131 |
+--- a/i18npool/source/breakiterator/Makefile |
132 |
++++ b/i18npool/source/breakiterator/Makefile |
133 |
+@@ -83,10 +83,16 @@ OpenOffice_dat.c : $(subst .brk,_brk.c,$(BRKFILES)) |
134 |
+ %.brk : %.txt.p |
135 |
+ $(GENBRK) -r $< -o $@ |
136 |
+ |
137 |
+-# fdo#31271 ")" reclassified in more recent ICU/Unicode Standards |
138 |
++# fdo#31271 ")" reclassified in more recent Unicode Standards / ICU 4.4 |
139 |
++# Prepend set empty as of Unicode Version 6.1 / ICU 4.9, which bails out if used. |
140 |
++# NOTE: strips every line with _word_ 'Prepend', including $Prepend |
141 |
+ %.txt.p : $(realpath $(SRC_ROOT)/i18npool/source/breakiterator/data)/%.txt |
142 |
+ ifeq ($(ICU_RECLASSIFIED_CLOSE_PARENTHESIS),YES) |
143 |
++ifeq ($(ICU_RECLASSIFIED_PREPEND_SET_EMPTY),YES) |
144 |
++ sed "s#\[:LineBreak = Close_Punctuation:\]#\[\[:LineBreak = Close_Punctuation:\] \[:LineBreak = Close_Parenthesis:\]\]#;/\<Prepend\>/d" $< > $@ |
145 |
++else |
146 |
+ sed "s#\[:LineBreak = Close_Punctuation:\]#\[\[:LineBreak = Close_Punctuation:\] \[:LineBreak = Close_Parenthesis:\]\]#" $< > $@ |
147 |
++endif |
148 |
+ else |
149 |
+ cp $< $@ |
150 |
+ endif |
151 |
+diff --git a/set_soenv.in b/set_soenv.in |
152 |
+index 3dc9cfa..a8561cd 100755 |
153 |
+--- a/set_soenv.in |
154 |
++++ b/set_soenv.in |
155 |
+@@ -1881,6 +1881,7 @@ ToFile( "ICU_MAJOR", "@ICU_MAJOR@", "e" ); |
156 |
+ ToFile( "ICU_MINOR", "@ICU_MINOR@", "e" ); |
157 |
+ ToFile( "ICU_MICRO", "@ICU_MICRO@", "e" ); |
158 |
+ ToFile( "ICU_RECLASSIFIED_CLOSE_PARENTHESIS", "@ICU_RECLASSIFIED_CLOSE_PARENTHESIS@", "e" ); |
159 |
++ToFile( "ICU_RECLASSIFIED_PREPEND_SET_EMPTY", "@ICU_RECLASSIFIED_PREPEND_SET_EMPTY@", "e" ); |
160 |
+ ToFile( "SYSTEM_GENBRK", "@SYSTEM_GENBRK@", "e" ); |
161 |
+ ToFile( "SYSTEM_GENCCODE", "@SYSTEM_GENCCODE@", "e" ); |
162 |
+ ToFile( "SYSTEM_GENCMN", "@SYSTEM_GENCMN@", "e" ); |
163 |
+-- |
164 |
+cgit v0.9.0.2-2-gbebe |