[packages/libfreehand] fix build with icu 65
atler
atler at pld-linux.org
Mon May 11 17:15:55 CEST 2020
commit fe18e0211ab46abe88949941e7ec17bff97b3cdb
Author: Jan Palus <atler at pld-linux.org>
Date: Mon May 11 17:13:03 2020 +0200
fix build with icu 65
icu65.patch | 26 ++++++++++++++++++++++++++
libfreehand.spec | 2 ++
2 files changed, 28 insertions(+)
---
diff --git a/libfreehand.spec b/libfreehand.spec
index f13a4fc..f489c87 100644
--- a/libfreehand.spec
+++ b/libfreehand.spec
@@ -11,6 +11,7 @@ License: MPL v2.0
Group: Libraries
Source0: http://dev-www.libreoffice.org/src/libfreehand/%{name}-%{version}.tar.xz
# Source0-md5: c3788f5686839fd097bd77d8f51c3d04
+Patch0: icu65.patch
URL: http://www.freedesktop.org/wiki/Software/libfreehand/
BuildRequires: boost-devel
BuildRequires: doxygen
@@ -91,6 +92,7 @@ Aktualnie obsługiwane są SVG i format surowy.
%prep
%setup -q
+%patch0 -p1
%build
%configure \
diff --git a/icu65.patch b/icu65.patch
new file mode 100644
index 0000000..a246649
--- /dev/null
+++ b/icu65.patch
@@ -0,0 +1,26 @@
+From af3197f795625f5188602073205a34369698b6df Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka at 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 <vmiklos at collabora.com>
+Tested-by: Miklos Vajna <vmiklos at 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);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libfreehand.git/commitdiff/1d2dee6ed950ec95c9aca7aef4eba08ebb72410b
More information about the pld-cvs-commit
mailing list