kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Import fix from upstream to deal with ICU 58. From FreeBSD.

Browse source
This commit is contained in:
pgoyette 2016-12-05 04:15:23 +00:00
parent 02fef5bcc7
commit a66641a037
1 changed files with 43 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
misc/libreoffice/patches/patch-i18npool_source_breakiterator_breakiterator__unicode.cxx Normal file
View file

@ -0,0 +1,43 @@
$NetBSD: patch-i18npool_source_breakiterator_breakiterator__unicode.cxx,v 1.1 2016/12/05 04:15:23 pgoyette Exp $
Unbreak build break caused by icu 58 (from FreeBSD)
--- i18npool/source/breakiterator/breakiterator_unicode.cxx.orig 2016-05-04 21:28:24 UTC
+++ i18npool/source/breakiterator/breakiterator_unicode.cxx
@@ -64,10 +64,13 @@ BreakIterator_Unicode::~BreakIterator_Un
class OOoRuleBasedBreakIterator : public RuleBasedBreakIterator
{
public:
+#if (U_ICU_VERSION_MAJOR_NUM < 58)
+ // RuleBasedBreakIterator::setBreakType() is private as of ICU 58.
inline void publicSetBreakType(int32_t type)
{
setBreakType(type);
};
+#endif
OOoRuleBasedBreakIterator(UDataMemory* image,
UErrorCode &status)
: RuleBasedBreakIterator(image, status)
@@ -143,12 +146,21 @@ void SAL_CALL BreakIterator_Unicode::loa
}
}
if (rbi) {
+#if (U_ICU_VERSION_MAJOR_NUM < 58)
+ // ICU 58 made RuleBasedBreakIterator::setBreakType() private
+ // instead of protected, so the old workaround of
+ // https://ssl.icu-project.org/trac/ticket/5498
+ // doesn't work anymore. However, they also claim to have fixed
+ // the cause that an initial fBreakType==-1 would lead to an
+ // endless loop under some circumstances.
+ // Let's see ...
switch (rBreakType) {
case LOAD_CHARACTER_BREAKITERATOR: rbi->publicSetBreakType(UBRK_CHARACTER); break;
case LOAD_WORD_BREAKITERATOR: rbi->publicSetBreakType(UBRK_WORD); break;
case LOAD_SENTENCE_BREAKITERATOR: rbi->publicSetBreakType(UBRK_SENTENCE); break;
case LOAD_LINE_BREAKITERATOR: rbi->publicSetBreakType(UBRK_LINE); break;
}
+#endif
icuBI->aBreakIterator = rbi;
}
}