<pre style='margin:0'>
Chih-Hsuan Yen (yan12125) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ce42bb8c46dce461c763649ff18661a203507bae">https://github.com/macports/macports-ports/commit/ce42bb8c46dce461c763649ff18661a203507bae</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ce42bb8c46dce461c763649ff18661a203507bae
</span>Author: Knapoc <Knapoc@users.noreply.github.com>
AuthorDate: Mon Feb 17 18:24:55 2020 +0100

<span style='display:block; white-space:pre;color:#404040;'>    Add patch to upgrade source to Swift 4
</span>---
 net/syncthing-macos/Portfile                   |  3 +-
 net/syncthing-macos/files/swift4-upgrade.patch | 56 ++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 1 deletion(-)

<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 b5d5eb9..26e7bc5 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;'>@@ -20,7 +20,8 @@ license                 MIT
</span> 
 depends_lib-append      port:syncthing
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles              no-bundled-syncthing.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles              no-bundled-syncthing.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        swift4-upgrade.patch
</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/swift4-upgrade.patch b/net/syncthing-macos/files/swift4-upgrade.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..5ed19fa
</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/swift4-upgrade.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,56 @@
</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 426d594..ee7c276 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;'>+@@ -640,7 +640,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           SEPARATE_STRIP = NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           SWIFT_OBJC_BRIDGING_HEADER = "syncthing/syncthing-Bridging-Header.h";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           SWIFT_OPTIMIZATION_LEVEL = "-Onone";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                          SWIFT_VERSION = 3.0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                          SWIFT_VERSION = 4.0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           VALID_ARCHS = x86_64;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   name = Debug;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -669,7 +669,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           PROVISIONING_PROFILE_SPECIFIER = "";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           SEPARATE_STRIP = YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           SWIFT_OBJC_BRIDGING_HEADER = "syncthing/syncthing-Bridging-Header.h";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                          SWIFT_VERSION = 3.0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                          SWIFT_VERSION = 4.0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           VALID_ARCHS = x86_64;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   name = Release;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git syncthing/DaemonProcess.swift syncthing/DaemonProcess.swift
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index da88642..da29cb6 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- syncthing/DaemonProcess.swift
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ syncthing/DaemonProcess.swift
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,25 +23,25 @@ let MaxKeepLogLines = 200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     private var queue = DispatchQueue(label: "DaemonProcess")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     private var shouldTerminate = false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    init(path: String, delegate: DaemonProcessDelegate) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    @objc init(path: String, delegate: DaemonProcessDelegate) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         self.path = path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         self.delegate = delegate
</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;'>+-    func launch() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    @objc func launch() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         queue.async {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             self.launchSync()
</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;'>+-    func terminate() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    @objc func terminate() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         queue.async {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             self.shouldTerminate = true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             self.process?.terminate()
</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;'>+-    func restart() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    @objc func restart() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         queue.async {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             // Syncthing should exit cleanly when sent the interrupt signal. It will then be restarted.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             self.process?.interrupt()
</span></pre><pre style='margin:0'>

</pre>