<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b08699befa86acc41878c689093eb35d25aed0a9">https://github.com/macports/macports-ports/commit/b08699befa86acc41878c689093eb35d25aed0a9</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 b08699befa8 godot: work around compile error on macOS <= 10.10
</span>b08699befa8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b08699befa86acc41878c689093eb35d25aed0a9
</span>Author: Jason Liu <jasonliu--@users.noreply.github.com>
AuthorDate: Wed Nov 10 14:02:51 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> godot: work around compile error on macOS <= 10.10
</span>---
games/godot/Portfile | 21 ++++
.../files/macosx-version-log_h-workaround.diff | 121 +++++++++++++++++++++
2 files changed, 142 insertions(+)
<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 0a1bd294964..bb4de087e8d 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;'>@@ -24,6 +24,7 @@ long_description Godot Engine is a cross-platform game engine for \
</span>
if {$subport eq ${name}} {
github.setup godotengine ${name} 3.3.2 "" -stable
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span>
checksums rmd160 6a0d77597ed84308d030c243118e01b79a87f88c \
sha256 dde0c91b2aaa7db21bd1e1ca82f6c20491e8548c20511bdcf506160f4b852bd8 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,6 +63,26 @@ if {${os.platform} eq "darwin" && ${os.major} <= 15} {
</span> patchfiles legacy-osx-defines.diff
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {$subport eq ${name} && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${os.platform} eq "darwin" && ${os.major} < 15} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # On old versions of macOS, the build seems to think that the value
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # of the preprocessor macro MAC_OS_X_VERSION_MAX_ALLOWED is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # >= 101200, which is supposed to correspond to macOS 10.12 Sierra.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # As discussed in GitHub PR #12269
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # (https://github.com/macports/macports-ports/pull/12269),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # something is causing the preprocessor to think that values such as
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 101000, 1090, etc. are >= 101200, which in turn is causing the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # compiler to try to #include <os/log.h>. This causes a compile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # error on older macOSes, because this header only exists starting
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # in the macOS 10.12 SDK.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This patch file works around the issue by deleting the problematic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # code. If, in the future, we can discover the real reason why the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # numerical comparison is behaving incorrectly, and find a fix, then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # it might be possible to eliminate the need for this patch file.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append macosx-version-log_h-workaround.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
reinplace "/yasm_paths =/a\\
\\ \"${prefix}/bin/yasm\",\\
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..45fda2cfc18
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</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;'>@@ -0,0 +1,121 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- platform/osx/os_osx.mm.orig 2021-05-24 07:39:13.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ platform/osx/os_osx.mm 2021-11-08 16:09:55.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -48,9 +48,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <IOKit/IOKitLib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <IOKit/hid/IOHIDKeys.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <IOKit/hid/IOHIDLib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <os/log.h>
</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;'>+ #include <dlfcn.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <fcntl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -493,11 +490,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ trackingArea = nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ imeInputEventInProgress = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [self updateTrackingAreas];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [self registerForDraggedTypes:[NSArray arrayWithObject:NSPasteboardTypeFileURL]];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [self registerForDraggedTypes:[NSArray arrayWithObject:NSFilenamesPboardType]];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ markedText = [[NSMutableAttributedString alloc] init];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return self;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -643,18 +636,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Vector<String> files;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSPasteboard *pboard = [sender draggingPasteboard];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NSArray *items = pboard.pasteboardItems;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for (NSPasteboardItem *item in items) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NSString *path = [item stringForType:NSPasteboardTypeFileURL];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NSString *ns = [NSURL URLWithString:path].path;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char *utfs = strdup([ns UTF8String]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- String ret;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ret.parse_utf8(utfs);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- free(utfs);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- files.push_back(ret);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSArray *filenames = [pboard propertyListForType:NSFilenamesPboardType];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (NSString *ns in filenames) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *utfs = strdup([ns UTF8String]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -663,7 +644,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ free(utfs);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ files.push_back(ret);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</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;'>+ if (files.size()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OS_OSX::singleton->main_loop->drop_files(files, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1837,69 +1817,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "OSX";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-class OSXTerminalLogger : public StdLogger {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- virtual void log_error(const char *p_function, const char *p_file, int p_line, const char *p_code, const char *p_rationale, ErrorType p_type = ERR_ERROR) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (!should_log(true)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const char *err_details;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (p_rationale && p_rationale[0])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- err_details = p_rationale;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- err_details = p_code;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- switch (p_type) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- case ERR_WARNING:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (NSAppKitVersionNumber >= NSAppKitVersionNumber10_12) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- os_log_info(OS_LOG_DEFAULT,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "WARNING: %{public}s: %{public}s\nAt: %{public}s:%i.",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- p_function, err_details, p_file, p_line);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- logf_error("\E[1;33mWARNING: %s: \E[0m\E[1m%s\n", p_function,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- err_details);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- logf_error("\E[0;33m At: %s:%i.\E[0m\n", p_file, p_line);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- case ERR_SCRIPT:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (NSAppKitVersionNumber >= NSAppKitVersionNumber10_12) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- os_log_error(OS_LOG_DEFAULT,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "SCRIPT ERROR: %{public}s: %{public}s\nAt: %{public}s:%i.",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- p_function, err_details, p_file, p_line);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- logf_error("\E[1;35mSCRIPT ERROR: %s: \E[0m\E[1m%s\n", p_function,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- err_details);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- logf_error("\E[0;35m At: %s:%i.\E[0m\n", p_file, p_line);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- case ERR_SHADER:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (NSAppKitVersionNumber >= NSAppKitVersionNumber10_12) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- os_log_error(OS_LOG_DEFAULT,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "SHADER ERROR: %{public}s: %{public}s\nAt: %{public}s:%i.",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- p_function, err_details, p_file, p_line);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- logf_error("\E[1;36mSHADER ERROR: %s: \E[0m\E[1m%s\n", p_function,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- err_details);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- logf_error("\E[0;36m At: %s:%i.\E[0m\n", p_file, p_line);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- case ERR_ERROR:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- default:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (NSAppKitVersionNumber >= NSAppKitVersionNumber10_12) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- os_log_error(OS_LOG_DEFAULT,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "ERROR: %{public}s: %{public}s\nAt: %{public}s:%i.",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- p_function, err_details, p_file, p_line);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- logf_error("\E[1;31mERROR: %s: \E[0m\E[1m%s\n", p_function, err_details);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- logf_error("\E[0;31m At: %s:%i.\E[0m\n", p_file, p_line);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef UnixTerminalLogger OSXTerminalLogger;
</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;'>+ void OS_OSX::alert(const String &p_alert, const String &p_title) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (is_no_window_mode_enabled()) {
</span></pre><pre style='margin:0'>
</pre>