From 50a8776beddf80255d19c07b7a9fbda1f13f9d95 Mon Sep 17 00:00:00 2001
From: Hunter Sezen <ovariegata@yahoo.com>
Date: Tue, 19 Dec 2017 21:33:18 +0000
Subject: libraries/libcdr: Updated for version 0.1.4.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 libraries/libcdr/README            |  2 ++
 libraries/libcdr/libcdr.SlackBuild | 19 ++++++++++++-------
 libraries/libcdr/libcdr.info       |  8 ++++----
 3 files changed, 18 insertions(+), 11 deletions(-)

(limited to 'libraries/libcdr')

diff --git a/libraries/libcdr/README b/libraries/libcdr/README
index f45595f5a9..2f20a5c53c 100644
--- a/libraries/libcdr/README
+++ b/libraries/libcdr/README
@@ -2,4 +2,6 @@ Libcdr is an import filter library for CorelDRAW files, based on
 librevenge. It can import files of all CorelDRAW versions. The
 library is a part of the Document Liberation Project.
 
+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/libcdr/libcdr.SlackBuild b/libraries/libcdr/libcdr.SlackBuild
index 845275c243..0a70ecaaed 100644
--- a/libraries/libcdr/libcdr.SlackBuild
+++ b/libraries/libcdr/libcdr.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libcdr
-VERSION=${VERSION:-0.1.3}
+VERSION=${VERSION:-0.1.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -54,7 +54,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e
+set -eu
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -69,11 +69,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" \
@@ -82,8 +86,9 @@ CXXFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-werror \
   --build=$ARCH-slackware-linux \
-  $doc
+  $cppunit $doc
 
 make
 make install DESTDIR=$PKG
diff --git a/libraries/libcdr/libcdr.info b/libraries/libcdr/libcdr.info
index 6490e78b12..091d9cd312 100644
--- a/libraries/libcdr/libcdr.info
+++ b/libraries/libcdr/libcdr.info
@@ -1,10 +1,10 @@
 PRGNAM="libcdr"
-VERSION="0.1.3"
+VERSION="0.1.4"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libcdr"
-DOWNLOAD="http://dev-www.libreoffice.org/src/libcdr/libcdr-0.1.3.tar.xz"
-MD5SUM="74589ce5bb944974f4308906d9e9dc5c"
+DOWNLOAD="http://dev-www.libreoffice.org/src/libcdr/libcdr-0.1.4.tar.xz"
+MD5SUM="4e52342983d798ae584e26bdf7a5f18a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="cppunit"
+REQUIRES=""
 MAINTAINER="Hunter Sezen"
 EMAIL="ovariegata@yahoo.com"
-- 
cgit v1.2.3-65-gdbad