<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/761da34a1a46c464a95a8fd1d0edac3ce10901bc">https://github.com/macports/macports-ports/commit/761da34a1a46c464a95a8fd1d0edac3ce10901bc</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 761da34a1a4 GitUp: update patch to remove sparkle
</span>761da34a1a4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 761da34a1a46c464a95a8fd1d0edac3ce10901bc
</span>Author: Knapoc <Knapoc@users.noreply.github.com>
AuthorDate: Mon Nov 1 10:59:14 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> GitUp: update patch to remove sparkle
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * updates the patch to remove sparkle for good
</span><span style='display:block; white-space:pre;color:#404040;'> * fixes maintainer handle
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/63684
</span>---
devel/GitUp/Portfile | 3 +-
devel/GitUp/files/patch-disable-sparkle.diff | 165 +++++++++++++++++++++++++--
2 files changed, 156 insertions(+), 12 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/GitUp/Portfile b/devel/GitUp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8f6eb8551c2..cb77cfba532 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/GitUp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/GitUp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,11 +18,12 @@ if {[vercmp $xcodeversion 12.2] < 0 || ${os.major} < 20} {
</span> }
github.setup git-up GitUp ${version} v
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
categories devel
platforms darwin
license GPL-3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {@knapoc knapoc} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers @Knapoc openmaintainer
</span> description GitUp is a native macOS git client
long_description GitUp provides features such as a live and interactive repo graph \
unlimited redo/undo, snapshots for 1-click rollbacks, visual commit \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/GitUp/files/patch-disable-sparkle.diff b/devel/GitUp/files/patch-disable-sparkle.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 40707c8e607..e5c3087e1e5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/GitUp/files/patch-disable-sparkle.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/GitUp/files/patch-disable-sparkle.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +1,160 @@
</span> diff --git GitUp/Application/AppDelegate.m GitUp/Application/AppDelegate.m
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2efe0c1..3a1908f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4ef4dcb..694fd63 100644
</span> --- GitUp/Application/AppDelegate.m
+++ GitUp/Application/AppDelegate.m
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -265,6 +265,9 @@ - (void)applicationDidFinishLaunching:(NSNotification*)notification {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // First launch has completed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [[NSUserDefaults standardUserDefaults] setBool:NO forKey:kUserDefaultsKey_FirstLaunch];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Disable sparkle
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [[NSUserDefaults standardUserDefaults] setBool:true forKey:kUserDefaultsKey_DisableSparkle];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Create tool message port
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFMessagePortContext context = {0, (__bridge void*)self, NULL, NULL, NULL};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _messagePort = CFMessagePortCreateLocal(kCFAllocatorDefault, CFSTR(kToolPortName), _MessagePortCallBack, &context, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -42,7 +42,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define kToolName @"gitup"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define kToolInstallPath @"/usr/local/bin/" kToolName
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-@interface AppDelegate () <NSUserNotificationCenterDelegate, SUUpdaterDelegate>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@interface AppDelegate () <NSUserNotificationCenterDelegate>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @property(nonatomic, strong) AboutWindowController* aboutWindowController;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @property(nonatomic, strong) CloneWindowController* cloneWindowController;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @property(nonatomic, strong) PreferencesWindowController* preferencesWindowController;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -50,8 +50,6 @@ @interface AppDelegate () <NSUserNotificationCenterDelegate, SUUpdaterDelegate>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @implementation AppDelegate {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SUUpdater* _updater;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOL _updatePending;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BOOL _manualCheck;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFMessagePortRef _messagePort;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -73,20 +71,9 @@ - (CloneWindowController*)cloneWindowController {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return _cloneWindowController;
</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;'>+-- (void)didChangeReleaseChannel:(BOOL)didChange {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (didChange) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _manualCheck = NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [_updater checkForUpdatesInBackground];
</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;'>+ - (PreferencesWindowController*)preferencesWindowController {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!_preferencesWindowController) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _preferencesWindowController = [[PreferencesWindowController alloc] init];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- __weak typeof(self) weakSelf = self;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _preferencesWindowController.didChangeReleaseChannel = ^(BOOL didChange) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [weakSelf didChangeReleaseChannel:didChange];
</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;'>+ return _preferencesWindowController;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -112,7 +99,6 @@ + (void)initialize {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GICommitMessageViewUserDefaultKey_ShowMargins : @(YES),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GICommitMessageViewUserDefaultKey_EnableSpellChecking : @(YES),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GIUserDefaultKey_FontSize : @(GIDefaultFontSize),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- kUserDefaultsKey_ReleaseChannel : PreferencesWindowController_ReleaseChannel_Stable,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kUserDefaultsKey_CheckInterval : @(15 * 60),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kUserDefaultsKey_FirstLaunch : @(YES),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kUserDefaultsKey_DiffWhitespaceMode : @(kGCLiveRepositoryDiffWhitespaceMode_Normal),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -193,19 +179,6 @@ - (void)applicationWillFinishLaunching:(NSNotification*)notification {
</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;'>+ - (void)applicationDidFinishLaunching:(NSNotification*)notification {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !DEBUG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // Initialize Sparkle and check for update immediately
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (![[NSUserDefaults standardUserDefaults] boolForKey:kUserDefaultsKey_DisableSparkle]) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _updater = [SUUpdater sharedUpdater];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _updater.delegate = self;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _updater.automaticallyChecksForUpdates = NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _updater.sendsSystemProfile = NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _updater.automaticallyDownloadsUpdates = YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _manualCheck = NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [_updater checkForUpdatesInBackground];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Locate installed apps.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [GILaunchServicesLocator setup];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -367,9 +340,6 @@ - (NSDictionary*)_processToolCommand:(NSDictionary*)input {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma mark - Actions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (BOOL)validateUserInterfaceItem:(id<NSValidatedUserInterfaceItem>)anItem {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (anItem.action == @selector(checkForUpdates:)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return _updater && !_updatePending && ![_updater updateInProgress];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return YES;
</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;'>+@@ -390,7 +360,6 @@ - (IBAction)viewIssues:(id)sender {
</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;'>+ - (IBAction)showAboutPanel:(id)sender {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- self.aboutWindowController.updatePending = _updatePending;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [self.aboutWindowController showWindow:nil];
</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;'>+@@ -472,11 +441,6 @@ - (IBAction)dimissModal:(id)sender {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [[(NSButton*)sender window] orderOut:nil];
</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;'>+-- (IBAction)checkForUpdates:(id)sender {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _manualCheck = YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [_updater checkForUpdatesInBackground];
</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;'>+ - (IBAction)installTool:(id)sender {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AuthorizationRef authorization;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OSStatus status = AuthorizationCreate(NULL, kAuthorizationEmptyEnvironment, kAuthorizationFlagDefaults, &authorization);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -536,55 +500,4 @@ - (void)userNotificationCenter:(NSUserNotificationCenter*)center didActivateNoti
</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;'>+-#pragma mark - SUUpdaterDelegate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-- (NSString*)feedURLStringForUpdater:(SUUpdater*)updater {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NSString* channel = [[NSUserDefaults standardUserDefaults] stringForKey:kUserDefaultsKey_ReleaseChannel];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return [NSString stringWithFormat:kURL_AppCast, channel];
</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;'>+-- (void)updater:(SUUpdater*)updater didFindValidUpdate:(SUAppcastItem*)item {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NSString* channel = [[NSUserDefaults standardUserDefaults] stringForKey:kUserDefaultsKey_ReleaseChannel];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XLOG_INFO(@"Did find app update on channel '%@' for version %@", channel, item.versionString);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (_manualCheck) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NSAlert* alert = [[NSAlert alloc] init];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- alert.messageText = NSLocalizedString(@"A GitUp update is available!", nil);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- alert.informativeText = NSLocalizedString(@"The update will download automatically in the background and be installed when you quit GitUp.", nil);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [alert addButtonWithTitle:NSLocalizedString(@"OK", nil)];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- alert.type = kGIAlertType_Note;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [alert runModal];
</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;'>+-- (void)updaterDidNotFindUpdate:(SUUpdater*)updater {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NSString* channel = [[NSUserDefaults standardUserDefaults] stringForKey:kUserDefaultsKey_ReleaseChannel];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XLOG_VERBOSE(@"App is up-to-date at version %@ on channel '%@'", [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"], channel);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (_manualCheck) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NSAlert* alert = [[NSAlert alloc] init];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- alert.messageText = NSLocalizedString(@"GitUp is already up-to-date!", nil);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [alert addButtonWithTitle:NSLocalizedString(@"OK", nil)];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- alert.type = kGIAlertType_Note;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [alert runModal];
</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;'>+-- (void)updater:(SUUpdater*)updater didAbortWithError:(NSError*)error {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NSString* channel = [[NSUserDefaults standardUserDefaults] stringForKey:kUserDefaultsKey_ReleaseChannel];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (![error.domain isEqualToString:SUSparkleErrorDomain] || (error.code != SUNoUpdateError)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XLOG_ERROR(@"App update on channel '%@' aborted: %@", channel, error);
</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;'>+-- (void)updater:(SUUpdater*)updater willInstallUpdate:(SUAppcastItem*)item {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XLOG_INFO(@"Installing app update for version %@", item.versionString);
</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;'>+-- (void)updater:(SUUpdater*)updater willInstallUpdateOnQuit:(SUAppcastItem*)item immediateInstallationInvocation:(NSInvocation*)invocation {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XLOG_INFO(@"Will install app update for version %@ on quit", item.versionString);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _updatePending = YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [self _showNotificationWithTitle:NSLocalizedString(@"Update Available", nil)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- action:NULL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message:NSLocalizedString(@"Relaunch GitUp to update to version %@ (%@).", nil), item.displayVersionString, item.versionString];
</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;'>+ @end
</span> diff --git GitUp/Application/Base.lproj/MainMenu.xib GitUp/Application/Base.lproj/MainMenu.xib
index 528efb4..711833c 100644
--- GitUp/Application/Base.lproj/MainMenu.xib
</pre><pre style='margin:0'>
</pre>