From a80a153ac54c57b04f9a86f7eb3087d0db245c6e Mon Sep 17 00:00:00 2001
From: Hunter Sezen
Date: Wed, 16 Aug 2017 21:41:47 +0100
Subject: libraries/libcmis: Updated for version 0.5.1.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 libraries/libcmis/configure.patch.gz         | Bin 0 -> 469 bytes
 libraries/libcmis/libcmis-boost-gcc.patch.gz | Bin 770 -> 0 bytes
 libraries/libcmis/libcmis.SlackBuild         |  35 +++++++++++++++------------
 libraries/libcmis/libcmis.info               |   6 ++---
 4 files changed, 22 insertions(+), 19 deletions(-)
 create mode 100644 libraries/libcmis/configure.patch.gz
 delete mode 100644 libraries/libcmis/libcmis-boost-gcc.patch.gz

(limited to 'libraries')

diff --git a/libraries/libcmis/configure.patch.gz b/libraries/libcmis/configure.patch.gz
new file mode 100644
index 0000000000..4b5fb4e023
Binary files /dev/null and b/libraries/libcmis/configure.patch.gz differ
diff --git a/libraries/libcmis/libcmis-boost-gcc.patch.gz b/libraries/libcmis/libcmis-boost-gcc.patch.gz
deleted file mode 100644
index f7468a7b29..0000000000
Binary files a/libraries/libcmis/libcmis-boost-gcc.patch.gz and /dev/null differ
diff --git a/libraries/libcmis/libcmis.SlackBuild b/libraries/libcmis/libcmis.SlackBuild
index 128eaea984..cf9049721e 100644
--- a/libraries/libcmis/libcmis.SlackBuild
+++ b/libraries/libcmis/libcmis.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Libcmis
 
-# 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,13 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libcmis
-VERSION=${VERSION:-0.5.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.5.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -54,13 +54,13 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e
+set -eu
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -69,15 +69,17 @@ 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 {} \;
 
-if pkg-config --exists cppunit; then cppunit=""; else cppunit="--disable-tests"; fi
+if pkg-config --exists cppunit; then
+  cppunit='--enable-tests'
+else
+  cppunit='--disable-tests'
+fi
 
-# https://github.com/pld-linux/libcmis/blob/master/libcmis-boost-gcc.patch
-# Needed for compiling on current
-zcat $CWD/libcmis-boost-gcc.patch.gz | patch -p1
+# libcmis is not a GNU-conformant project
+# https://github.com/tdf/libcmis/commit/ad89848c93d9357992f6d7d9a5b1e602f25e930c
+zcat $CWD/configure.patch.gz | patch -p1
 
-# generate the configure file
-sed '/configure/d' -i autogen.sh
-./autogen.sh
+autoreconf -fi
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -86,6 +88,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --with-boost=/usr/include \
   --disable-static \
+  --disable-werror \
   --build=$ARCH-slackware-linux \
   $cppunit
 
@@ -99,7 +102,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING* NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING* NEWS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/libcmis/libcmis.info b/libraries/libcmis/libcmis.info
index 40b332077e..870a187267 100644
--- a/libraries/libcmis/libcmis.info
+++ b/libraries/libcmis/libcmis.info
@@ -1,8 +1,8 @@
 PRGNAM="libcmis"
-VERSION="0.5.0"
+VERSION="0.5.1"
 HOMEPAGE="https://github.com/tdf/libcmis"
-DOWNLOAD="https://github.com/tdf/libcmis/archive/v0.5.0.tar.gz"
-MD5SUM="c4ee5bc26b0443769b9761bd3ebb6f03"
+DOWNLOAD="https://github.com/tdf/libcmis/archive/v0.5.1/libcmis-0.5.1.tar.gz"
+MD5SUM="f2ab78348ee5b855fe7884b76f3d8098"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3