<pre style='margin:0'>
Mohamed Akram (mohd-akram) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/402b1c2ea3ebced244c6232b4db209c6abca4689">https://github.com/macports/macports-ports/commit/402b1c2ea3ebced244c6232b4db209c6abca4689</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 402b1c2ea3e widelands: fix mesa conflict
</span>402b1c2ea3e is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 402b1c2ea3ebced244c6232b4db209c6abca4689
</span>Author: Mohamed Akram <makr@macports.org>
AuthorDate: Sun Dec 15 23:32:02 2024 +0400

<span style='display:block; white-space:pre;color:#404040;'>    widelands: fix mesa conflict
</span>---
 games/widelands/Portfile                    |  3 +++
 games/widelands/files/patch-fix-opengl.diff | 11 +++++++++++
 2 files changed, 14 insertions(+)

<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 49b32d4c144..a223aa33a6b 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;'>@@ -62,6 +62,9 @@ if {${subport} eq ${name}} {
</span>         This port follows the master version of ${name}, which is typically updated every few weeks.
 }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# ensure mesa isn't picked up by the build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles          patch-fix-opengl.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> compiler.cxx_standard   2017
 
 configure.args-append   -DCMAKE_INSTALL_PREFIX:PATH="${applications_dir}/Widelands.app/Contents/MacOS" \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/widelands/files/patch-fix-opengl.diff b/games/widelands/files/patch-fix-opengl.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..892b649f252
</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/patch-fix-opengl.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig    2024-11-13 00:03:25
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2024-12-15 23:30:20
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,8 +17,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ option(OPTION_TSAN "Build with ThreadSanitizer" OFF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ option(OPTION_FORCE_EMBEDDED_MINIZIP "Use embedded minizip sources" OFF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ option(USE_XDG "Follow XDG-Basedir specification" ON) # Enabled by default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set(CMAKE_FIND_FRAMEWORK LAST)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Absolute path reference for submodules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(WL_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
</span></pre><pre style='margin:0'>

</pre>