<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c03606bb4545e453e756f267412991a472d3690b">https://github.com/macports/macports-ports/commit/c03606bb4545e453e756f267412991a472d3690b</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new c03606bb454 widelands: Fix build failures with old clangs
</span>c03606bb454 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit c03606bb4545e453e756f267412991a472d3690b
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Sep 5 06:06:29 2020 -0500

<span style='display:block; white-space:pre;color:#404040;'>    widelands: Fix build failures with old clangs
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/61028
</span>---
 games/widelands/Portfile                           |  1 +
 games/widelands/files/clang.patch                  | 40 ++++++++++++++++++++++
 .../patch-widelands-disable-werror-deprecated.diff | 16 ++++-----
 3 files changed, 48 insertions(+), 9 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/widelands/Portfile b/games/widelands/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 24776c88fa6..466ae8e4425 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/widelands/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/widelands/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,6 +77,7 @@ if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span> }
 
 patchfiles          patch-widelands-disable-werror-deprecated.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append   clang.patch
</span> 
 pre-destroot {
     xinstall -d ${destroot}${applications_dir}/Widelands.app/Contents/Resources \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/widelands/files/clang.patch b/games/widelands/files/clang.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..766b4ab9d00
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/widelands/files/clang.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,40 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix build failures with old clang.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/widelands/widelands/pull/4218
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/widelands/widelands/pull/4219
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/widelands/widelands/pull/4220
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/graphic/surface.cc.orig    2020-07-12 14:33:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/graphic/surface.cc 2020-09-05 05:26:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,6 +19,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "graphic/surface.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <cstdlib>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "base/rect.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "base/vector.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "graphic/gl/coordinate_conversion.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/logic/map_objects/findnode.cc.orig 2020-07-12 14:33:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/logic/map_objects/findnode.cc      2020-09-05 05:26:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -175,9 +175,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   std::vector<FCoords> nodes_to_process = {coords};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   // Set of nodes that that are swimmable & and achievable by swimming
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   // We use hashes here
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  std::set<uint32_t> accepted_nodes = {};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  std::set<uint32_t> accepted_nodes;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   // just not to check the same node twice
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  std::set<uint32_t> rejected_nodes = {};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  std::set<uint32_t> rejected_nodes;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   // Continue untill all nodes to process are processed, or we found sufficient number of nodes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   while (!nodes_to_process.empty() && accepted_nodes.size() < min_fields) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/map_io/coords_profile.cc.orig      2020-07-12 14:33:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/map_io/coords_profile.cc   2020-09-05 05:26:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,6 +19,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "map_io/coords_profile.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <cstdlib>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "base/wexception.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "io/profile.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "logic/widelands_geometry.h"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/widelands/files/patch-widelands-disable-werror-deprecated.diff b/games/widelands/files/patch-widelands-disable-werror-deprecated.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d4f5504994e..bafe327cbe7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/widelands/files/patch-widelands-disable-werror-deprecated.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/widelands/files/patch-widelands-disable-werror-deprecated.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git CMakeLists.txt.orig CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 5c5ca8a..13c29b8 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -210,7 +210,7 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Don't use -Werror=deprecated.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig    2020-07-12 14:33:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2020-09-05 05:26:37.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -248,7 +248,6 @@
</span>    wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wno-unreachable-code")
    wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wno-documentation")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span> -  wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=deprecated")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=deprecated")
</span>    wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=non-pod-varargs")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Qunused-arguments")
</span>\ No newline at end of file
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Qunused-arguments")
</span></pre><pre style='margin:0'>

</pre>