ICU update to 54.1 - step 5

patches/khmer-dictbe.patch

Index: patches/khmer-dictbe.patch
diff --git a/patches/khmer-dictbe.patch b/patches/khmer-dictbe.patch
index e95c708c4e986b7360838eb3c52a4689571047f3..ff3afc59d95877da8bbd88d1970ee9dbec53a3d4 100644
--- a/patches/khmer-dictbe.patch
+++ b/patches/khmer-dictbe.patch
@@ -1,18 +1,18 @@
-Index: source/common/dictbe.cpp
-===================================================================
---- source/common/dictbe.cpp	(revision 32063)
-+++ source/common/dictbe.cpp	(working copy)
-@@ -426,11 +426,11 @@
- #define KHMER_LOOKAHEAD 3
+diff --git a/source/common/dictbe.cpp b/source/common/dictbe.cpp
+index c5aa454..88e9139 100644
+--- a/source/common/dictbe.cpp
++++ b/source/common/dictbe.cpp
+@@ -832,11 +832,11 @@ foundBest:
+ static const int32_t KHMER_LOOKAHEAD = 3;
  
  // Will not combine a non-word with a preceding dictionary word longer than this
--#define KHMER_ROOT_COMBINE_THRESHOLD 3
-+#define KHMER_ROOT_COMBINE_THRESHOLD 10
+-static const int32_t KHMER_ROOT_COMBINE_THRESHOLD = 3;
++static const int32_t KHMER_ROOT_COMBINE_THRESHOLD = 10;
  
  // Will not combine a non-word that shares at least this much prefix with a
  // dictionary word, with a preceding word
--#define KHMER_PREFIX_COMBINE_THRESHOLD 3
-+#define KHMER_PREFIX_COMBINE_THRESHOLD 5
+-static const int32_t KHMER_PREFIX_COMBINE_THRESHOLD = 3;
++static const int32_t KHMER_PREFIX_COMBINE_THRESHOLD = 5;
  
  // Minimum word size
- #define KHMER_MIN_WORD 2
+ static const int32_t KHMER_MIN_WORD = 2;