office/gnucash: Updated for version 3.10.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 35 insertions, 13 deletions

diff --git a/office/gnucash/README b/office/gnucash/README
index f09d1bc8cb..b3aad497c4 100644
--- a/office/gnucash/README
+++ b/office/gnucash/README
@@ -9,16 +9,24 @@ on professional accounting principles to ensure balanced books and
 accurate reports.
 
 Pass OFX="yes" for OFX (USA) (requies libofx)
+
 Pass AQ="yes" to enable aqbanking (Germany) (requires aqbanking)
+
 Pass WITHPYTHON="yes" to enable Python bindings for report gereration.
 
 If you want the SQL database integration, you must first have libdbi
-and libdbi-drivers installed (with postgresql support), and then pass
-the DBI="yes" flag.
+and libdbi-drivers installed and pass DBI="yes" to the build script.
+
+The script now incudes an option to build with ninja.  To use this
+option, make sure ninja is installed and pass NINJA="yes" to the
+build script.
 
 NOTE:  You must remove any previous installation of Gnucash before
 running this script, otherwise the build will fail.
 
+If you are building on current (15.0 EXPERIMENTAL), you will need the
+guile2.2 package from Ponce's -current repo.
+
 This script builds version 3.x which is now considered stable by the
 upstream developers.  If you need the old stable 2.6.x series, please
 use gnucash-legacy, also available on SBo.
diff --git a/office/gnucash/gnucash.SlackBuild b/office/gnucash/gnucash.SlackBuild
index 973c487721..9113f8d68d 100644
--- a/office/gnucash/gnucash.SlackBuild
+++ b/office/gnucash/gnucash.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#! /bin/sh
 
 # Slackware build script for gnucash
 
 # Copyright 2015  Trayan Denev, tdenev@gmail.com
-# This version Copyright 2018 Lenard Spencer <lspencer31@cfl.rr.com>
+# This version Copyright 2018 Lenard Spencer <lenardrspencer@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gnucash
-VERSION=${VERSION:-3.9}
+VERSION=${VERSION:-3.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -70,7 +70,7 @@ if [ -e /usr/bin/gnucash ]; then
 fi
 
 if [ "$DBI" = "yes" ]; then
-  DBIARGS="-DWITH_SQL=ON -DGNC_DBD_DIR=/usr/lib${LIBDIRSUFFIX}/dbd/ "
+  DBIARGS="-DWITH_SQL=ON -DGNC_DBD_DIR=/usr/lib${LIBDIRSUFFIX}/dbd/ -DGENERATE_SWIG_WRAPPERS=ON "
   echo " building with SQL integration enabled"
   sleep 1
 else
@@ -101,6 +101,9 @@ else
   W_PYTHON="-DWITH_PYTHON=OFF"
 fi
 
+# New option to build with ninja:
+NINJA=${NINJA:-"no"}
+
 set -e
 
 rm -rf $PKG
@@ -116,6 +119,13 @@ 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 [ $NINJA = "yes" ]; then
+  echo "building using Ninja:"
+  NINJABUILD="-GNinja"
+else
+  NINJABUILD=""
+fi
+
   mkdir -p build
 cd build
   cmake \
@@ -125,16 +135,20 @@ cd build
     -DLIBDIR=/usr/lib${LIBDIRSUFFIX} \
     -DSYSCONFDIR=/etc \
     -DCOMPILE_GSCHEMAS=OFF \
-    -DCMAKE_HAVE_LIBC_PTHREAD=OFF \
     $DBIARGS \
     $W_PYTHON \
     $OFXBANKING \
     $AQBANKING \
-    -DGNUCASH_BUILD_ID="$VERSION by $PACKAGER" \
+    $NINJABUILD \
+    -DGNUCASH_BUILD_ID="$VERSION-`date -I` by $PACKAGER" \
     -DCMAKE_BUILD_TYPE=release ..
 
-make
-make -j1 install DESTDIR=$PKG docdir=/usr/doc/$PRGNAM-$VERSION
+if [ $NINJA = "yes" ]; then
+  DESTDIR="$PKG" ninja install
+else
+ make
+ make -j1 install DESTDIR=$PKG docdir=/usr/doc/$PRGNAM-$VERSION
+fi
 
 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
diff --git a/office/gnucash/gnucash.info b/office/gnucash/gnucash.info
index 458ec93299..e85b955407 100644
--- a/office/gnucash/gnucash.info
+++ b/office/gnucash/gnucash.info
@@ -1,8 +1,8 @@
 PRGNAM="gnucash"
-VERSION="3.9"
+VERSION="3.10"
 HOMEPAGE="http://www.gnucash.org/"
-DOWNLOAD="http://downloads.sourceforge.net/gnucash/gnucash-3.9.tar.bz2"
-MD5SUM="25b2a17777f25e943ab58bfe7c35867a"
+DOWNLOAD="http://downloads.sourceforge.net/gnucash/gnucash-3.10.tar.bz2"
+MD5SUM="866073e62625c092248f984150eba342"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="webkit2gtk pygobject3-python3 gtest"