icu68.patch

   1 From c0a0a85833cdcceb636dbe986f39a43ac40f839f Mon Sep 17 00:00:00 2001
   2 From: Lars Wendler <polynomial-c@gentoo.org>
   3 Date: Fri, 30 Oct 2020 15:04:44 +0100
   4 Subject: [PATCH] Fix build with icu-68.1
   5
   6 icu-68.1 removed public macro definitions for TRUE and FALSE
   7
   8 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
   9 ---
  10  src/LEFontInstance.cpp  | 2 +-
  11  src/LEGlyphStorage.cpp  | 2 +-
  12  src/LEInsertionList.cpp | 4 ++--
  13  3 files changed, 4 insertions(+), 4 deletions(-)
  14
  15 diff --git a/src/LEFontInstance.cpp b/src/LEFontInstance.cpp
  16 index e5595f2..89bc3ed 100644
  17 --- a/src/LEFontInstance.cpp
  18 +++ b/src/LEFontInstance.cpp
  19 @@ -79,7 +79,7 @@ void LEFontInstance::mapCharsToGlyphs(const LEUnicode chars[], le_int32 offset,
  20
  21  LEGlyphID LEFontInstance::mapCharToGlyph(LEUnicode32 ch, const LECharMapper *mapper) const
  22  {
  23 -    return mapCharToGlyph(ch, mapper, TRUE);
  24 +    return mapCharToGlyph(ch, mapper, true);
  25  }
  26
  27  LEGlyphID LEFontInstance::mapCharToGlyph(LEUnicode32 ch, const LECharMapper *mapper, le_bool filterZeroWidth) const
  28 diff --git a/src/LEGlyphStorage.cpp b/src/LEGlyphStorage.cpp
  29 index bac403a..b537676 100644
  30 --- a/src/LEGlyphStorage.cpp
  31 +++ b/src/LEGlyphStorage.cpp
  32 @@ -659,7 +659,7 @@ le_bool LEGlyphStorage::applyInsertion(le_int32 atPosition, le_int32 count, LEGl
  33      // just got replaced by the insertion
  34      fSrcIndex -= 1;
  35
  36 -    return FALSE;
  37 +    return false;
  38  }
  39
  40  U_NAMESPACE_END
  41 diff --git a/src/LEInsertionList.cpp b/src/LEInsertionList.cpp
  42 index c64b8a1..3e39952 100644
  43 --- a/src/LEInsertionList.cpp
  44 +++ b/src/LEInsertionList.cpp
  45 @@ -86,11 +86,11 @@ le_bool LEInsertionList::applyInsertions(LEInsertionCallback *callback)
  46  {
  47      for (InsertionRecord *rec = head; rec != NULL; rec = rec->next) {
  48          if (callback->applyInsertion(rec->position, rec->count, rec->glyphs)) {
  49 -            return TRUE;
  50 +            return true;
  51          }
  52      }
  53
  54 -    return FALSE;
  55 +    return false;
  56  }
  57
  58  U_NAMESPACE_END