Date: Saturday, December 19, 2020 @ 06:44:21 Author: foutrelis Revision: 404540
Fix build with ICU 68 (patch from FreeBSD) Added: libe-book/trunk/icu68.patch Modified: libe-book/trunk/PKGBUILD -------------+ PKGBUILD | 11 +++++++++-- icu68.patch | 20 ++++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-12-19 06:42:14 UTC (rev 404539) +++ PKGBUILD 2020-12-19 06:44:21 UTC (rev 404540) @@ -10,9 +10,16 @@ license=('LGPL2.1' 'MPL') depends=('librevenge' 'libxml2' 'liblangtag') makedepends=('gperf' 'boost' 'cppunit' 'doxygen') -source=(https://sourceforge.net/projects/${pkgname//-/}/files//${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.xz) -sha1sums=('18fde9588c236d51eea9437ed882d8b751daf01f') +source=(https://sourceforge.net/projects/${pkgname//-/}/files//${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.xz + icu68.patch) +sha1sums=('18fde9588c236d51eea9437ed882d8b751daf01f' + '132fd6bf8622f2d922a9e844c665a906d6b2bbdb') +prepare() { + cd "${pkgname}"-${pkgver} + patch -Np0 -i ../icu68.patch +} + build() { cd "${pkgname}"-${pkgver} ./configure --prefix=/usr Added: icu68.patch =================================================================== --- icu68.patch (rev 0) +++ icu68.patch 2020-12-19 06:44:21 UTC (rev 404540) @@ -0,0 +1,20 @@ +Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 + +EBOOKCharsetConverter.cpp:127:7: error: use of undeclared identifier 'TRUE' + TRUE, TRUE, &status) + ^ +EBOOKCharsetConverter.cpp:127:13: error: use of undeclared identifier 'TRUE' + TRUE, TRUE, &status) + ^ + +--- src/lib/EBOOKCharsetConverter.cpp.orig 2018-01-01 11:16:28 UTC ++++ src/lib/EBOOKCharsetConverter.cpp +@@ -124,7 +124,7 @@ bool EBOOKCharsetConverter::convertBytes(const char *c + m_converterToUTF8.get(), m_converterToUnicode.get(), + &outText, outText + out.size(), &inText, inText + length, + nullptr, nullptr, nullptr, nullptr, +- TRUE, TRUE, &status) ++ true, true, &status) + ; + if (status==U_BUFFER_OVERFLOW_ERROR) + {