<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/25c2c7c97ed567b5bc8a41475f29666a067ce63d">https://github.com/macports/macports-ports/commit/25c2c7c97ed567b5bc8a41475f29666a067ce63d</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 25c2c7c97ed widelands: update to 1.0
</span>25c2c7c97ed is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 25c2c7c97ed567b5bc8a41475f29666a067ce63d
</span>Author: Evan Miller <emmiller@gmail.com>
AuthorDate: Thu Dec 23 18:52:07 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> widelands: update to 1.0
</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/61029
</span>---
games/widelands/Portfile | 77 +++++++++++++--------------------------
games/widelands/files/clang.patch | 40 --------------------
2 files changed, 26 insertions(+), 91 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 801977755f6..79bfe5ed82f 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;'>@@ -3,6 +3,8 @@
</span> PortSystem 1.0
PortGroup cmake 1.1
PortGroup boost 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup app 1.0
</span>
cmake.build_type Release
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,6 +16,9 @@ license GPL-2+
</span> homepage https://widelands.org/
description open-source real-time strategy game inspired by Settlers
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/61029
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append port:cctools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib port:libsdl2 \
port:libsdl2_image \
port:libsdl2_mixer \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,33 +36,23 @@ subport ${name}-devel {}
</span> if {${subport} eq ${name}} {
# release
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # consider moving release to github next version bump
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version build21
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distname ${name}-${version}-source
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites https://launchpad.net/${name}/${version}/${version}/+download/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 b4beb43886b9daa857d431cc4203e96f4dad8864 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 601e0e4c6f91b3fb0ece2cd1b83ecfb02344a1b9194fbb70ef3f70e06994e357 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 381374149
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup widelands widelands 1.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 a4ffc1caab439293efd5fb8f77e6458245f305d4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9171b15220368e1b7146272fa98f3d1192acbd946c7ec2ed269676883e8055a8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 792144061
</span> conflicts ${name}-devel
long_description ${description}: \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- This port follows the release version of ${name}, which is typically updated every \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 6 months. If for some reason this port does not build or function as desired, try the ${name}-devel port.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.url https://launchpad.net/widelands/+download
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.regex "${name}-(build\\d+)-source${extract.suffix}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Widelands is a real-time strategy game with singleplayer campaigns and a multiplayer mode. The game was inspired by Settlers II™ (© Bluebyte) but has significantly more variety and depth to it.
</span> } else {
# devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup widelands widelands d06d4c4aec996a61834adfede15c5220d0f2ffb9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20200818
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 e809ecea0fb6ab5a3da8b13f17f3ce13505aa89b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 020eee6c5dfa1cb9371eac20564b1a7df9f9f882bb231773e03eedba927e6799 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 381800781
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup widelands widelands 59494d191032bd961327fb7e4452ac3d09383485
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20210615
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 a4ffc1caab439293efd5fb8f77e6458245f305d4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9171b15220368e1b7146272fa98f3d1192acbd946c7ec2ed269676883e8055a8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 792144061
</span>
conflicts ${name}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,35 +62,15 @@ if {${subport} eq ${name}} {
</span>
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#ffe0e0;'>-cmake.out_of_source yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DCMAKE_INSTALL_PREFIX:PATH="${applications_dir}/Widelands.app/Contents/MacOS" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWL_INSTALL_DATADIR:PATH="${applications_dir}/Widelands.app/Contents/Resources"
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append -DCMAKE_INSTALL_PREFIX:PATH="${applications_dir}/Widelands.app/Contents/MacOS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-widelands-disable-werror-deprecated.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# older systems don't build ASAN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DOPTION_ASAN=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-widelands-disable-werror-deprecated.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append clang.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${applications_dir}/Widelands.app/Contents/Resources \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${applications_dir}/Widelands.app/MacOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${worksrcpath}/data/images/logos/widelands.icns ${destroot}${applications_dir}/Widelands.app/Contents/Resources/widelands.icns
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set data " {\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFBundleName = widelands;\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFBundleDisplayName = Widelands;\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFBundleIdentifier = \"org.widelands.wl\";\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFBundleVersion = ${version};\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \"CFBundleInfoDictionaryVersion\" = \"6.0\";\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFBundlePackageType = APPL;\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFBundleSignature = \"????\";\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFBundleExecutable = widelands;\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFBundleIconFile = \"widelands.icns\";\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set filename "${destroot}${applications_dir}/Widelands.app/Contents/Info.plist"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set fileId [open $filename "w"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts -nonewline $fileId $data
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- close $fileId
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Note that case-sensitive filesystems may end up with an extra copy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# of the widelands binary (widelands and Widelands). But it's only 12MB
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# out 1GB of installed files.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+app.name Widelands
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+app.icon ${worksrcpath}/data/images/logos/widelands.icns
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+app.identifier org.widelands.wl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+app.executable ${workpath}/build/src/widelands
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/widelands/files/clang.patch b/games/widelands/files/clang.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 766b4ab9d00..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/widelands/files/clang.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,40 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix build failures with old clang.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/widelands/widelands/pull/4218
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/widelands/widelands/pull/4219
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/widelands/widelands/pull/4220
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/graphic/surface.cc.orig 2020-07-12 14:33:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/graphic/surface.cc 2020-09-05 05:26:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,6 +19,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "graphic/surface.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <cstdlib>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "base/rect.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "base/vector.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "graphic/gl/coordinate_conversion.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/logic/map_objects/findnode.cc.orig 2020-07-12 14:33:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/logic/map_objects/findnode.cc 2020-09-05 05:26:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -175,9 +175,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::vector<FCoords> nodes_to_process = {coords};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Set of nodes that that are swimmable & and achievable by swimming
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // We use hashes here
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- std::set<uint32_t> accepted_nodes = {};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ std::set<uint32_t> accepted_nodes;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // just not to check the same node twice
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- std::set<uint32_t> rejected_nodes = {};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ std::set<uint32_t> rejected_nodes;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Continue untill all nodes to process are processed, or we found sufficient number of nodes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- while (!nodes_to_process.empty() && accepted_nodes.size() < min_fields) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/map_io/coords_profile.cc.orig 2020-07-12 14:33:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/map_io/coords_profile.cc 2020-09-05 05:26:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,6 +19,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "map_io/coords_profile.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <cstdlib>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "base/wexception.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "io/profile.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "logic/widelands_geometry.h"
</span></pre><pre style='margin:0'>
</pre>