Remove another workaround for old versions of ICU

Change-Id: Id13bdb10bf4bf89a136b28a26c4b3d1113971871
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153388
Tested-by: Jenkins
Reviewed-by: خالد حسني <khaled@libreoffice.org>

2 files changed, 3 insertions, 29 deletions

diff --git a/i18npool/CustomTarget_breakiterator.mk b/i18npool/CustomTarget_breakiterator.mk
index e4c87238bdd1..26647da8e4df 100644
--- a/i18npool/CustomTarget_breakiterator.mk
+++ b/i18npool/CustomTarget_breakiterator.mk
@@ -84,7 +84,8 @@ $(i18npool_BIDIR)/%_brk.c : $(i18npool_BIDIR)/%.brk $(call gb_ExternalExecutable
 			$(if $(findstring s,$(MAKEFLAGS)),> /dev/null))
 	$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),CCD)
 
-$(i18npool_BIDIR)/%.brk : $(i18npool_BIDIR)/%.txt $(call gb_ExternalExecutable_get_dependencies,genbrk)
+$(i18npool_BIDIR)/%.brk : $(SRCDIR)/i18npool/source/breakiterator/data/%.txt \
+		$(call gb_ExternalExecutable_get_dependencies,genbrk)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),BRK,1)
 	$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),BRK)
 	$(call gb_Helper_abbreviate_dirs,\
@@ -93,31 +94,4 @@ $(i18npool_BIDIR)/%.brk : $(i18npool_BIDIR)/%.txt $(call gb_ExternalExecutable_g
 		-r $< -o $@ $(if $(findstring s,$(MAKEFLAGS)),> /dev/null))
 	$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),BRK)
 
-# fdo#31271 ")" reclassified in more recent Unicode Standards / ICU 4.4
-# * Prepend set empty as of Unicode Version 6.1 / ICU 49, which bails out if used.
-#   NOTE: strips every line with _word_ 'Prepend', including $Prepend
-# * Conditional_Japanese_Starter does not exist in ICU < 49, which bail out if used.
-# * Hebrew_Letter does not exist in ICU < 49, which bail out if used.
-#   NOTE: I sincerely hope there is a better way to avoid problems than this abominable
-#   sed substitution...
-$(i18npool_BIDIR)/%.txt : \
-	$(SRCDIR)/i18npool/source/breakiterator/data/%.txt | $(i18npool_BIDIR)/.dir
-	sed -e "s#\[:LineBreak =  Close_Punctuation:\]#\[& \[:LineBreak = Close_Parenthesis:\]\]#" \
-		$(if $(ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER),,\
-			-e '/\[:LineBreak =  Conditional_Japanese_Starter:\]/d' \
-			-e 's# $$CJ##' \
-		) \
-		$(if $(ICU_RECLASSIFIED_HEBREW_LETTER),,\
-			-e '/\[:LineBreak =  Hebrew_Letter:\]/d' \
-			-e '/^$$HLcm =/d' \
-			-e '/^$$HLcm $$NUcm;/d' \
-			-e '/^$$NUcm $$HLcm;/d' \
-			-e '/^$$HL $$CM+;/d' \
-			-e 's# | $$HL\(cm\)\?##g' \
-			-e 's#$$HLcm ##g' \
-			-e 's# $$HL##g' \
-		) \
-		$(if $(ICU_RECLASSIFIED_PREPEND_SET_EMPTY),-e "/Prepend/d") \
-		$< > $@
-
 # vim: set noet sw=4 ts=4:
diff --git a/i18npool/source/breakiterator/data/line.txt b/i18npool/source/breakiterator/data/line.txt
index 9521c833fe74..ff3f3eafc42e 100644
--- a/i18npool/source/breakiterator/data/line.txt
+++ b/i18npool/source/breakiterator/data/line.txt
@@ -62,7 +62,7 @@ $BK = [:LineBreak =  Mandatory_Break:];
 $B2 = [:LineBreak =  Break_Both:];
 $CB = [:LineBreak =  Contingent_Break:];
 $CJ = [:LineBreak =  Conditional_Japanese_Starter:];
-$CL = [:LineBreak =  Close_Punctuation:] ;
+$CL = [[:LineBreak =  Close_Punctuation:] [:LineBreak = Close_Parenthesis:]]; # tdf#31271
 $CM = [:LineBreak =  Combining_Mark:];
 $CR = [:LineBreak =  Carriage_Return:];
 $EX = [:LineBreak =  Exclamation:];