diff options
| -rw-r--r-- | libraries/libfreehand/0001-Add-missing-semicolon-to-fix-build-with-icu-65.1.patch | 28 | ||||
| -rw-r--r-- | libraries/libfreehand/libfreehand.SlackBuild | 15 |
2 files changed, 39 insertions, 4 deletions
diff --git a/libraries/libfreehand/0001-Add-missing-semicolon-to-fix-build-with-icu-65.1.patch b/libraries/libfreehand/0001-Add-missing-semicolon-to-fix-build-with-icu-65.1.patch new file mode 100644 index 0000000000000..5d9c6b2da9b99 --- /dev/null +++ b/libraries/libfreehand/0001-Add-missing-semicolon-to-fix-build-with-icu-65.1.patch @@ -0,0 +1,28 @@ +From af3197f795625f5188602073205a34369698b6df Mon Sep 17 00:00:00 2001 +From: Heiko Becker <heirecka@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@collabora.com> +Tested-by: Miklos Vajna <vmiklos@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 diff --git a/libraries/libfreehand/libfreehand.SlackBuild b/libraries/libfreehand/libfreehand.SlackBuild index 59c1ad8258466..a339698735791 100644 --- a/libraries/libfreehand/libfreehand.SlackBuild +++ b/libraries/libfreehand/libfreehand.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for libfreehand -# Copyright 2015, 2017 Hunter Sezen California, USA +# Copyright 2015, 2017, 2020 Hunter Sezen California, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=libfreehand VERSION=${VERSION:-0.1.2} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -39,6 +39,7 @@ CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} + if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" @@ -79,6 +80,12 @@ else cppunit='--disable-tests' fi +# Add missing semicolon to fix build with icu 65.1 +# https://gerrit.libreoffice.org/c/libfreehand/+/80224/ +patch -p1 < $CWD/0001-Add-missing-semicolon-to-fix-build-with-icu-65.1.patch + +autoreconf -fi + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -93,8 +100,8 @@ CXXFLAGS="$SLKCFLAGS" \ make make install DESTDIR=$PKG -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | + grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a AUTHORS COPYING ChangeLog NEWS $PKG/usr/doc/$PRGNAM-$VERSION |