Date: Tuesday, May 19, 2020 @ 04:39:50
Author: allan
Revision: 386020
upgpkg: libfreehand 0.1.2-3: FTBFS fix
Added:
libfreehand/trunk/libfreehand-0.1.2-icu-fix.patch
Modified:
libfreehand/trunk/PKGBUILD
---------------------------------+
PKGBUILD | 13 ++++++++++---
libfreehand-0.1.2-icu-fix.patch | 29 +++++++++++++++++++++++++++++
2 files changed, 39 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-05-19 01:33:14 UTC (rev 386019)
+++ PKGBUILD 2020-05-19 04:39:50 UTC (rev 386020)
@@ -2,7 +2,7 @@
pkgname=libfreehand
pkgver=0.1.2
-pkgrel=2
+pkgrel=3
pkgdesc="a library for import of Aldus/Macromedia/Adobe FreeHand documents"
arch=('x86_64')
url="https://wiki.documentfoundation.org/DLP/Libraries/libfreehand";
@@ -9,9 +9,16 @@
license=('MPL2')
depends=('librevenge' 'lcms2')
makedepends=('boost' 'cppunit' 'gperf' 'doxygen')
-source=("https://dev-www.libreoffice.org/src/libfreehand/$pkgname-$pkgver.tar.xz";)
-sha256sums=('0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac')
+source=("https://dev-www.libreoffice.org/src/libfreehand/$pkgname-$pkgver.tar.xz";
+ 'libfreehand-0.1.2-icu-fix.patch')
+sha256sums=('0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac'
+ '11b5b5fcbb4f427486e83ee042cd3f2b030bcf8238f5d1925942416067d0254b')
+prepare() {
+ cd "$pkgname-$pkgver"
+ patch -p1 -i $srcdir/libfreehand-0.1.2-icu-fix.patch
+}
+
build() {
cd "$pkgname-$pkgver"
./configure --prefix=/usr --disable-werror
Added: libfreehand-0.1.2-icu-fix.patch
===================================================================
--- libfreehand-0.1.2-icu-fix.patch (rev 0)
+++ libfreehand-0.1.2-icu-fix.patch 2020-05-19 04:39:50 UTC (rev 386020)
@@ -0,0 +1,29 @@
+From af3197f795625f5188602073205a34369698b6df Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heire...@exherbo.org>
+Date: Fri, 4 Oct 2019 01:46:12 +0200
+Subject: [PATCH] Add missing semicolon to fix build with icu 65.1
+
+Change-Id: I7a0b0d600e9f7770245a7485813a944bfac4f088
+Reviewed-on: https://gerrit.libreoffice.org/80224
+Reviewed-by: Miklos Vajna <vmik...@collabora.com>
+Tested-by: Miklos Vajna <vmik...@collabora.com>
+---
+ src/lib/libfreehand_utils.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib/libfreehand_utils.cpp b/src/lib/libfreehand_utils.cpp
+index 439c457..32f23e0 100644
+--- a/src/lib/libfreehand_utils.cpp
++++ b/src/lib/libfreehand_utils.cpp
+@@ -162,7 +162,7 @@ void libfreehand::_appendUTF16(librevenge::RVNGString
&text, std::vector<unsigne
+ while (j < length)
+ {
+ UChar32 c;
+- U16_NEXT(s, j, length, c)
++ U16_NEXT(s, j, length, c);
+ unsigned char outbuf[U8_MAX_LENGTH+1];
+ int i = 0;
+ U8_APPEND_UNSAFE(&outbuf[0], i, c);
+--
+2.23.0
+
