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

[Andreas Radke]

    Date: Sunday, April 4, 2021 @ 20:17:03
  Author: andyrtr
Revision: 411505

upgpkg: libcdr 0.1.7-1: upstream update 0.1.7

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

-------------+
 PKGBUILD    |   15 ++++-----------
 icu68.patch |   17 -----------------
 2 files changed, 4 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-04 20:11:41 UTC (rev 411504)
+++ PKGBUILD	2021-04-04 20:17:03 UTC (rev 411505)
@@ -3,8 +3,8 @@
 # Contributor: Luca Bennati <lucak3 AT gmail DOT com>
 
 pkgname=libcdr
-pkgver=0.1.6
-pkgrel=3
+pkgver=0.1.7
+pkgrel=1
 pkgdesc="CorelDraw file format importer library for LibreOffice"
 arch=('x86_64')
 url="https://wiki.documentfoundation.org/DLP/Libraries/libcdr"
@@ -11,16 +11,9 @@
 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
-        icu68.patch)
-sha256sums=('01cd00b04a030977e544433c2d127c997205332cd9b8e35ec0ee17110da7f861'
-            'bd044f2d983d5a5ca513e7fcfde302d6ef3175f427e49b3fc7937167b6bbaacb')
+source=(https://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz)
+sha256sums=('5666249d613466b9aa1e987ea4109c04365866e9277d80f6cd9663e86b8ecdd4')
 
-prepare() {
-  cd $pkgname-$pkgver
-  patch -Np0 -i ../icu68.patch
-}
-
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr

Deleted: icu68.patch
===================================================================
--- icu68.patch	2021-04-04 20:11:41 UTC (rev 411504)
+++ icu68.patch	2021-04-04 20:17:03 UTC (rev 411505)
@@ -1,17 +0,0 @@
-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();