summaryrefslogtreecommitdiffstats
path: root/office
diff options
context:
space:
mode:
author Lenard Spencer <lenardrspencer@gmail.com>2020-05-14 18:57:14 +0100
committer Willy Sudiarto Raharjo <willysr@slackbuilds.org>2020-05-16 08:44:11 +0700
commit9c270f89fd886c80e031ff3930f3c923a9f6abb4 (patch)
treeff1d3f1087c55ba0e78bb0a408ea641b536ae3ba /office
parent0a9730dd9e2336e85f81472220936819cd64f28d (diff)
downloadslackbuilds-9c270f89fd886c80e031ff3930f3c923a9f6abb4.tar.gz
slackbuilds-9c270f89fd886c80e031ff3930f3c923a9f6abb4.tar.xz
office/gnucash: Patched.
Signed-off-by: Dave Woodfall <dave@slackbuilds.org> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'office')
-rw-r--r--office/gnucash/gnucash-boost-1.73.patch10
-rw-r--r--office/gnucash/gnucash.SlackBuild11
2 files changed, 16 insertions, 5 deletions
diff --git a/office/gnucash/gnucash-boost-1.73.patch b/office/gnucash/gnucash-boost-1.73.patch
new file mode 100644
index 0000000000..ab3a015199
--- /dev/null
+++ b/office/gnucash/gnucash-boost-1.73.patch
@@ -0,0 +1,10 @@
+--- gnucash/import-export/csv-imp/gnc-imp-settings-csv.hpp.orig 2020-05-11 19:38:43.108485371 +0000
++++ gnucash/import-export/csv-imp/gnc-imp-settings-csv.hpp
+@@ -34,6 +34,7 @@ extern "C" {
+ #include "gnc-commodity.h"
+ }
+
++#include <algorithm>
+ #include <string>
+ #include <vector>
+ #include <boost/optional.hpp>
diff --git a/office/gnucash/gnucash.SlackBuild b/office/gnucash/gnucash.SlackBuild
index 9113f8d68d..ae678bba69 100644
--- a/office/gnucash/gnucash.SlackBuild
+++ b/office/gnucash/gnucash.SlackBuild
@@ -25,7 +25,7 @@
PRGNAM=gnucash
VERSION=${VERSION:-3.10}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PACKAGER=${PACKAGER:-"Just Another Slacker"}
@@ -101,9 +101,6 @@ else
W_PYTHON="-DWITH_PYTHON=OFF"
fi
-# New option to build with ninja:
-NINJA=${NINJA:-"no"}
-
set -e
rm -rf $PKG
@@ -119,7 +116,11 @@ 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
+# Patch for the newest boost (will be in gncuash 3.11)
+patch -p0 < $CWD/gnucash-boost-1.73.patch
+
+# New option to build with ninja:
+if [ "${NINJA:-no}" = "yes" ]; then
echo "building using Ninja:"
NINJABUILD="-GNinja"
else