3 files changed, 78 insertions, 22 deletions
diff --git a/business/ledger/boost-176.patch b/business/ledger/boost-176.patch
new file mode 100644
index 0000000000..8032625b24
--- /dev/null
+++ b/business/ledger/boost-176.patch
@@ -0,0 +1,35 @@
+diff --git a/src/expr.cc b/src/expr.cc
+index c8945d3..ad2589a 100644
+--- a/src/expr.cc
++++ b/src/expr.cc
+@@ -278,7 +278,7 @@ value_t expr_value(expr_t::ptr_op_t op)
+ value_t source_command(call_scope_t& args)
+ {
+   std::istream * in = NULL;
+-  scoped_ptr<ifstream> stream;
++  std::unique_ptr<ifstream> stream;
+   string pathname;
+ 
+   if (args.has(0)) {
+diff --git a/src/format.h b/src/format.h
+index 15431cf..57f3650 100644
+--- a/src/format.h
++++ b/src/format.h
+@@ -65,7 +65,7 @@ class format_t : public expr_base_t<string>, public noncopyable
+     std::size_t                  min_width;
+     std::size_t                  max_width;
+     variant<string, expr_t>      data;
+-    scoped_ptr<struct element_t> next;
++    std::unique_ptr<struct element_t> next;
+ 
+     element_t() throw()
+       : supports_flags<>(), type(STRING), min_width(0), max_width(0) {
+@@ -103,7 +103,7 @@ class format_t : public expr_base_t<string>, public noncopyable
+     void dump(std::ostream& out) const;
+   };
+ 
+-  scoped_ptr<element_t> elements;
++  std::unique_ptr<element_t> elements;
+ 
+ public:
+   static enum elision_style_t {
diff --git a/business/ledger/ledger.SlackBuild b/business/ledger/ledger.SlackBuild
index 04a1c1b7aa..9e4abd59bf 100644
--- a/business/ledger/ledger.SlackBuild
+++ b/business/ledger/ledger.SlackBuild
@@ -1,12 +1,21 @@
-#!/bin/sh
+#!/bin/bash
 # Slackware build script for ledger
 # Written by Lionel Young (redtricycle at gmail dot com)
 # Updated by simotrone (simotrone at gmail dot com)
 
+# 20220301 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - fix conflict with utfcpp.
+# - don't include tools/ in the doc dir, it's upstream dev stuff.
+# - don't include empty /usr/share in package.
+# - include GLOSSARY.md in package, it looks useful.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ledger
-VERSION=${VERSION:-3.1.3}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-3.3.2}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -16,7 +25,13 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+# 20220301 bkw: no SLKCFLAGS here. cmake defaults to -O3 -fPIC, which is fine.
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -32,30 +47,36 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+patch -p1 < $CWD/boost-176.patch
 
-./acprep --prefix=/usr update
-make install DESTDIR=$PKG
+# 20220301 bkw: do not look for utfcpp's headers in /usr/include, use
+# only the bundled copy (otherwise the build breaks if utfcpp is installed).
+sed -i '/find_path(/s,$, NO_DEFAULT_PATH,' cmake/FindUtfcpp.cmake
 
-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
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    ..
+  make # VERBOSE=1  # uncomment if needed
+  make install/strip DESTDIR=$PKG
+cd ..
 
 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
+rmdir $PKG/usr/share
+gzip -9 $PKG/usr/man/man*/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cp -a README.md doc/NEWS.md $PKG/usr/doc/$PRGNAM-$VERSION/
-
-cp -ra contrib      $PKG/usr/doc/$PRGNAM-$VERSION
-cp -ra test/input/* $PKG/usr/doc/$PRGNAM-$VERSION
-cp -ra tools        $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.md doc/*.md contrib test/input/* \
+  $PKG/usr/doc/$PRGNAM-$VERSION/
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/business/ledger/ledger.info b/business/ledger/ledger.info
index cf83d5a190..5dbc3b45d5 100644
--- a/business/ledger/ledger.info
+++ b/business/ledger/ledger.info
@@ -1,10 +1,10 @@
 PRGNAM="ledger"
-VERSION="3.1.3"
+VERSION="3.3.2"
 HOMEPAGE="https://ledger-cli.org"
-DOWNLOAD="https://github.com/ledger/ledger/archive/v3.1.3/ledger-3.1.3.tar.gz"
-MD5SUM="6d9b8293f5f909aab4b95cffa2b3c120"
+DOWNLOAD="https://github.com/ledger/ledger/archive/v3.3.2/ledger-3.3.2.tar.gz"
+MD5SUM="802bb7ed40be62bfbf68b70f15731f63"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="utfcpp"
+REQUIRES=""
 MAINTAINER="simotrone"
 EMAIL="simotrone@gmail.com"