summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Andrew Clemons2018-10-08 10:51:28 +0200
committer Matteo Bernardini2019-12-07 20:01:41 +0100
commit5568d5bc34e1893c0bea9b9256ce7424525d64eb (patch)
treea92da5bc5c6251020a5b21538eaed62ffab12332
parent4b7b01aae75cc2cc8db1eedc90b43f8400bef53e (diff)
downloadslackbuilds-yaml-cpp.tar.gz
libraries/yaml-cpp: Fix compiling with the newer boost.yaml-cpp
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
-rw-r--r--libraries/yaml-cpp/boost_patch.diff11
-rw-r--r--libraries/yaml-cpp/yaml-cpp.SlackBuild2
2 files changed, 13 insertions, 0 deletions
diff --git a/libraries/yaml-cpp/boost_patch.diff b/libraries/yaml-cpp/boost_patch.diff
new file mode 100644
index 0000000000..913c300b50
--- /dev/null
+++ b/libraries/yaml-cpp/boost_patch.diff
@@ -0,0 +1,11 @@
+diff -Naur yaml-cpp-release-0.5.3.bak/include/yaml-cpp/node/detail/iterator.h yaml-cpp-release-0.5.3/include/yaml-cpp/node/detail/iterator.h
+--- yaml-cpp-release-0.5.3.bak/include/yaml-cpp/node/detail/iterator.h 2016-01-11 07:11:40.000000000 +1300
++++ yaml-cpp-release-0.5.3/include/yaml-cpp/node/detail/iterator.h 2018-07-22 16:58:24.156667873 +1200
+@@ -11,6 +11,7 @@
+ #include "yaml-cpp/node/ptr.h"
+ #include "yaml-cpp/node/detail/node_iterator.h"
+ #include <boost/iterator/iterator_adaptor.hpp>
++#include <boost/next_prior.hpp>
+ #include <boost/utility.hpp>
+
+ namespace YAML {
diff --git a/libraries/yaml-cpp/yaml-cpp.SlackBuild b/libraries/yaml-cpp/yaml-cpp.SlackBuild
index a194c2c773..c8672eed82 100644
--- a/libraries/yaml-cpp/yaml-cpp.SlackBuild
+++ b/libraries/yaml-cpp/yaml-cpp.SlackBuild
@@ -69,6 +69,8 @@ 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 {} \;
+patch -p1 < $CWD/boost_patch.diff
+
mkdir -p build
cd build
cmake \