<pre style='margin:0'>
Dan Villiom Podlaski Christiansen (danchr) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6c05f836f64f4eb63caf51aa77dd523d7cc20ab1">https://github.com/macports/macports-ports/commit/6c05f836f64f4eb63caf51aa77dd523d7cc20ab1</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 6c05f836f64 Aerial: update to 3.2.3
</span>6c05f836f64 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6c05f836f64f4eb63caf51aa77dd523d7cc20ab1
</span>Author: Dan Villiom Podlaski Christiansen <danchr@gmail.com>
AuthorDate: Fri Mar 3 13:54:39 2023 +0100
<span style='display:block; white-space:pre;color:#404040;'> Aerial: update to 3.2.3
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> While at it, add missing `patch-apisecrets.diff` file that broke the
</span><span style='display:block; white-space:pre;color:#404040;'> diff, and is submitted upstream.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://github.com/JohnCoates/Aerial/pull/1287
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/67098
</span>---
aqua/Aerial/Portfile | 14 +++++-----
aqua/Aerial/files/patch-apisecrets.diff | 22 ++++++++++++++++
aqua/Aerial/files/patch-explicit-self.diff | 4 ++-
aqua/Aerial/files/patch-xcode-dependency.diff | 37 ---------------------------
4 files changed, 33 insertions(+), 44 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/Aerial/Portfile b/aqua/Aerial/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 474bc5622c1..2ce8a795188 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/Aerial/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/Aerial/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup xcode 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup JohnCoates Aerial 3.2.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup JohnCoates Aerial 3.2.3 v
</span>
categories aqua
license MIT
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,16 +18,18 @@ long_description Aerial is a Mac screensaver based on the new \
</span> movies Apple shot over New York, San \
Francisco, Hawaii, China, etc.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # OAuthSwift is used a Git submodule and not included in the archive
distfiles-append OAuthSwift${extract.suffix}:OAuthSwift
master_sites-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- https://github.com/OAuthSwift/OAuthSwift/archive/refs/tags/2.0.0${extract.suffix}?dummy=:OAuthSwift
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ https://github.com/OAuthSwift/OAuthSwift/archive/refs/tags/2.0.0${extract.suffix}?dummy=:OAuthSwift
</span>
checksums [lindex ${distfiles} 0] \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 688fa951c6b73f363adfc8a4813288682bef7c6a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 24cd236d1dd81daef84c35047f9b8e185435adf991018cd3c96f697014e0c0d3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1322798 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OAuthSwift${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 4187c85fd4ec3c4fdee7f7921a9b23b34274b676 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 665ed295a44c6c301c76ab5e9993adac2a79d8d44b970c557edd8b637dbbb420 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1323983 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OAuthSwift.tar.gz \
</span> rmd160 62f8add3f3f305e26a9cd4b423a3375dd27fb2ab \
sha256 1f4c4bfd9057d1b305d70fd7c4fe36520bb62a4bbe1842dffc513dd4a7f3d46b \
size 1221906
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/Aerial/files/patch-apisecrets.diff b/aqua/Aerial/files/patch-apisecrets.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..43c1ff0ad62
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/Aerial/files/patch-apisecrets.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From d9f6951369f5615fd1f0633b19fdeb0f61f4a1af Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Dan Villiom Podlaski Christiansen <danchr@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri, 3 Mar 2023 15:16:06 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Unbreak build straight from Git
</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;'>+ Aerial/Source/Models/API/APISecrets.swift | 2 ++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/Aerial/Source/Models/API/APISecrets.swift b/Aerial/Source/Models/API/APISecrets.swift
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d1db24bc..5a28b33c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Aerial/Source/Models/API/APISecrets.swift
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Aerial/Source/Models/API/APISecrets.swift
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13,6 +13,8 @@ import Foundation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // and still let them be used for everyone in the officially distributed Aerial.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct APISecrets {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static let appleMusicToken = "all"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static let openWeatherAppId = "secrets"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static let yahooAppId = "intentionally"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static let yahooClientId = "left"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static let yahooClientSecret = "empty!"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/Aerial/files/patch-explicit-self.diff b/aqua/Aerial/files/patch-explicit-self.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 9765066196c..c512919c93d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/Aerial/files/patch-explicit-self.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/Aerial/files/patch-explicit-self.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> diff --git Aerial/Source/Views/AerialView.swift Aerial/Source/Views/AerialView.swift
--- Aerial/Source/Views/AerialView.swift
+++ Aerial/Source/Views/AerialView.swift
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -497,16 +497,16 @@ final class AerialView: ScreenSaverView,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -677,17 +677,17 @@ final class AerialView: ScreenSaverView,
</span>
// Descriptions and fades are set when we begin playback
if !self.observerWasSet {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,9 @@ diff --git Aerial/Source/Views/AerialView.swift Aerial/Source/Views/AerialView.s
</span> + self.playerLayer.addObserver(self, forKeyPath: "readyForDisplay", options: .initial, context: nil)
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- sendNotification(video: video)
</span> - setNotifications(currentItem)
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ self.sendNotification(video: video)
</span> + self.setNotifications(currentItem)
player.actionAtItemEnd = AVPlayer.ActionAtItemEnd.none
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/Aerial/files/patch-xcode-dependency.diff b/aqua/Aerial/files/patch-xcode-dependency.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 670d16a44b7..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/Aerial/files/patch-xcode-dependency.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,37 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git Aerial.xcodeproj/project.pbxproj Aerial.xcodeproj/project.pbxproj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Aerial.xcodeproj/project.pbxproj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Aerial.xcodeproj/project.pbxproj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -822,6 +822,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- remoteGlobalIDString = C4D50DF71BFB693F0053B624;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- remoteInfo = OAuthSwiftTests;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 37F36D7524F416130076F3C2 /* PBXContainerItemProxy */ = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ isa = PBXContainerItemProxy;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ containerPortal = 03D2A40A2447401D003ABD30 /* OAuthSwift.xcodeproj */;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ proxyType = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ remoteGlobalIDString = C48B28011AFA598D00C7DEF6;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ remoteInfo = OAuthSwiftMacOS;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FA7199731D94EC5A00FBC99B /* PBXContainerItemProxy */ = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- isa = PBXContainerItemProxy;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- containerPortal = FACAF19C1BD9FC6000E539DC /* Project object */;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1841,6 +1848,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- buildRules = (
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dependencies = (
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 37F36D7624F416130076F3C2 /* PBXTargetDependency */,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- name = Aerial;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- productName = Aerial;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2816,6 +2824,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* End PBXSourcesBuildPhase section */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Begin PBXTargetDependency section */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 37F36D7624F416130076F3C2 /* PBXTargetDependency */ = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ isa = PBXTargetDependency;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ name = OAuthSwiftMacOS;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ targetProxy = 37F36D7524F416130076F3C2 /* PBXContainerItemProxy */;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FA7199741D94EC5A00FBC99B /* PBXTargetDependency */ = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- isa = PBXTargetDependency;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target = FA143CD51BDA3E880041A82B /* AerialApp */;
</span></pre><pre style='margin:0'>
</pre>