From 79a3c9b186534c5e3adde2266d3e7fd6527b11b9 Mon Sep 17 00:00:00 2001
From: Eike Rathke <erack@redhat.com>
Date: Wed, 2 Jan 2013 19:03:51 +0100
Subject: partly revert 92a9b7780c6e13a4da3b12794342edbc4c09ef51 for ICU < 49

Re-enable build with ICU 4.6 and 4.8
ICU versions prior to 49 don't know Conditional_Japanese_Starter and
Hebrew_Letter

Also, the change in i18npool/CustomTarget_breakiterator.mk

- -e "s#\[:LineBreak = Close_Punctuation:\]#\[& \[:LineBreak = Close_Parenthesis:\]\]#" \

with i18npool/source/breakiterator/data/line.txt

-$CL = [:LineBreak = Close_Punctuation:] ;
+$CL = [:LineBreak = Close_Parenthesis:];

did not produce equivalent results. Instead use

$CP = [:LineBreak =  Close_Parenthesis:];
$CL = [[:LineBreak =  Close_Punctuation:] $CP];

Change-Id: I14fc14319ea34f23393264560452a79bb49fc3a7
---
 i18npool/qa/cppunit/test_breakiterator.cxx | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'i18npool/qa')

diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx b/i18npool/qa/cppunit/test_breakiterator.cxx
index 26e24397ed81..fa8dd56801ca 100644
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -74,7 +74,9 @@ public:
 #endif
 
     CPPUNIT_TEST(testWordBoundaries);
+#if (U_ICU_VERSION_MAJOR_NUM > 4)
     CPPUNIT_TEST(testKhmer);
+#endif
     CPPUNIT_TEST(testJapanese);
     CPPUNIT_TEST_SUITE_END();
 private:
@@ -865,6 +867,10 @@ void TestBreakIterator::testNorthernThai()
 }
 #endif
 
+#if (U_ICU_VERSION_MAJOR_NUM > 4)
+// Not sure if any version earlier than 49 did have Khmer word boundary
+// dictionaries, 4.6 does not.
+
 //A test to ensure that our khmer word boundary detection is useful
 //https://bugs.freedesktop.org/show_bug.cgi?id=52020
 void TestBreakIterator::testKhmer()
@@ -886,6 +892,7 @@ void TestBreakIterator::testKhmer()
 
     CPPUNIT_ASSERT(aBounds.startPos == 3 && aBounds.endPos == 5);
 }
+#endif
 
 void TestBreakIterator::testJapanese()
 {
-- 
cgit