diff --git a/icu-68.patch b/icu-68.patch new file mode 100644 index 0000000..cfbafc6 --- /dev/null +++ b/icu-68.patch @@ -0,0 +1,27 @@ +From 0dc41f8f6bd099813acb3972f75e4bbb2a5cdb2d Mon Sep 17 00:00:00 2001 +From: Lars Wendler +Date: Fri, 30 Oct 2020 14:28:08 +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 +--- + src/lib/libcdr_utils.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/lib/libcdr_utils.cpp b/src/lib/libcdr_utils.cpp +index 09ab42e..250f0a0 100644 +--- a/src/lib/libcdr_utils.cpp ++++ b/src/lib/libcdr_utils.cpp +@@ -108,7 +108,7 @@ static unsigned short getEncoding(const unsigned char *buffer, unsigned bufferLe + csd = ucsdet_open(&status); + if (U_FAILURE(status) || !csd) + return 0; +- ucsdet_enableInputFilter(csd, TRUE); ++ ucsdet_enableInputFilter(csd, true); + ucsdet_setText(csd, (const char *)buffer, bufferLength, &status); + if (U_FAILURE(status)) + throw libcdr::EncodingException(); +-- +2.29.2 \ No newline at end of file diff --git a/libcdr.changes b/libcdr.changes index 1eed410..c7cd996 100644 --- a/libcdr.changes +++ b/libcdr.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 14 16:15:35 UTC 2020 - Callum Farmer + +- Add icu-68.patch: fix build with ICU 68 + ------------------------------------------------------------------- Sun Feb 2 20:22:58 UTC 2020 - Fridrich Strba diff --git a/libcdr.spec b/libcdr.spec index 2d5a8bc..9f27191 100644 --- a/libcdr.spec +++ b/libcdr.spec @@ -26,6 +26,7 @@ Group: Productivity/Publishing/Word URL: http://www.freedesktop.org/wiki/Software/libcdr Source0: http://dev-www.libreoffice.org/src/%{name}/%{name}-%{version}.tar.xz Patch0: libcdr-0.1.1-pkgconfig.patch +Patch1: icu-68.patch BuildRequires: doxygen BuildRequires: fdupes BuildRequires: gcc-c++ @@ -82,6 +83,7 @@ Tools to work with documents in Corel Draw file format. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build export CXXFLAGS="%{optflags} -fvisibility-inlines-hidden"