4 files changed, 71 insertions, 64 deletions
diff --git a/office/gnucash-docs/README b/office/gnucash-docs/README
index 3d2b9e1337..87d6c20c04 100644
--- a/office/gnucash-docs/README
+++ b/office/gnucash-docs/README
@@ -2,15 +2,20 @@ This is the documentation package for Gnucash.
 
 This builds the internal help and user guides for Gnucash.
 
-For the HTML help and user guides to read outside the Gnucash
+For the HTML help and user guides to read outside of the Gnucash
 application, pass HTML="yes" to the script.
 
-For the EPUB help and user guides, pass EPUB="yes" to the script.
+For the epub help and user guides, pass EPUB="yes" to the script.
+
+For the mobi (Amazon Kindle) help and user guides, make sure
+  calibre-bin is installed, and pass MOBI="yes" to the script.
+  (Note: mobi is generated from epub, so this generates epub files
+  as well.)
 
 For the PDF help and user guides, make sure fop is installed and
   configured, and pass PDF="yes" to the script.
 
-After installation, HTML, EPUB, and PDF documentation can be found
+After installation, HTML, EPUB, MOBI and PDF documentation can be found
 in /usr/doc/gnucash-$VERSION.
 
 For a specific language, pass DOCLANG="xx", where xx is:
@@ -19,12 +24,10 @@ de for German
 it for Italian
 pt for Portugese
 ja for Japanese (guide only, no help - defaults to C)
-ru for Russian (guide only, no help - defaults to C)
+NOTE: the Russian translation has been dropped
 
-Note 1: This script builds the internal guides in all available
+Note: This script builds the internal guides in all available
 languages, but the HTML guides are only in the spacified language
 to save space and avoid excessive package bloat.
 
-Note 2: This builds the docs for version 3.x of Gnucash.  If you
-need the old stable 2.6 branch, use gnucash-legacy-docs, also
-available on SBo.
+Runtime dependencies are yelp and rarian.
diff --git a/office/gnucash-docs/gnucash-docs.SlackBuild b/office/gnucash-docs/gnucash-docs.SlackBuild
index 063cc837ae..fad6a714af 100644
--- a/office/gnucash-docs/gnucash-docs.SlackBuild
+++ b/office/gnucash-docs/gnucash-docs.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for gnucash-docs
 
