diff options
-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, 4 insertions, 40 deletions
diff --git a/libraries/SimGear/SimGear.SlackBuild b/libraries/SimGear/SimGear.SlackBuild index 1bfa41e2e318c..93ae1e611eeb5 100644 --- a/libraries/SimGear/SimGear.SlackBuild +++ b/libraries/SimGear/SimGear.SlackBuild @@ -25,7 +25,7 @@ PRGNAM=SimGear SRCNAM=simgear -VERSION=${VERSION:-2020.3.5} +VERSION=${VERSION:-2020.3.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -71,9 +71,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 {} \; -# 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 e925b6d169d81..e76bcb8dca334 100644 --- a/libraries/SimGear/SimGear.info +++ b/libraries/SimGear/SimGear.info @@ -1,8 +1,8 @@ PRGNAM="SimGear" -VERSION="2020.3.5" +VERSION="2020.3.6" HOMEPAGE="http://wiki.flightgear.org/SimGear" -DOWNLOAD="https://downloads.sourceforge.net/flightgear/simgear-2020.3.5.tar.bz2" -MD5SUM="47ac92796698ce7eea8f843b92b1243d" +DOWNLOAD="https://downloads.sourceforge.net/flightgear/simgear-2020.3.6.tar.bz2" +MD5SUM="b78dfc1f09229ada5a6506d82803a134" 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 deleted file mode 100644 index 8852af9894fb6..0000000000000 --- a/libraries/SimGear/simgear-boost-1.75.patch +++ /dev/null @@ -1,33 +0,0 @@ -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 - |