summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author newHeiko2020-05-30 10:45:31 +0200
committer Matteo Bernardini2021-03-06 10:00:00 +0100
commitba5817fc4c6c791d682cdc66bebd97ec11d50afb (patch)
tree733de6e97a04f6b4ae6d2ddd8ec24fb4be0b15e4
parent3c59cb22425adf5d8a0d1a79baf00e6d9334c620 (diff)
downloadslackbuilds-kicad.tar.gz
development/kicad: Add #include <algorithm> to find std::sort...kicad
...with boost 1.7.3 https://gitlab.com/kicad/code/kicad/-/commit/4729740 Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
-rw-r--r--development/kicad/kicad.SlackBuild1
-rw-r--r--development/kicad/kicad_std-header_for_boost1.7.3.patch14
2 files changed, 15 insertions, 0 deletions
diff --git a/development/kicad/kicad.SlackBuild b/development/kicad/kicad.SlackBuild
index b2942d5e3f..4b80cc52a3 100644
--- a/development/kicad/kicad.SlackBuild
+++ b/development/kicad/kicad.SlackBuild
@@ -79,6 +79,7 @@ find -L . \
# KiCad 5.1.2 patch:
patch -p1 --verbose < $CWD/kicad_boost_hdr.patch
+patch -p1 --verbose < $CWD/kicad_std-header_for_boost1.7.3.patch
# Additional notes:
#
diff --git a/development/kicad/kicad_std-header_for_boost1.7.3.patch b/development/kicad/kicad_std-header_for_boost1.7.3.patch
new file mode 100644
index 0000000000..714e78f4f4
--- /dev/null
+++ b/development/kicad/kicad_std-header_for_boost1.7.3.patch
@@ -0,0 +1,14 @@
+Add missing include for std::algorithm for boost 1.7.3
+https://gitlab.com/kicad/code/kicad/-/commit/47297402d38cafefd54310ee7b536b60c8524ac0
+diff --git a/common/lib_tree_model.cpp b/common/lib_tree_model.cpp
+index 71fe74c7dcdaa2661584cbe89361bcc2f4729954..ed30b11de5e3db8b460984821965f4745911e1fd 100644
+--- a/common/lib_tree_model.cpp
++++ b/common/lib_tree_model.cpp
+@@ -21,6 +21,7 @@
+
+ #include <lib_tree_model.h>
+
++#include <algorithm>
+ #include <eda_pattern_match.h>
+ #include <lib_tree_item.h>
+ #include <make_unique.h>