<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/06c67af19e97f66706c09d644db0af594c025b28">https://github.com/macports/macports-ports/commit/06c67af19e97f66706c09d644db0af594c025b28</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 06c67af19e97f66706c09d644db0af594c025b28
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Jun 8 15:23:28 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> wesnoth: Update to 1.16.3
</span>---
games/wesnoth/Portfile | 9 +++++----
games/wesnoth/files/frameworks.patch | 24 ++++++++++++++++++++++++
games/wesnoth/files/patch-wesnoth-sdl-main.diff | 21 +++++----------------
3 files changed, 34 insertions(+), 20 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/wesnoth/Portfile b/games/wesnoth/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fcf44217587..82d104a6b8c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/wesnoth/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/wesnoth/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,11 +5,11 @@ PortGroup github 1.0
</span> PortGroup cmake 1.1
PortGroup app 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup wesnoth wesnoth 1.16.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup wesnoth wesnoth 1.16.3
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 7e6ef3da6c4d7b3d39b395f2485909ce3b50feb0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8e33ba234b935485aa4fb194a15a4e7e2afb2520050c706abbf88ef45ae5d933 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 473960291
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 0ae07abc6d62d8806cefe0f4e7aec3583e3e5b8b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0c2ac4fb16ccbb68e78749b603d299c3949901c0adf414bb8432e8e519e119a7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 475424356
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
categories games
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,6 +59,7 @@ depends_lib-append port:boost \
</span>
compiler.cxx_standard 2017
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append frameworks.patch
</span> patchfiles-append patch-wesnoth-apple-notifications.diff
patchfiles-append patch-wesnoth-sdl-main.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/wesnoth/files/frameworks.patch b/games/wesnoth/files/frameworks.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e34c590aa4e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/wesnoth/files/frameworks.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Use the required frameworks.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/wesnoth/wesnoth/pull/6758
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2022-05-29 10:04:52.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2022-06-08 14:43:54.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -66,6 +66,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(OpenSSL 1.0 REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_library(APPKIT_LIBRARY AppKit REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_library(FOUNDATION_LIBRARY Foundation REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_library(IOKIT_LIBRARY IOKit REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_library(SECURITY_LIBRARY Security REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/CMakeLists.txt.orig 2022-05-29 10:04:52.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/CMakeLists.txt 2022-06-08 14:44:36.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -45,7 +45,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elseif(MINGW)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(common-external-libs ${common-external-libs} wsock32 ws2_32 shlwapi winmm)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elseif(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(common-external-libs ${common-external-libs} ${IOKIT_LIBRARY} ${SECURITY_LIBRARY})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(common-external-libs ${common-external-libs} ${APPKIT_LIBRARY} ${FOUNDATION_LIBRARY} ${IOKIT_LIBRARY} ${SECURITY_LIBRARY})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(game-external-libs
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/wesnoth/files/patch-wesnoth-sdl-main.diff b/games/wesnoth/files/patch-wesnoth-sdl-main.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index bd8002a16d7..079a805ce9d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/wesnoth/files/patch-wesnoth-sdl-main.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/wesnoth/files/patch-wesnoth-sdl-main.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,19 +1,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/macosx/SDLMain.mm.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/macosx/SDLMain.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22,6 +22,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #import "SDLMain.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <vector>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MAX_ALLOWED < 101200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define NSEventTypeKeyDown NSKeyDown
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define NSEventTypeKeyUp NSKeyUp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define NSEventModifierFlagCommand NSCommandKeyMask
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern "C" int wesnoth_main(int argc, char **argv);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static std::vector<char*> gArgs;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -135,7 +141,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Continue to support Lion. Reverts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/wesnoth/wesnoth/commit/01d599886629af15ddc15a696f61fdf3ceb64323
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/macosx/SDLMain.mm.orig 2022-01-16 12:10:36.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/macosx/SDLMain.mm 2022-01-21 08:56:16.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -141,7 +141,11 @@
</span>
[WesnothSDLApplication sharedApplication];
</pre><pre style='margin:0'>
</pre>