[arch-commits] Commit in libcdr/trunk (PKGBUILD icu68.patch)

[Evangelos Foutras]

    Date: Saturday, December 19, 2020 @ 06:47:09
  Author: foutrelis
Revision: 404543

Fix build with ICU 68 (patch from FreeBSD)

Added:
  libcdr/trunk/icu68.patch
Modified:
  libcdr/trunk/PKGBUILD

-------------+
 PKGBUILD    |   11 +++++++++--
 icu68.patch |   17 +++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-12-19 06:45:38 UTC (rev 404542)
+++ PKGBUILD	2020-12-19 06:47:09 UTC (rev 404543)
@@ -11,9 +11,16 @@
 license=('GPL2' 'LGPL2.1' 'MPL')
 depends=('libwpd' 'lcms2' 'icu' 'librevenge')
 makedepends=('libwpg' 'boost' 'doxygen' 'cppunit')
-source=(https://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('01cd00b04a030977e544433c2d127c997205332cd9b8e35ec0ee17110da7f861')
+source=(https://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz
+        icu68.patch)
+sha256sums=('01cd00b04a030977e544433c2d127c997205332cd9b8e35ec0ee17110da7f861'
+            'bd044f2d983d5a5ca513e7fcfde302d6ef3175f427e49b3fc7937167b6bbaacb')
 
+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:47:09 UTC (rev 404543)
@@ -0,0 +1,17 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+libcdr_utils.cpp:111:35: error: use of undeclared identifier 'TRUE'
+    ucsdet_enableInputFilter(csd, TRUE);
+                                  ^
+
+--- src/lib/libcdr_utils.cpp.orig	2020-02-02 15:30:44 UTC
++++ src/lib/libcdr_utils.cpp
+@@ -108,7 +108,7 @@ static unsigned short getEncoding(const unsigned char 
+     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();