-# Copyright 2018 Lenard Spencer  <lspencer31@cfl.rr.com>
+# Copyright 2018, 2019, 2020, 2021, 2022 Lenard Spencer, Orlando, Florida, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,26 +22,30 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=gnucash-docs
-DESTNAM=gnucash
-VERSION=${VERSION:-3.9}
+VERSION=${VERSION:-5.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 # Docs only, no binaries
 ARCH=noarch
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-ARCH=noarch # does not install any binary files
-
-# Set DOCLANG to C if it is empty:
-if [ ! "$DOCLANG" ]; then
-  DOCLANG=C
-fi
+DOCLANG=${DOCLANG:-"C"}
 
 set -e
 
@@ -58,52 +62,52 @@ 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 {} \;
 
-./configure \
-  --prefix=/usr \
-  --docdir=/usr/doc/$DESTNAM-$VERSION
-
-make
-make -j1 install DESTDIR=$PKG docdir=/usr/doc/$DESTNAM-$VERSION
-
-# Build and install the HTML docs for the specified language (default to C)
-
-if [ "$HTML" = "yes" ]; then
-  mkdir -p $PKG/usr/doc/$DESTNAM-$VERSION/html
-  cd guide/${DOCLANG:-C} || cd guide/C
-  make html
-  cp -vR gnucash-guide $PKG/usr/doc/$DESTNAM-$VERSION/html
-  cd ../../help/${DOCLANG:-C} || cd ../../help/C
-  make html
-  cp -vR gnucash-help $PKG/usr/doc/$DESTNAM-$VERSION/html
-  cd ../..
+if [ "${MOBI:-no}" = "yes" ]; then
+  WITHMOBI="-DWITH_MOBI=ON"
+else
+  WITHMOBI=""
 fi
 
-if [ -x /opt/fop/fop ]; then
-  if [ "$PDF" = "yes" ]; then
-    mkdir -p $PKG/usr/doc/$DESTNAM-$VERSION
-    cd guide/${DOCLANG:-C} || cd guide/C
-    make pdf
-    cp -vR gnucash-guide.pdf $PKG/usr/doc/$DESTNAM-$VERSION
-    cd ../../help/${DOCLANG:-C} || cd ../../help/C
-    make pdf
-    cp -vR gnucash-help.pdf $PKG/usr/doc/$DESTNAM-$VERSION
-    cd ../..
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    $WITHMOBI \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  if [ "${HTML:-no}" = "yes" ]; then
+    make $DOCLANG-gnucash-guide-html || make C-gnucash-guide-html
+    make $DOCLANG-gnucash-help-html || make C-gnucash-help-html
+  fi
+  if [ "$MOBI" = "yes" ]; then
+    make $DOCLANG-gnucash-guide-mobi || make C-gnucash-guide-mobi
+    make $DOCLANG-gnucash-help-mobi || make C-gnucash-help-mobi
+  elif [ "${EPUB:-no}" = "yes" ]; then
+    make $DOCLANG-gnucash-guide-epub || make C-gnucash-guide-epub
+    make $DOCLANG-gnucash-help-epub || make C-gnucash-help-epub
+  fi
+  if [ "${PDF:-no}" = "yes" ]; then
+    make $DOCLANG-gnucash-guide-pdf || make C-gnucash-guide-pdf
+    make $DOCLANG-gnucash-help-pdf || make C-gnucash-help-pdf
   fi
-fi
 
-if [ "$EPUB" = "yes" ]; then
-  mkdir -p $PKG/usr/doc/$DESTNAM-$VERSION
-  cd guide/${DOCLANG:-C} || cd guide/C
-  make epub
-  cp -vR gnucash-guide.epub $PKG/usr/doc/$DESTNAM-$VERSION
-  cd ../../help/${DOCLANG:-C} || cd ../../help/C
-  make epub
-  cp -vR gnucash-help.epub $PKG/usr/doc/$DESTNAM-$VERSION
-  cd ../..
-fi
+  make -j1 install DESTDIR=$PKG
+
+# Move the files to where they belong:
+  mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+  cp -Rv share/help/$DOCLANG/* $PKG/usr/doc/$PRGNAM-$VERSION
+  cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+# There is no help system for Japanese, so:
+  if [ "$DOCLANG" = "ja" ]; then
+    cp -Rv share/help/C/gnucash-help* $PKG/usr/doc/$PRGNAM-$VERSION
+  fi
+  mv $PKG/usr/share/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION
+# get rid of unused folders:
+  rm -rf $PKG/usr/share/{$PRGNAM,doc}
+cd ..
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/office/gnucash-docs/gnucash-docs.info b/office/gnucash-docs/gnucash-docs.info
index 7a38a3319f..0f7b5ee92d 100644
--- a/office/gnucash-docs/gnucash-docs.info
+++ b/office/gnucash-docs/gnucash-docs.info
@@ -1,8 +1,8 @@
 PRGNAM="gnucash-docs"
-VERSION="3.9"
-HOMEPAGE="http://www.gnucash.org"
-DOWNLOAD="http://downloads.sourceforge.net/gnucash/gnucash-docs-3.9.tar.gz"
-MD5SUM="0e54f9c3b63efcaf9146c6040b89abe5"
+VERSION="5.4"
+HOMEPAGE="https://www.gnucash.org"
+DOWNLOAD="https://downloads.sourceforge.net/gnucash/gnucash-docs-5.4.tar.gz"
+MD5SUM="62b1a9cd78d9d9fff889c9460716bd5c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="gnucash rarian yelp"
diff --git a/office/gnucash-docs/slack-desc b/office/gnucash-docs/slack-desc
index 68b503bcae..62e06d0170 100644
--- a/office/gnucash-docs/slack-desc
+++ b/office/gnucash-docs/slack-desc
@@ -8,7 +8,7 @@
             |-----handy-ruler------------------------------------------------------|
 gnucash-docs: gnucash-docs (Gnucash help and user guides)
 gnucash-docs:
-gnucash-docs: Documentation files for Gnucash 3.x
+gnucash-docs: Documentation files for Gnucash 4.x
 gnucash-docs:
 gnucash-docs: http://www.gnucash.org
 gnucash-docs: