<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a965bc24c3d2412eaaf782557138230584f293d8">https://github.com/macports/macports-ports/commit/a965bc24c3d2412eaaf782557138230584f293d8</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 a965bc24c3d godot: update to version 3.5
</span>a965bc24c3d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a965bc24c3d2412eaaf782557138230584f293d8
</span>Author: Jason Liu <jasonliu--@users.noreply.github.com>
AuthorDate: Sun Jan 1 16:29:44 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> godot: update to version 3.5
</span>---
games/godot/Portfile | 9 ++++----
.../files/macosx-version-log_h-workaround.diff | 26 ++++++++++------------
.../files/patch-available2macro-camera_osx.diff | 4 ++--
.../godot/files/patch-available2macro-os_osx.diff | 14 ++++++------
4 files changed, 26 insertions(+), 27 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/godot/Portfile b/games/godot/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7cc0dcf2211..8e67fb70791 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/godot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/godot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,13 +25,14 @@ long_description Godot Engine is a cross-platform game engine for \
</span> if {$subport eq ${name}} {
PortGroup legacysupport 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup ${name}engine ${name} 3.4.5 "" -stable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup ${name}engine ${name} 3.5 "" -stable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.5.0
</span>
github.tarball_from archive
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 afce6efdbf144ef233c1acdce61c2677f3eb9c77 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 87c988d52e7a06100d30164a18c213e022ef175a6de3bd945352bacc87d5289c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 50000110
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 d6e82c6caf6fbe10fb2c2eb8b5976231025d5213 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c65425e1d56a7097990f231c27c9271b7159f763dc59f0eaba9273633e59da36 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 55701749
</span>
# Godot fails to build for Xcode Clang < 802,
# but builds fine using MacPorts Clang
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/godot/files/macosx-version-log_h-workaround.diff b/games/godot/files/macosx-version-log_h-workaround.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 6b77e894a7e..72b8a56e701 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/godot/files/macosx-version-log_h-workaround.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/godot/files/macosx-version-log_h-workaround.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +1,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- platform/osx/os_osx.mm.orig 2021-11-04 20:06:19.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ platform/osx/os_osx.mm 2021-12-22 19:26:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -48,9 +48,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <IOKit/IOKitLib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <IOKit/hid/IOHIDKeys.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <IOKit/hid/IOHIDLib.h>
</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:#e0ffe0;'>+--- platform/osx/os_osx.mm.orig 2022-08-04 21:40:16.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ platform/osx/os_osx.mm 2023-01-01 14:14:28.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,7 +41,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "servers/visual/visual_server_raster.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <mach-o/dyld.h>
</span> -#include <os/log.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/sysctl.h>
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <dlfcn.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <fcntl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -491,11 +488,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <Carbon/Carbon.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -504,11 +503,7 @@
</span> trackingArea = nil;
imeInputEventInProgress = false;
[self updateTrackingAreas];
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +20,7 @@
</span> markedText = [[NSMutableAttributedString alloc] init];
return self;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -641,18 +634,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -654,18 +649,6 @@
</span> Vector<String> files;
NSPasteboard *pboard = [sender draggingPasteboard];
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +39,7 @@
</span> NSArray *filenames = [pboard propertyListForType:NSFilenamesPboardType];
for (NSString *ns in filenames) {
char *utfs = strdup([ns UTF8String]);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -661,7 +642,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -674,7 +657,6 @@
</span> free(utfs);
files.push_back(ret);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +47,7 @@
</span>
if (files.size()) {
OS_OSX::singleton->main_loop->drop_files(files, 0);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1813,66 +1793,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1853,66 +1835,8 @@
</span> return "OSX";
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/godot/files/patch-available2macro-camera_osx.diff b/games/godot/files/patch-available2macro-camera_osx.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 3d0c8cd9501..09e790c5aa5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/godot/files/patch-available2macro-camera_osx.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/godot/files/patch-available2macro-camera_osx.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/camera/camera_osx.mm.orig 2021-11-04 20:06:19.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/camera/camera_osx.mm 2021-11-19 21:20:59.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/camera/camera_osx.mm.orig 2022-08-04 21:40:16.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/camera/camera_osx.mm 2023-01-01 14:22:18.000000000 -0500
</span> @@ -257,7 +257,7 @@
// Already recording!
} else {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/godot/files/patch-available2macro-os_osx.diff b/games/godot/files/patch-available2macro-os_osx.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 26577805b06..be0381f661b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/godot/files/patch-available2macro-os_osx.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/godot/files/patch-available2macro-os_osx.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,21 +1,21 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- platform/osx/os_osx.mm.orig 2021-12-21 06:57:28.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ platform/osx/os_osx.mm 2022-02-10 20:20:14.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2958,7 +2958,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- platform/osx/os_osx.mm.orig 2022-08-04 21:40:16.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ platform/osx/os_osx.mm 2023-01-01 14:18:41.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3041,7 +3041,7 @@
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Error OS_OSX::execute(const String &p_path, const List<String> &p_arguments, bool p_blocking, ProcessID *r_child_id, String *r_pipe, int *r_exitcode, bool read_stderr, Mutex *p_pipe_mutex) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Error OS_OSX::execute(const String &p_path, const List<String> &p_arguments, bool p_blocking, ProcessID *r_child_id, String *r_pipe, int *r_exitcode, bool read_stderr, Mutex *p_pipe_mutex, bool p_open_console) {
</span> - if (@available(macOS 10.15, *)) {
+ #if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 101500
NSString *nsappname = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleName"];
// If executable is bundled, always execute editor instances using NSWorkspace to ensure app window is registered and activated correctly.
if (p_path == get_executable_path() && nsappname != nil) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3006,9 +3006,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3089,9 +3089,9 @@
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return OS_Unix::execute(p_path, p_arguments, p_blocking, r_child_id, r_pipe, r_exitcode, read_stderr, p_pipe_mutex);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return OS_Unix::execute(p_path, p_arguments, p_blocking, r_child_id, r_pipe, r_exitcode, read_stderr, p_pipe_mutex, p_open_console);
</span> }
- } else {
+ #else
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return OS_Unix::execute(p_path, p_arguments, p_blocking, r_child_id, r_pipe, r_exitcode, read_stderr, p_pipe_mutex);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return OS_Unix::execute(p_path, p_arguments, p_blocking, r_child_id, r_pipe, r_exitcode, read_stderr, p_pipe_mutex, p_open_console);
</span> - }
+ #endif
}
</pre><pre style='margin:0'>
</pre>