<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/51f627d0040867e2b1bec344fe15214d4df6f860">https://github.com/macports/macports-ports/commit/51f627d0040867e2b1bec344fe15214d4df6f860</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 51f627d0040 syncthing-macos: fix building with XCode >= 14.3
</span>51f627d0040 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 51f627d0040867e2b1bec344fe15214d4df6f860
</span>Author: Knapoc <Knapoc@users.noreply.github.com>
AuthorDate: Fri Jul 28 13:45:23 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> syncthing-macos: fix building with XCode >= 14.3
</span>---
net/syncthing-macos/Portfile | 4 +
.../files/patch-fix-ventura-build.diff | 98 ++++++++++++++++++++++
2 files changed, 102 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/syncthing-macos/Portfile b/net/syncthing-macos/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 54daf9a00c7..e153ab2833b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/syncthing-macos/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/syncthing-macos/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,6 +25,10 @@ depends_lib-append port:syncthing
</span> patchfiles-append patch-no-bundled-syncthing.diff \
patch-disable-autoupdatechecks.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp $xcodeversion 14.3] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-fix-ventura-build.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 "s|__PREFIX__|${prefix}|" ${worksrcpath}/syncthing/STApplication.m
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/syncthing-macos/files/patch-fix-ventura-build.diff b/net/syncthing-macos/files/patch-fix-ventura-build.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a31d898a131
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/syncthing-macos/files/patch-fix-ventura-build.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,98 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Pods/Pods.xcodeproj/project.pbxproj Pods/Pods.xcodeproj/project.pbxproj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index db3a9b1..9013910 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Pods/Pods.xcodeproj/project.pbxproj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Pods/Pods.xcodeproj/project.pbxproj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -330,7 +330,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GCC_WARN_UNUSED_FUNCTION = YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GCC_WARN_UNUSED_VARIABLE = YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MACOSX_DEPLOYMENT_TARGET = 10.10;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MACOSX_DEPLOYMENT_TARGET = 10.13;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MTL_ENABLE_DEBUG_INFO = NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MTL_FAST_MATH = YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PRODUCT_NAME = "$(TARGET_NAME)";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -353,7 +353,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXECUTABLE_PREFIX = lib;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MACH_O_TYPE = staticlib;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MACOSX_DEPLOYMENT_TARGET = 10.10;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MACOSX_DEPLOYMENT_TARGET = 10.13;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ONLY_ACTIVE_ARCH = NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OTHER_LDFLAGS = "";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OTHER_LIBTOOLFLAGS = "";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -373,7 +373,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMBINE_HIDPI_IMAGES = YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MACOSX_DEPLOYMENT_TARGET = 10.10;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MACOSX_DEPLOYMENT_TARGET = 10.13;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ONLY_ACTIVE_ARCH = NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SDKROOT = macosx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -432,7 +432,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GCC_WARN_UNUSED_FUNCTION = YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GCC_WARN_UNUSED_VARIABLE = YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MACOSX_DEPLOYMENT_TARGET = 10.10;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MACOSX_DEPLOYMENT_TARGET = 10.13;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MTL_FAST_MATH = YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ONLY_ACTIVE_ARCH = YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -457,7 +457,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXECUTABLE_PREFIX = lib;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MACH_O_TYPE = staticlib;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MACOSX_DEPLOYMENT_TARGET = 10.10;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MACOSX_DEPLOYMENT_TARGET = 10.13;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ONLY_ACTIVE_ARCH = NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OTHER_LDFLAGS = "";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OTHER_LIBTOOLFLAGS = "";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -477,7 +477,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMBINE_HIDPI_IMAGES = YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MACOSX_DEPLOYMENT_TARGET = 10.10;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MACOSX_DEPLOYMENT_TARGET = 10.13;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ONLY_ACTIVE_ARCH = NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SDKROOT = macosx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git syncthing.xcodeproj/project.pbxproj syncthing.xcodeproj/project.pbxproj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b01cc9b..578ae51 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- syncthing.xcodeproj/project.pbxproj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ syncthing.xcodeproj/project.pbxproj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -495,7 +495,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GCC_WARN_UNUSED_FUNCTION = YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GCC_WARN_UNUSED_VARIABLE = YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HEADER_SEARCH_PATHS = "$(SRCROOT)/syncthing/Test";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MACOSX_DEPLOYMENT_TARGET = 10.10;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MACOSX_DEPLOYMENT_TARGET = 10.13;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MTL_ENABLE_DEBUG_INFO = YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ONLY_ACTIVE_ARCH = YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SDKROOT = macosx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -548,7 +548,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GCC_WARN_UNUSED_FUNCTION = YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GCC_WARN_UNUSED_VARIABLE = YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HEADER_SEARCH_PATHS = "$(SRCROOT)/syncthing/Test";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MACOSX_DEPLOYMENT_TARGET = 10.10;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MACOSX_DEPLOYMENT_TARGET = 10.13;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MTL_ENABLE_DEBUG_INFO = NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ONLY_ACTIVE_ARCH = NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SDKROOT = macosx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -574,7 +574,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INFOPLIST_FILE = syncthing/Info.plist;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MACOSX_DEPLOYMENT_TARGET = 10.10;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MACOSX_DEPLOYMENT_TARGET = 10.13;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PRODUCT_BUNDLE_IDENTIFIER = "com.github.xor-gate.syncthing-macosx";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PRODUCT_NAME = Syncthing;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PROVISIONING_PROFILE = "";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -605,7 +605,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INFOPLIST_FILE = syncthing/Info.plist;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MACOSX_DEPLOYMENT_TARGET = 10.10;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MACOSX_DEPLOYMENT_TARGET = 10.13;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PRODUCT_BUNDLE_IDENTIFIER = "com.github.xor-gate.syncthing-macosx";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PRODUCT_NAME = Syncthing;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PROVISIONING_PROFILE = "";
</span></pre><pre style='margin:0'>
</pre>