summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libraries/libfreehand/README5
-rw-r--r--libraries/libfreehand/libfreehand.SlackBuild22
-rw-r--r--libraries/libfreehand/libfreehand.info6
3 files changed, 21 insertions, 12 deletions
diff --git a/libraries/libfreehand/README b/libraries/libfreehand/README
index d8fd7e4476..c39c5c7d01 100644
--- a/libraries/libfreehand/README
+++ b/libraries/libfreehand/README
@@ -2,4 +2,7 @@ Libfreehand is an import filter library for Aldus/Macromedia/Adobe
FreeHand files, based on librevenge. It is a part of the Document
Liberation Project.
-To build the doxygen html documentation use DOC="yes".
+cppunit is an optional dependency to build and run the unit tests.
+
+To build the doxygen html documentation use:
+ DOC="yes".
diff --git a/libraries/libfreehand/libfreehand.SlackBuild b/libraries/libfreehand/libfreehand.SlackBuild
index c553eb7aab..59c1ad8258 100644
--- a/libraries/libfreehand/libfreehand.SlackBuild
+++ b/libraries/libfreehand/libfreehand.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for libfreehand
-# Copyright 2015 Hunter Sezen California, USA
+# Copyright 2015, 2017 Hunter Sezen California, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=libfreehand
-VERSION=${VERSION:-0.1.1}
+VERSION=${VERSION:-0.1.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -53,7 +53,7 @@ else
LIBDIRSUFFIX=""
fi
-set -e
+set -eu
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
@@ -68,11 +68,15 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-DOC=${DOC:-no}
-if [ ! "$DOC" = "yes" ]; then
- doc="--without-docs"
+case "${DOC:-0}" in
+ 0) doc='--without-docs' ;;
+ *) doc='--with-docs' ;;
+esac
+
+if pkg-config --exists cppunit; then
+ cppunit='--enable-tests'
else
- doc=""
+ cppunit='--disable-tests'
fi
CFLAGS="$SLKCFLAGS" \
@@ -81,8 +85,10 @@ CXXFLAGS="$SLKCFLAGS" \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--docdir=/usr/doc/$PRGNAM-$VERSION \
+ --disable-static \
+ --disable-werror \
--build=$ARCH-slackware-linux \
- $doc
+ $cppunit $doc
make
make install DESTDIR=$PKG
diff --git a/libraries/libfreehand/libfreehand.info b/libraries/libfreehand/libfreehand.info
index 1c5378fd98..993f744e6d 100644
--- a/libraries/libfreehand/libfreehand.info
+++ b/libraries/libfreehand/libfreehand.info
@@ -1,8 +1,8 @@
PRGNAM="libfreehand"
-VERSION="0.1.1"
+VERSION="0.1.2"
HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libfreehand"
-DOWNLOAD="http://dev-www.libreoffice.org/src/libfreehand/libfreehand-0.1.1.tar.xz"
-MD5SUM="97eb6a8607de3c101ad05ceacc122107"
+DOWNLOAD="http://dev-www.libreoffice.org/src/libfreehand/libfreehand-0.1.2.tar.xz"
+MD5SUM="c3788f5686839fd097bd77d8f51c3d04"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""