[arch-commits] Commit in libcdr/repos/extra-x86_64 (PKGBUILD PKGBUILD icu68.patch)

[Andreas Radke]

    Date: Sunday, April 4, 2021 @ 20:17:09
  Author: andyrtr
Revision: 411506

archrelease: copy trunk to extra-x86_64

Added:
  libcdr/repos/extra-x86_64/PKGBUILD
    (from rev 411505, libcdr/trunk/PKGBUILD)
Deleted:
  libcdr/repos/extra-x86_64/PKGBUILD
  libcdr/repos/extra-x86_64/icu68.patch

-------------+
 PKGBUILD    |   69 ++++++++++++++++++++++++++--------------------------------
 icu68.patch |   17 --------------
 2 files changed, 31 insertions(+), 55 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-04 20:17:03 UTC (rev 411505)
+++ PKGBUILD	2021-04-04 20:17:09 UTC (rev 411506)
@@ -1,38 +0,0 @@
-# Maintainer: AndyRTR <andyrtr at archlinux.org>
-# Contributor: megadriver <megadriver at gmx dot com>
-# Contributor: Luca Bennati <lucak3 AT gmail DOT com>
-
-pkgname=libcdr
-pkgver=0.1.6
-pkgrel=3
-pkgdesc="CorelDraw file format importer library for LibreOffice"
-arch=('x86_64')
-url="https://wiki.documentfoundation.org/DLP/Libraries/libcdr"
-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')
-
-prepare() {
-  cd $pkgname-$pkgver
-  patch -Np0 -i ../icu68.patch
-}
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd $pkgname-$pkgver
-  make -k check
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}

Copied: libcdr/repos/extra-x86_64/PKGBUILD (from rev 411505, libcdr/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-04-04 20:17:09 UTC (rev 411506)
@@ -0,0 +1,31 @@
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+# Contributor: megadriver <megadriver at gmx dot com>
+# Contributor: Luca Bennati <lucak3 AT gmail DOT com>
+
+pkgname=libcdr
+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"
+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=('5666249d613466b9aa1e987ea4109c04365866e9277d80f6cd9663e86b8ecdd4')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr
+  make
+}
+
+check() {
+  cd $pkgname-$pkgver
+  make -k check
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}

Deleted: icu68.patch
===================================================================
--- icu68.patch	2021-04-04 20:17:03 UTC (rev 411505)
+++ icu68.patch	2021-04-04 20:17:09 UTC (rev 411506)
@@ -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();