From b59427aaeacdac925e1f5314b9cf626cd9c5837c Mon Sep 17 00:00:00 2001
From: Lenard Spencer <lspencer31@cfl.rr.com>
Date: Sun, 8 Apr 2018 14:39:36 +0100
Subject: office/gnucash: Updated for version 2.6.20.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 office/gnucash/gnucash.SlackBuild | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

(limited to 'office/gnucash/gnucash.SlackBuild')

diff --git a/office/gnucash/gnucash.SlackBuild b/office/gnucash/gnucash.SlackBuild
index d9b2f2e6a748..1d2fbb8a8c7a 100644
--- a/office/gnucash/gnucash.SlackBuild
+++ b/office/gnucash/gnucash.SlackBuild
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gnucash
-VERSION=${VERSION:-2.6.19}
+VERSION=${VERSION:-2.6.20}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -61,10 +61,16 @@ else
   LIBDIRSUFFIX=""
 fi
 
+# First, make sure a previous Gnucash installation is removed:
+if [ -e /usr/bin/gnucash ]; then
+  echo "A previous Gnucash installation has been found."
+  echo "Please remove it before running this script."
+  exit 1
+fi
+
 if [ "$DBI" = "yes" ]; then
   DBIARGS="--enable-dbi --with-dbi-dbd-dir=/usr/lib${LIBDIRSUFFIX}/dbd/ "
   echo " building with dbi enabled"
-  sleep 1
 else
   DBIARGS="--disable-dbi "
 fi
@@ -72,7 +78,6 @@ fi
 if [ "$OFX" = "yes" ]; then
   OFXBANKING="--enable-ofx"
   echo " building with OFX enabled"
-  sleep 1
 else
   OFXBANKING="--disable-ofx"
 fi
@@ -80,11 +85,17 @@ fi
 if [ "$AQ" = "yes" ]; then
   AQBANKING="--enable-aqbanking"
   echo " building with aqbanking enabled"
-  sleep 1
 else
   AQBANKING="--disable-aqbanking"
 fi
 
+if [ "$WITH_PYTHON" = "yes" ]; then
+  W_PYTHON="--enable-python"
+  echo " building with Python bindings enabled"
+else
+  W_PYTHON="--disable-python"
+fi
+
 set -e
 
 # First, make sure a previous Gnucash installation is removed:
@@ -94,13 +105,18 @@ if [ -e /usr/bin/gnucash ]; then
   exit 1
 fi
 
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
+
+# Restore missing .py files lost from 2.6.19 to 2.6.20:
+if [ "$WITH_PYTHON" = "yes" ]; then
+  cp -nv $CWD/missing-py/* src/optional/python-bindings
+fi
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -118,7 +134,8 @@ CXXFLAGS="$SLKCFLAGS" \
   --infodir=/usr/info \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --enable-python \
+  --enable-register2 \
+  $W_PYTHON \
   $OFXBANKING \
   $AQBANKING \
   --disable-schemas-compile \
@@ -151,4 +168,3 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
-
-- 
cgit v1.2.3