<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/d310bf882b1d7cbff5e18bffdd3b96b731427c12">https://github.com/macports/macports-ports/commit/d310bf882b1d7cbff5e18bffdd3b96b731427c12</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 d310bf882b1 godot: update patchfile line numbers
</span>d310bf882b1 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d310bf882b1d7cbff5e18bffdd3b96b731427c12
</span>Author: Jason Liu <jasonliu--@users.noreply.github.com>
AuthorDate: Wed Dec 22 19:34:24 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> godot: update patchfile line numbers
</span>---
.../files/macosx-version-log_h-workaround.diff | 49 ++++++++++------------
1 file changed, 23 insertions(+), 26 deletions(-)
<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 45fda2cfc18..6b77e894a7e 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,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- platform/osx/os_osx.mm.orig 2021-05-24 07:39:13.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ platform/osx/os_osx.mm 2021-11-08 16:09:55.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- platform/osx/os_osx.mm.orig 2021-11-04 20:06:19.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ platform/osx/os_osx.mm 2021-12-22 19:26:10.000000000 -0500
</span> @@ -48,9 +48,6 @@
#include <IOKit/IOKitLib.h>
#include <IOKit/hid/IOHIDKeys.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@
</span>
#include <dlfcn.h>
#include <fcntl.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -493,11 +490,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -491,11 +488,7 @@
</span> trackingArea = nil;
imeInputEventInProgress = false;
[self updateTrackingAreas];
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +22,7 @@
</span> markedText = [[NSMutableAttributedString alloc] init];
return self;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -643,18 +636,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -641,18 +634,6 @@
</span> Vector<String> files;
NSPasteboard *pboard = [sender draggingPasteboard];
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +41,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;'>-@@ -663,7 +644,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -661,7 +642,6 @@
</span> free(utfs);
files.push_back(ret);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +49,7 @@
</span>
if (files.size()) {
OS_OSX::singleton->main_loop->drop_files(files, 0);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1837,69 +1817,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1813,66 +1793,8 @@
</span> return "OSX";
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,49 +71,46 @@
</span> - case ERR_WARNING:
- if (NSAppKitVersionNumber >= NSAppKitVersionNumber10_12) {
- os_log_info(OS_LOG_DEFAULT,
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- "WARNING: %{public}s: %{public}s\nAt: %{public}s:%i.",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- p_function, err_details, p_file, p_line);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "WARNING: %{public}s\nat: %{public}s (%{public}s:%i)",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- err_details, p_function, p_file, p_line);
</span> - }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- logf_error("\E[1;33mWARNING: %s: \E[0m\E[1m%s\n", p_function,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- err_details);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 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;'>+- logf_error("\E[1;33mWARNING:\E[0;93m %s\n", err_details);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- logf_error("\E[0;90m at: %s (%s:%i)\E[0m\n", p_function, p_file, p_line);
</span> - break;
- case ERR_SCRIPT:
- if (NSAppKitVersionNumber >= NSAppKitVersionNumber10_12) {
- os_log_error(OS_LOG_DEFAULT,
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- "SCRIPT ERROR: %{public}s: %{public}s\nAt: %{public}s:%i.",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- p_function, err_details, p_file, p_line);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "SCRIPT ERROR: %{public}s\nat: %{public}s (%{public}s:%i)",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- err_details, p_function, p_file, p_line);
</span> - }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- logf_error("\E[1;35mSCRIPT ERROR: %s: \E[0m\E[1m%s\n", p_function,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- err_details);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 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;'>+- logf_error("\E[1;35mSCRIPT ERROR:\E[0;95m %s\n", err_details);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- logf_error("\E[0;90m at: %s (%s:%i)\E[0m\n", p_function, p_file, p_line);
</span> - break;
- case ERR_SHADER:
- if (NSAppKitVersionNumber >= NSAppKitVersionNumber10_12) {
- os_log_error(OS_LOG_DEFAULT,
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- "SHADER ERROR: %{public}s: %{public}s\nAt: %{public}s:%i.",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- p_function, err_details, p_file, p_line);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "SHADER ERROR: %{public}s\nat: %{public}s (%{public}s:%i)",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- err_details, p_function, p_file, p_line);
</span> - }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- logf_error("\E[1;36mSHADER ERROR: %s: \E[0m\E[1m%s\n", p_function,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- err_details);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 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;'>+- logf_error("\E[1;36mSHADER ERROR:\E[0;96m %s\n", err_details);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- logf_error("\E[0;90m at: %s (%s:%i)\E[0m\n", p_function, p_file, p_line);
</span> - break;
- case ERR_ERROR:
- default:
- if (NSAppKitVersionNumber >= NSAppKitVersionNumber10_12) {
- os_log_error(OS_LOG_DEFAULT,
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- "ERROR: %{public}s: %{public}s\nAt: %{public}s:%i.",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- p_function, err_details, p_file, p_line);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "ERROR: %{public}s\nat: %{public}s (%{public}s:%i)",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- err_details, p_function, p_file, p_line);
</span> - }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- 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:#ffe0e0;'>-- 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;'>+- logf_error("\E[1;31mERROR:\E[0;91m %s\n", err_details);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- logf_error("\E[0;90m at: %s (%s:%i)\E[0m\n", p_function, p_file, p_line);
</span> - break;
- }
- }
-};
-
-#else
<span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> typedef UnixTerminalLogger OSXTerminalLogger;
-#endif
</pre><pre style='margin:0'>
</pre>