<pre style='margin:0'>
Leonardo Brondani Schenkel (lbschenkel) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/de3da7cd5eb49f3affb191910de2cb824b1fa8a7">https://github.com/macports/macports-ports/commit/de3da7cd5eb49f3affb191910de2cb824b1fa8a7</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 de3da7cd5eb syncthing-macos: update to 1.6.1-1, take ownership
</span>de3da7cd5eb is described below
<span style='display:block; white-space:pre;color:#808000;'>commit de3da7cd5eb49f3affb191910de2cb824b1fa8a7
</span>Author: Leonardo Brondani Schenkel <lbschenkel@macports.org>
AuthorDate: Thu Jun 18 16:25:32 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> syncthing-macos: update to 1.6.1-1, take ownership
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> In addition, drop old patch.
</span>---
net/syncthing-macos/Portfile | 16 +++-----
net/syncthing-macos/files/swift4-upgrade.patch | 56 --------------------------
2 files changed, 5 insertions(+), 67 deletions(-)
<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 cf838da66ca..1f7800556a0 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;'>@@ -3,15 +3,14 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup syncthing syncthing-macos 1.0.0-2 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup syncthing syncthing-macos 1.6.1-1 v
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 d03ca0944889cbd9cac7426cfc178cf45873734a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3fb4bb66b836a3f0f33162eccfb65ae91ad0a56904b1a127a880183674160418 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7482753
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 26f6e9d6b946dd92e598bf9695e8454e8508a93c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 030e09533e98da4dcd93711979d73dcb15cff5613e86bad9a62884dcd4da18f3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7476572
</span>
categories net aqua
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {@lbschenkel lbschenkel} openmaintainer
</span>
description Frugal and native macOS Syncthing application bundle
long_description ${description}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,13 +21,8 @@ license MIT
</span> depends_lib-append port:syncthing
patchfiles no-bundled-syncthing.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- swift4-upgrade.patch \
</span> disable-autoupdatechecks.patch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__PREFIX__|${prefix}|" ${worksrcpath}/syncthing/STApplication.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> use_configure no
use_xcode yes
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5ed19faff80..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/syncthing-macos/files/swift4-upgrade.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,56 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git syncthing.xcodeproj/project.pbxproj syncthing.xcodeproj/project.pbxproj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 426d594..ee7c276 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- syncthing.xcodeproj/project.pbxproj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ syncthing.xcodeproj/project.pbxproj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -640,7 +640,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SEPARATE_STRIP = NO;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SWIFT_OBJC_BRIDGING_HEADER = "syncthing/syncthing-Bridging-Header.h";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SWIFT_OPTIMIZATION_LEVEL = "-Onone";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SWIFT_VERSION = 3.0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SWIFT_VERSION = 4.0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VALID_ARCHS = x86_64;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- name = Debug;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -669,7 +669,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PROVISIONING_PROFILE_SPECIFIER = "";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SEPARATE_STRIP = YES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SWIFT_OBJC_BRIDGING_HEADER = "syncthing/syncthing-Bridging-Header.h";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SWIFT_VERSION = 3.0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SWIFT_VERSION = 4.0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VALID_ARCHS = x86_64;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- name = Release;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git syncthing/DaemonProcess.swift syncthing/DaemonProcess.swift
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index da88642..da29cb6 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- syncthing/DaemonProcess.swift
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ syncthing/DaemonProcess.swift
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23,25 +23,25 @@ let MaxKeepLogLines = 200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- private var queue = DispatchQueue(label: "DaemonProcess")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- private var shouldTerminate = false
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- init(path: String, delegate: DaemonProcessDelegate) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @objc init(path: String, delegate: DaemonProcessDelegate) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.path = path
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.delegate = delegate
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- func launch() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @objc func launch() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- queue.async {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.launchSync()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- func terminate() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @objc func terminate() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- queue.async {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.shouldTerminate = true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.process?.terminate()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- func restart() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @objc func restart() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- queue.async {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Syncthing should exit cleanly when sent the interrupt signal. It will then be restarted.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.process?.interrupt()
</span></pre><pre style='margin:0'>
</pre>