3 files changed, 8 insertions, 120 deletions
diff --git a/business/ledger/ledger.SlackBuild b/business/ledger/ledger.SlackBuild
index fb5532d4b969..18c0690efcf4 100644
--- a/business/ledger/ledger.SlackBuild
+++ b/business/ledger/ledger.SlackBuild
@@ -3,13 +3,13 @@
 # Written by Lionel Young (redtricycle at gmail dot com)
 
 PRGNAM=ledger
-VERSION=${VERSION:-3.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-3.1.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -26,7 +26,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG/usr $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -35,11 +35,6 @@ 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 {} \;
 
-tar xvf $CWD/utfcpp.tar.gz -C lib/
-
-# Fix build with boost-1.58 (thanks to Arch Linux)
-patch -p1 < $CWD/ledger_git.diff
-
 ./acprep --prefix=/usr update
 make install DESTDIR=$PKG
 
diff --git a/business/ledger/ledger.info b/business/ledger/ledger.info
index f2fed646c312..c89a7d487396 100644
--- a/business/ledger/ledger.info
+++ b/business/ledger/ledger.info
@@ -1,12 +1,10 @@
 PRGNAM="ledger"
-VERSION="3.1"
+VERSION="3.1.1"
 HOMEPAGE="https://ledger-cli.org"
-DOWNLOAD="https://github.com/ledger/ledger/archive/v3.1.tar.gz \
-          https://sourceforge.net/projects/slackbuildsdirectlinks/files/utfcpp/utfcpp.tar.gz"
-MD5SUM="f4389aae3ba96eb5590784db7fa614ca \
-        32519c82d4c1d269c623fe179aa69f59"
+DOWNLOAD="https://github.com/ledger/ledger/archive/v3.1.1/ledger-3.1.1.tar.gz"
+MD5SUM="eae070cbbc1a40a277f1394d72ef0fe6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="utfcpp"
 MAINTAINER="simotrone"
 EMAIL="simotrone@gmail.com"
diff --git a/business/ledger/ledger_git.diff b/business/ledger/ledger_git.diff
deleted file mode 100644
index 539814476265..000000000000
--- a/business/ledger/ledger_git.diff
+++ /dev/null
@@ -1,105 +0,0 @@
-diff --git a/src/account.h b/src/account.h
-index 76e839e..0b55ce9 100644
---- a/src/account.h
-+++ b/src/account.h
-@@ -261,11 +261,7 @@ public:
-   mutable optional<xdata_t> xdata_;
- 
-   bool has_xdata() const {
--#if BOOST_VERSION >= 105600
--    return xdata_ != NULL;
--#else
--    return xdata_;
--#endif
-+      return !!(xdata_);
-   }
-   void clear_xdata();
-   xdata_t& xdata() {
-diff --git a/src/filters.cc b/src/filters.cc
-index 2f97a0e..b6530c0 100644
---- a/src/filters.cc
-+++ b/src/filters.cc
-@@ -707,7 +707,7 @@ namespace {
-     insert_prices_in_map(price_map_t& _all_prices)
-       : all_prices(_all_prices) {}
- 
--    void operator()(datetime_t& date, const amount_t& price) {
-+    void operator()(const datetime_t& date, const amount_t& price) {
-       all_prices.insert(price_map_t::value_type(date, price));
-     }
-   };
-diff --git a/src/item.h b/src/item.h
-index 458cb37..aa55e41 100644
---- a/src/item.h
-+++ b/src/item.h
-@@ -191,11 +191,7 @@ public:
-   static bool use_aux_date;
- 
-   virtual bool has_date() const {
--#if BOOST_VERSION >= 105600
--    return _date != NULL;
--#else
--    return _date;
--#endif
-+      return !!(_date);
-   }
- 
-   virtual date_t date() const {
-diff --git a/src/iterators.cc b/src/iterators.cc
-index 21bec5d..0225e21 100644
---- a/src/iterators.cc
-+++ b/src/iterators.cc
-@@ -96,7 +96,7 @@ namespace {
-       TRACE_DTOR(create_price_xact);
-     }
- 
--    void operator()(datetime_t& date, const amount_t& price) {
-+    void operator()(const datetime_t& date, const amount_t& price) {
-       xact_t * xact;
-       string   symbol = price.commodity().symbol();
- 
-diff --git a/src/parser.h b/src/parser.h
-index e46fc71..25c4a7e 100644
---- a/src/parser.h
-+++ b/src/parser.h
-@@ -118,7 +118,7 @@ public:
- 
-   ptr_op_t parse(std::istream&           in,
-                  const parse_flags_t&    flags           = PARSE_DEFAULT,
--                 const optional<string>& original_string = NULL);
-+                 const optional<string>& original_string = boost::none);
- };
- 
- } // namespace ledger
-diff --git a/src/post.h b/src/post.h
-index 1e5fc56..7796293 100644
---- a/src/post.h
-+++ b/src/post.h
-@@ -205,11 +205,7 @@ public:
-   mutable optional<xdata_t> xdata_;
- 
-   bool has_xdata() const {
--#if BOOST_VERSION >= 105600
--    return xdata_ != NULL;
--#else
--    return xdata_;
--#endif
-+      return !!(xdata_);
-   }
-   void clear_xdata() {
-     xdata_ = none;
-diff --git a/src/times.h b/src/times.h
-index c1bfb1c..0cb05ff 100644
---- a/src/times.h
-+++ b/src/times.h
-@@ -568,11 +568,7 @@ public:
-   void   stabilize(const optional<date_t>& date = none);
- 
-   bool   is_valid() const {
--#if BOOST_VERSION >= 105600
--    return start != NULL;
--#else
--    return start;
--#endif
-+      return !!(start);
-   }