commit 943fab2de36b15f12a5ecdfad89cb79fbdcd6329
Author: Jan Palus <[email protected]>
Date: Mon Aug 16 20:45:47 2021 +0200
upstream patch for fixing build with icu >= 68
icu-le-hb.spec | 2 ++
icu68.patch | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 60 insertions(+)
---
diff --git a/icu-le-hb.spec b/icu-le-hb.spec
index fca1cca..cc1527c 100644
--- a/icu-le-hb.spec
+++ b/icu-le-hb.spec
@@ -12,6 +12,7 @@ Group: Libraries
Source0:
http://www.freedesktop.org/software/harfbuzz/release/%{name}-%{version}.tar.gz
# Source0-md5: e9b6ad05e19597bb90d1aa087c149b23
Patch0: %{name}-link.patch
+Patch1: icu68.patch
URL: http://www.freedesktop.org/wiki/HarfBuzz
BuildRequires: autoconf >= 2.56
BuildRequires: automake >= 1:1.9
@@ -66,6 +67,7 @@ Statyczna biblioteka icu-le-hb.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
%{__libtoolize}
diff --git a/icu68.patch b/icu68.patch
new file mode 100644
index 0000000..9aa6958
--- /dev/null
+++ b/icu68.patch
@@ -0,0 +1,58 @@
+From c0a0a85833cdcceb636dbe986f39a43ac40f839f Mon Sep 17 00:00:00 2001
+From: Lars Wendler <[email protected]>
+Date: Fri, 30 Oct 2020 15:04:44 +0100
+Subject: [PATCH] Fix build with icu-68.1
+
+icu-68.1 removed public macro definitions for TRUE and FALSE
+
+Signed-off-by: Lars Wendler <[email protected]>
+---
+ src/LEFontInstance.cpp | 2 +-
+ src/LEGlyphStorage.cpp | 2 +-
+ src/LEInsertionList.cpp | 4 ++--
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/LEFontInstance.cpp b/src/LEFontInstance.cpp
+index e5595f2..89bc3ed 100644
+--- a/src/LEFontInstance.cpp
++++ b/src/LEFontInstance.cpp
+@@ -79,7 +79,7 @@ void LEFontInstance::mapCharsToGlyphs(const LEUnicode
chars[], le_int32 offset,
+
+ LEGlyphID LEFontInstance::mapCharToGlyph(LEUnicode32 ch, const LECharMapper
*mapper) const
+ {
+- return mapCharToGlyph(ch, mapper, TRUE);
++ return mapCharToGlyph(ch, mapper, true);
+ }
+
+ LEGlyphID LEFontInstance::mapCharToGlyph(LEUnicode32 ch, const LECharMapper
*mapper, le_bool filterZeroWidth) const
+diff --git a/src/LEGlyphStorage.cpp b/src/LEGlyphStorage.cpp
+index bac403a..b537676 100644
+--- a/src/LEGlyphStorage.cpp
++++ b/src/LEGlyphStorage.cpp
+@@ -659,7 +659,7 @@ le_bool LEGlyphStorage::applyInsertion(le_int32
atPosition, le_int32 count, LEGl
+ // just got replaced by the insertion
+ fSrcIndex -= 1;
+
+- return FALSE;
++ return false;
+ }
+
+ U_NAMESPACE_END
+diff --git a/src/LEInsertionList.cpp b/src/LEInsertionList.cpp
+index c64b8a1..3e39952 100644
+--- a/src/LEInsertionList.cpp
++++ b/src/LEInsertionList.cpp
+@@ -86,11 +86,11 @@ le_bool
LEInsertionList::applyInsertions(LEInsertionCallback *callback)
+ {
+ for (InsertionRecord *rec = head; rec != NULL; rec = rec->next) {
+ if (callback->applyInsertion(rec->position, rec->count, rec->glyphs))
{
+- return TRUE;
++ return true;
+ }
+ }
+
+- return FALSE;
++ return false;
+ }
+
+ U_NAMESPACE_END
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/icu-le-hb.git/commitdiff/943fab2de36b15f12a5ecdfad89cb79fbdcd6329
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
