<pre style='margin:0'>
Zero King (l2dy) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9687c2c45447f5ca0dd2e5170634949f7736057f">https://github.com/macports/macports-ports/commit/9687c2c45447f5ca0dd2e5170634949f7736057f</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 9687c2c4544 poedit: fix Xcode 13 compile issues
</span>9687c2c4544 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 9687c2c45447f5ca0dd2e5170634949f7736057f
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Sun Oct 10 10:42:02 2021 +0000

<span style='display:block; white-space:pre;color:#404040;'>    poedit: fix Xcode 13 compile issues
</span>---
 editors/poedit/Portfile                           |  2 +-
 editors/poedit/files/patch-builtin_available.diff | 13 ------------
 editors/poedit/files/patch-xcode12-fix.diff       | 25 +++++++++++++++++++++++
 3 files changed, 26 insertions(+), 14 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/poedit/Portfile b/editors/poedit/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 52f0bb17cd0..62879db414f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/poedit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/poedit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +35,7 @@ post-fetch {
</span> }
 
 patchfiles          patch-deps-tool-path.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    patch-builtin_available.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-xcode12-fix.diff \
</span>                     patch-remove-sparkle.diff
 
 if {${configure.sdkroot} eq ""} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/poedit/files/patch-builtin_available.diff b/editors/poedit/files/patch-builtin_available.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index cc5bff8b9c7..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/poedit/files/patch-builtin_available.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/manager.cpp src/manager.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index a98d24fc0..49bf3111a 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/manager.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/manager.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -123,7 +123,7 @@ ManagerFrame::ManagerFrame() :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     m_listPrj = new wxListBox(panel, wxID_ANY, wxDefaultPosition, wxSize(PX(200), -1), 0, nullptr, MSW_OR_OTHER(wxBORDER_SIMPLE, wxBORDER_SUNKEN));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef __WXOSX__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   #if __MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_16
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    if (@available(macOS 11.0, *))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    if (__builtin_available(macOS 11.0, *))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         ((NSTableView*)[((NSScrollView*)m_listPrj->GetHandle()) documentView]).style = NSTableViewStyleFullWidth;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/poedit/files/patch-xcode12-fix.diff b/editors/poedit/files/patch-xcode12-fix.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..fa9ac261358
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/poedit/files/patch-xcode12-fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 07631894b149ba513f55cb9970c46ad57a078355 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: =?UTF-8?q?Va=CC=81clav=20Slavi=CC=81k?= <vaclav@slavik.io>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 9 Oct 2021 18:25:25 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Fix compilation with Xcode 12.5+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Mark manager.cpp as containing Objective-C++.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fixes #717
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Poedit.xcodeproj/project.pbxproj | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Poedit.xcodeproj/project.pbxproj Poedit.xcodeproj/project.pbxproj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3e86f63862..944f1843bc 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Poedit.xcodeproj/project.pbxproj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Poedit.xcodeproj/project.pbxproj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -450,7 +450,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           B28F1CC316F629D30018AF7E /* findframe.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = findframe.h; sourceTree = "<group>"; };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           B28F1CC416F629D30018AF7E /* gexecute.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gexecute.cpp; sourceTree = "<group>"; };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           B28F1CC516F629D30018AF7E /* gexecute.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gexecute.h; sourceTree = "<group>"; };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-          B28F1CCA16F629D30018AF7E /* manager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = manager.cpp; sourceTree = "<group>"; };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++          B28F1CCA16F629D30018AF7E /* manager.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = manager.cpp; sourceTree = "<group>"; };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           B28F1CCB16F629D30018AF7E /* manager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = manager.h; sourceTree = "<group>"; };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           B28F1CCC16F629D30018AF7E /* macos_helpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = macos_helpers.h; sourceTree = "<group>"; };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           B28F1CCD16F629D30018AF7E /* macos_helpers.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = macos_helpers.mm; sourceTree = "<group>"; };
</span></pre><pre style='margin:0'>

</pre>