/[gentoo-x86]/app-office/libreoffice/files/libreoffice-3.5.2-icu-49.patch
Gentoo

Contents of /app-office/libreoffice/files/libreoffice-3.5.2-icu-49.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.3 - (show annotations) (download)
Wed Jun 6 12:44:12 2012 UTC (2 years, 2 months ago) by scarabeus
Branch: MAIN
CVS Tags: HEAD
Changes since 1.2: +0 -0 lines
FILE REMOVED
3.5 branch depend only on cmis-0.1.

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

1 From ba3550bc82b8fb697b905c9913e399e1835b7cc0 Mon Sep 17 00:00:00 2001
2 From: Eike Rathke <erack@redhat.com>
3 Date: Tue, 03 Apr 2012 14:15:48 +0000
4 Subject: as of ICU 4.9 RBBI the Prepend property is empty
5
6 Backport of 43084e8b30c101a44510b7a8267d5c2b316a17bb
7 * config_host.mk doesn't exist, instead changes to set_soenv.in
8 * i18npool/CustomTarget_breakiterator.mk doesn't exist, instead same changes
9 to i18npool/source/breakiterator/Makefile
10 * char.txt and char_in.txt unchanged
11
12 Signed-off-by: Tomáš Chvátal <tomas.chvatal@gmail.com>
13 ---
14 diff --git a/configure.in b/configure.in
15 index ea959e6..8e45756 100644
16 --- a/configure.in
17 +++ b/configure.in
18 @@ -6162,6 +6162,7 @@ ICU_MAJOR=
19 ICU_MINOR=
20 ICU_MICRO=
21 ICU_RECLASSIFIED_CLOSE_PARENTHESIS=
22 +ICU_RECLASSIFIED_PREPEND_SET_EMPTY=
23 AC_MSG_CHECKING([which icu to use])
24 if test "$with_system_icu" = "yes"; then
25 AC_MSG_RESULT([external])
26 @@ -6207,6 +6208,9 @@ if test "$with_system_icu" = "yes"; then
27 if test "$ICU_MAJOR" -ge "5" -o "$ICU_MAJOR" = "4" -a "$ICU_MINOR" -ge "4"; then
28 ICU_RECLASSIFIED_CLOSE_PARENTHESIS="YES"
29 fi
30 + if test "$ICU_MAJOR" -ge "5" -o "$ICU_MAJOR" = "4" -a "$ICU_MINOR" -ge "9"; then
31 + ICU_RECLASSIFIED_PREPEND_SET_EMPTY="YES"
32 + fi
33 fi
34
35 MINGW_EXTERNAL_DLLS="$MINGW_EXTERNAL_DLLS icui18n$ICU_MAJOR$ICU_MINOR.dll icuuc$ICU_MAJOR$ICU_MINOR.dll icudata$ICU_MAJOR$ICU_MINOR.dll"
36 @@ -6214,6 +6218,7 @@ else
37 AC_MSG_RESULT([internal])
38 SYSTEM_ICU="NO"
39 ICU_RECLASSIFIED_CLOSE_PARENTHESIS="YES"
40 + # ICU_RECLASSIFIED_PREPEND_SET_EMPTY not applied for our internal ICU 4.4.2
41 BUILD_TYPE="$BUILD_TYPE ICU"
42 fi
43 AC_SUBST(SYSTEM_ICU)
44 @@ -6224,6 +6229,7 @@ AC_SUBST(ICU_MAJOR)
45 AC_SUBST(ICU_MINOR)
46 AC_SUBST(ICU_MICRO)
47 AC_SUBST(ICU_RECLASSIFIED_CLOSE_PARENTHESIS)
48 +AC_SUBST(ICU_RECLASSIFIED_PREPEND_SET_EMPTY)
49
50 dnl ===================================================================
51 dnl Graphite
52 diff --git a/i18npool/source/breakiterator/Makefile b/i18npool/source/breakiterator/Makefile
53 index b34217a..6aed8b2 100644
54 --- a/i18npool/source/breakiterator/Makefile
55 +++ b/i18npool/source/breakiterator/Makefile
56 @@ -83,10 +83,16 @@ OpenOffice_dat.c : $(subst .brk,_brk.c,$(BRKFILES))
57 %.brk : %.txt.p
58 $(GENBRK) -r $< -o $@
59
60 -# fdo#31271 ")" reclassified in more recent ICU/Unicode Standards
61 +# fdo#31271 ")" reclassified in more recent Unicode Standards / ICU 4.4
62 +# Prepend set empty as of Unicode Version 6.1 / ICU 4.9, which bails out if used.
63 +# NOTE: strips every line with _word_ 'Prepend', including $Prepend
64 %.txt.p : $(realpath $(SRC_ROOT)/i18npool/source/breakiterator/data)/%.txt
65 ifeq ($(ICU_RECLASSIFIED_CLOSE_PARENTHESIS),YES)
66 +ifeq ($(ICU_RECLASSIFIED_PREPEND_SET_EMPTY),YES)
67 + sed "s#\[:LineBreak = Close_Punctuation:\]#\[\[:LineBreak = Close_Punctuation:\] \[:LineBreak = Close_Parenthesis:\]\]#;/\<Prepend\>/d" $< > $@
68 +else
69 sed "s#\[:LineBreak = Close_Punctuation:\]#\[\[:LineBreak = Close_Punctuation:\] \[:LineBreak = Close_Parenthesis:\]\]#" $< > $@
70 +endif
71 else
72 cp $< $@
73 endif
74 diff --git a/set_soenv.in b/set_soenv.in
75 index 3dc9cfa..a8561cd 100755
76 --- a/set_soenv.in
77 +++ b/set_soenv.in
78 @@ -1881,6 +1881,7 @@ ToFile( "ICU_MAJOR", "@ICU_MAJOR@", "e" );
79 ToFile( "ICU_MINOR", "@ICU_MINOR@", "e" );
80 ToFile( "ICU_MICRO", "@ICU_MICRO@", "e" );
81 ToFile( "ICU_RECLASSIFIED_CLOSE_PARENTHESIS", "@ICU_RECLASSIFIED_CLOSE_PARENTHESIS@", "e" );
82 +ToFile( "ICU_RECLASSIFIED_PREPEND_SET_EMPTY", "@ICU_RECLASSIFIED_PREPEND_SET_EMPTY@", "e" );
83 ToFile( "SYSTEM_GENBRK", "@SYSTEM_GENBRK@", "e" );
84 ToFile( "SYSTEM_GENCCODE", "@SYSTEM_GENCCODE@", "e" );
85 ToFile( "SYSTEM_GENCMN", "@SYSTEM_GENCMN@", "e" );
86 --
87 cgit v0.9.0.2-2-gbebe

  ViewVC Help
Powered by ViewVC 1.1.20