diff options
| author | Lenard Spencer <lenardrspencer@gmail.com> | 2021-01-02 08:49:11 +0700 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2021-01-02 10:48:18 +0700 |
| commit | 90ff246dbbe8691d9da2bb5d3ae4b2e938e43433 (patch) | |
| tree | bb36673e61e9c6cc7897da1c4836c5317076df5f | |
| parent | a03a0aa2474320ebec4516150a5eb67d6bbe8aaa (diff) | |
libraries/SimGear: Updated for version 2020.3.5.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | libraries/SimGear/SimGear.SlackBuild | 5 | ||||
| -rw-r--r-- | libraries/SimGear/SimGear.info | 6 | ||||
| -rw-r--r-- | libraries/SimGear/simgear-boost-1.75.patch | 33 |
3 files changed, 40 insertions, 4 deletions
diff --git a/libraries/SimGear/SimGear.SlackBuild b/libraries/SimGear/SimGear.SlackBuild index 4c066aae67390..1bfa41e2e318c 100644 --- a/libraries/SimGear/SimGear.SlackBuild +++ b/libraries/SimGear/SimGear.SlackBuild @@ -25,7 +25,7 @@ PRGNAM=SimGear SRCNAM=simgear -VERSION=${VERSION:-2020.3.4} +VERSION=${VERSION:-2020.3.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -71,6 +71,9 @@ 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 for latest boost: +patch -p1 < $CWD/simgear-boost-1.75.patch + mkdir -p build cd build cmake \ diff --git a/libraries/SimGear/SimGear.info b/libraries/SimGear/SimGear.info index 089e345177fbe..e925b6d169d81 100644 --- a/libraries/SimGear/SimGear.info +++ b/libraries/SimGear/SimGear.info @@ -1,8 +1,8 @@ PRGNAM="SimGear" -VERSION="2020.3.4" +VERSION="2020.3.5" HOMEPAGE="http://wiki.flightgear.org/SimGear" -DOWNLOAD="https://downloads.sourceforge.net/flightgear/simgear-2020.3.4.tar.bz2" -MD5SUM="b1c0cfce037609a42855c7e6c43ec9a9" +DOWNLOAD="https://downloads.sourceforge.net/flightgear/simgear-2020.3.5.tar.bz2" +MD5SUM="47ac92796698ce7eea8f843b92b1243d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="OpenSceneGraph freealut plib" diff --git a/libraries/SimGear/simgear-boost-1.75.patch b/libraries/SimGear/simgear-boost-1.75.patch new file mode 100644 index 0000000000000..8852af9894fb6 --- /dev/null +++ b/libraries/SimGear/simgear-boost-1.75.patch @@ -0,0 +1,33 @@ +diff -Naur simgear-2020.3.5.orig/simgear/props/props.cxx simgear-2020.3.5/simgear/props/props.cxx +--- simgear-2020.3.5.orig/simgear/props/props.cxx 2020-12-18 06:42:37.000000000 -0500 ++++ simgear-2020.3.5/simgear/props/props.cxx 2020-12-26 17:01:19.770916937 -0500 +@@ -566,23 +573,15 @@ + } + } + #else +-template<typename Range> +-SGPropertyNode* +-find_node (SGPropertyNode * current, +- const Range& path, +- bool create, +- int last_index = -1) +-{ ++template <typename Range> ++SGPropertyNode *find_node(SGPropertyNode *current, const Range &path, ++ bool create, int last_index = -1) { + using namespace boost; +- typedef split_iterator<typename range_result_iterator<Range>::type> +- PathSplitIterator; +- +- PathSplitIterator itr +- = make_split_iterator(path, first_finder("/", is_equal())); ++ auto itr = make_split_iterator(path, first_finder("/", is_equal())); + if (*path.begin() == '/') + return find_node_aux(current->getRootNode(), itr, create, last_index); +- else +- return find_node_aux(current, itr, create, last_index); ++ else ++ return find_node_aux(current, itr, create, last_index); + } + #endif + |