Miroirs/slackbuilds_ponce
1
0
Fork 0
mirror of https://github.com/Ponce/slackbuilds synced 2024-11-22 19:44:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

libraries/libfreehand: Fix build on current.

Browse source 
Signed-off-by: orbea <orbea@riseup.net>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
orbea 2020-10-30 14:04:10 -07:00 committed by Willy Sudiarto Raharjo
parent 8649daa333
commit abe97d2ccd
No known key found for this signature in database
GPG key ID: 3F617144D7238786
2 changed files with 39 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
libraries/libfreehand/0001-Add-missing-semicolon-to-fix-build-with-icu-65.1.patch Normal file
View file

@ -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

15
libraries/libfreehand/libfreehand.SlackBuild
View file

@ -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