4 files changed, 49 insertions, 42 deletions
diff --git a/office/gnucash/README b/office/gnucash/README
index a54d230648d3b..01ceda48064a1 100644
--- a/office/gnucash/README
+++ b/office/gnucash/README
@@ -8,12 +8,20 @@ As quick and intuitive to use as a checkbook register, it is based
 on professional accounting principles to ensure balanced books and
 accurate reports.
 
+The dependencies webkitgtk, goffice0.8 and libgnomecanvas have been
+dropped, with webkit2gtk, python3, and gtest being the new dependencies.
+
 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 generation
+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, and then pass the DBI="yes" flag.
+and libdbi-drivers installed (with postgresql support), and then pass
+the DBI="yes" flag.
 
 NOTE:  You must remove any previous installation of Gnucash before
-running this script, otherwise the build will fail.
+running this script, otherwise the build will fail. 
+
+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/doinst.sh b/office/gnucash/doinst.sh
index ea328e01fb26a..937d628308e47 100644
--- a/office/gnucash/doinst.sh
+++ b/office/gnucash/doinst.sh
@@ -12,8 +12,7 @@ config() {
 }
 
 config etc/gnucash/environment.new
-config etc/gnucash/config.new
-
+c
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
diff --git a/office/gnucash/gnucash.SlackBuild b/office/gnucash/gnucash.SlackBuild
index 1745e45414843..71687dc9d30df 100644
--- a/office/gnucash/gnucash.SlackBuild
+++ b/office/gnucash/gnucash.SlackBuild
@@ -24,8 +24,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gnucash
-VERSION=${VERSION:-2.6.21}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-3.2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -69,46 +69,46 @@ if [ -e /usr/bin/gnucash ]; then
 fi
 
 if [ "$DBI" = "yes" ]; then
-  DBIARGS="--enable-dbi --with-dbi-dbd-dir=/usr/lib${LIBDIRSUFFIX}/dbd/ "
+  DBIARGS="-DWITH_SQL=ON -DGNC_DBD_DIR=/usr/lib${LIBDIRSUFFIX}/dbd/ "
   echo " building with dbi enabled"
   sleep 1
 else
-  DBIARGS="--disable-dbi "
+  DBIARGS="-DWITH_SQL=OFF "
 fi
 
 if [ "$OFX" = "yes" ]; then
-  OFXBANKING="--enable-ofx"
+  OFXBANKING="DWITH_OFX=ON"
   echo " building with OFX enabled"
   sleep 1
 else
-  OFXBANKING="--disable-ofx"
+  OFXBANKING="-DWITH_OFX=OFF"
 fi
 
 if [ "$AQ" = "yes" ]; then
-  AQBANKING="--enable-aqbanking"
+  AQBANKING="-DWITH_AQBANKING=ON"
   echo " building with aqbanking enabled"
   sleep 1
 else
-  AQBANKING="--disable-aqbanking"
+  AQBANKING="-DWITH_AQBANKING=OFF"
 fi
 
-if [ "$WITHPYTHON" = "yes" ]; then
-  W_PYTHON="--enable-python"
+if [ "${WITHPYTHON}" = "yes" ]; then
+  W_PYTHON="-DWITH_PYTHON=ON"
   echo " building with Python bindings enabled"
   sleep 1
 else
-  W_PYTHON="--disable-python"
+  W_PYTHON="-DWITH_PYTHON=OFF"
 fi
 
 set -e
 
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
-
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -116,25 +116,24 @@ 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 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --infodir=/usr/info \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  $W_PYTHON \
-  $OFXBANKING \
-  $AQBANKING \
-  --disable-schemas-compile \
-  $DBIARGS \
-  --build=$ARCH-slackware-linux
-
-# --enable-register2 \ still not ready for prime time
-
+  mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIBDIR=/usr/lib${LIBDIRSUFFIX} \
+    -DSYSCONFDIR=/etc \
+    -DLOCALSTATEDIR=/var \
+    -DDOCDIR=/usr/doc/$PRGNAM-$VERSION \
+    -DINFODIR=/usr/info \
+    -DCOMPILE_GSCHEMAS=OFF \
+    -DMANDIR=/usr/man \
+    $DBIARGS \
+    $W_PYTHON \
+    $OFXBANKING \
+    $AQBANKING \
+    -DCMAKE_BUILD_TYPE=release ..
 
 make
 make -j1 install DESTDIR=$PKG docdir=/usr/doc/$PRGNAM-$VERSION
@@ -142,16 +141,16 @@ make -j1 install DESTDIR=$PKG docdir=/usr/doc/$PRGNAM-$VERSION
 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
 
+mv $PKG/usr/share/man/ $PKG/usr/
 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
 
 # Don't clobber these
 mv $PKG/etc/gnucash/environment $PKG/etc/gnucash/environment.new
-mv $PKG/etc/gnucash/config $PKG/etc/gnucash/config.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING ChangeLog DOCUMENTERS HACKING LICENSE NEWS README* TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+  $PKG/usr/doc/$PRGNAM-$VERSION || true
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -160,3 +159,4 @@ 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}
+
diff --git a/office/gnucash/gnucash.info b/office/gnucash/gnucash.info
index 760590001c5d6..28bdb4e53dd70 100644
--- a/office/gnucash/gnucash.info
+++ b/office/gnucash/gnucash.info
@@ -1,10 +1,10 @@
 PRGNAM="gnucash"
-VERSION="2.6.21"
+VERSION="3.2"
 HOMEPAGE="http://www.gnucash.org/"
-DOWNLOAD="http://downloads.sourceforge.net/gnucash/gnucash-2.6.21.tar.bz2"
-MD5SUM="63226e9b49e11dc0d7106bd15c09996b"
+DOWNLOAD="http://downloads.sourceforge.net/gnucash/gnucash-3.2.tar.bz2"
+MD5SUM="d442371ea6f0d16be8314e55e4fb420a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libgnomecanvas goffice0.8 webkitgtk"
+REQUIRES="webkit2gtk python3 gtest"
 MAINTAINER="Lenard Spencer"
 EMAIL="lspencer31@cfl.rr.com"