<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0eb88c0ae8391c01fade151ad9f3f83f00f00726">https://github.com/macports/macports-ports/commit/0eb88c0ae8391c01fade151ad9f3f83f00f00726</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 0eb88c0ae83 GitUp: update to 1.3.2
</span>0eb88c0ae83 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0eb88c0ae8391c01fade151ad9f3f83f00f00726
</span>Author: Knapoc <Knapoc@users.noreply.github.com>
AuthorDate: Tue Jun 28 22:16:27 2022 +0200
<span style='display:block; white-space:pre;color:#404040;'> GitUp: update to 1.3.2
</span>---
devel/GitUp/Portfile | 10 ++--
devel/GitUp/files/patch-disable-clt-install.diff | 6 +--
devel/GitUp/files/patch-disable-sparkle.diff | 65 +++++++++---------------
3 files changed, 31 insertions(+), 50 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 bf08b6550b2..304acf0406e 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;'>@@ -3,8 +3,8 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup git-up GitUp 1.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 git-up GitUp 1.3.2 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories devel
platforms darwin
license GPL-3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,9 +15,9 @@ long_description GitUp provides features such as a live and interactive r
</span> splitter and many more
homepage https://gitup.co
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 c8c5eab4cf5bfed8abe934d57ea34cb8b8b769f4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3b8934cfd72f6fad899bf95e7e5b983e6a3543e2ce2226005463b5e7f872e216 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 21309896
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 fd7fb6d650908bad247c8f6a1442cba3ff8f15ec \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 34856e9a3b2029e82e33318043a89439ea22c00181e26574448c0738b95001d8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 21312701
</span>
fetch.type git
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/GitUp/files/patch-disable-clt-install.diff b/devel/GitUp/files/patch-disable-clt-install.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b13d2f840e2..52583555b37 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/GitUp/files/patch-disable-clt-install.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/GitUp/files/patch-disable-clt-install.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span> diff --git GitUp/Application/AppDelegate.m GitUp/Application/AppDelegate.m
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2efe0c1..1b0daec 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 1042982..578dd3e 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:#e0ffe0;'>+@@ -253,6 +253,9 @@ - (void)applicationDidFinishLaunching:(NSNotification*)notification {
</span> // First launch has completed
[[NSUserDefaults standardUserDefaults] setBool:NO forKey:kUserDefaultsKey_FirstLaunch];
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> + // Skip command line tool installation
+ [[NSUserDefaults standardUserDefaults] setBool:true forKey:kUserDefaultsKey_SkipInstallCLT];
+
<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 e5c3087e1e5..a6155a8d9e5 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,29 +1,28 @@
</span> diff --git GitUp/Application/AppDelegate.m GitUp/Application/AppDelegate.m
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 4ef4dcb..694fd63 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 1042982..a07370e 100644
</span> --- GitUp/Application/AppDelegate.m
+++ GitUp/Application/AppDelegate.m
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -42,7 +42,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,7 +41,7 @@
</span> #define kToolName @"gitup"
#define kToolInstallPath @"/usr/local/bin/" kToolName
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> -@interface AppDelegate () <NSUserNotificationCenterDelegate, SUUpdaterDelegate>
+@interface AppDelegate () <NSUserNotificationCenterDelegate>
@property(nonatomic, strong) AboutWindowController* aboutWindowController;
@property(nonatomic, strong) CloneWindowController* cloneWindowController;
@property(nonatomic, strong) PreferencesWindowController* preferencesWindowController;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -50,8 +50,6 @@ @interface AppDelegate () <NSUserNotificationCenterDelegate, SUUpdaterDelegate>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -49,7 +49,6 @@ @interface AppDelegate () <NSUserNotificationCenterDelegate, SUUpdaterDelegate>
</span> @end
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> @implementation AppDelegate {
- SUUpdater* _updater;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- BOOL _updatePending;
</span> BOOL _manualCheck;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> CFMessagePortRef _messagePort;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73,20 +71,9 @@ - (CloneWindowController*)cloneWindowController {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -71,20 +70,9 @@ - (CloneWindowController*)cloneWindowController {
</span> return _cloneWindowController;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> -- (void)didChangeReleaseChannel:(BOOL)didChange {
- if (didChange) {
- _manualCheck = NO;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +40,7 @@ index 4ef4dcb..694fd63 100644
</span> }
return _preferencesWindowController;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -112,7 +99,6 @@ + (void)initialize {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -110,7 +98,6 @@ + (void)initialize {
</span> GICommitMessageViewUserDefaultKey_ShowMargins : @(YES),
GICommitMessageViewUserDefaultKey_EnableSpellChecking : @(YES),
GIUserDefaultKey_FontSize : @(GIDefaultFontSize),
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,48 +48,39 @@ index 4ef4dcb..694fd63 100644
</span> kUserDefaultsKey_CheckInterval : @(15 * 60),
kUserDefaultsKey_FirstLaunch : @(YES),
kUserDefaultsKey_DiffWhitespaceMode : @(kGCLiveRepositoryDiffWhitespaceMode_Normal),
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -193,19 +179,6 @@ - (void)applicationWillFinishLaunching:(NSNotification*)notification {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -196,18 +183,6 @@ - (void)applicationWillFinishLaunching:(NSNotification*)notification {
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> - (void)applicationDidFinishLaunching:(NSNotification*)notification {
-#if !DEBUG
- // Initialize Sparkle and check for update immediately
- if (![[NSUserDefaults standardUserDefaults] boolForKey:kUserDefaultsKey_DisableSparkle]) {
- _updater = [SUUpdater sharedUpdater];
- _updater.delegate = self;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- _updater.automaticallyChecksForUpdates = NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _updater.automaticallyChecksForUpdates = YES;
</span> - _updater.sendsSystemProfile = NO;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- _updater.automaticallyDownloadsUpdates = YES;
</span> -
- _manualCheck = NO;
- [_updater checkForUpdatesInBackground];
- }
-#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> // Locate installed apps.
[GILaunchServicesLocator setup];
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -367,9 +340,6 @@ - (NSDictionary*)_processToolCommand:(NSDictionary*)input {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -354,9 +329,6 @@ - (NSDictionary*)_processToolCommand:(NSDictionary*)input {
</span> #pragma mark - Actions
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (BOOL)validateUserInterfaceItem:(id<NSValidatedUserInterfaceItem>)anItem {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (anItem.action == @selector(checkForUpdates:)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 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;'>+ - (BOOL)validateMenuItem:(NSMenuItem*)menuItem {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (menuItem.action == @selector(checkForUpdates:)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return [_updater validateMenuItem:menuItem];
</span> - }
return YES;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -390,7 +360,6 @@ - (IBAction)viewIssues:(id)sender {
</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;'>- - (IBAction)showAboutPanel:(id)sender {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- self.aboutWindowController.updatePending = _updatePending;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [self.aboutWindowController showWindow:nil];
</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;'>-@@ -472,11 +441,6 @@ - (IBAction)dimissModal:(id)sender {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -462,11 +434,6 @@ - (IBAction)dimissModal:(id)sender {
</span> [[(NSButton*)sender window] orderOut:nil];
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> -- (IBAction)checkForUpdates:(id)sender {
- _manualCheck = YES;
- [_updater checkForUpdatesInBackground];
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -99,10 +89,10 @@ index 4ef4dcb..694fd63 100644
</span> - (IBAction)installTool:(id)sender {
AuthorizationRef authorization;
OSStatus status = AuthorizationCreate(NULL, kAuthorizationEmptyEnvironment, kAuthorizationFlagDefaults, &authorization);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -536,55 +500,4 @@ - (void)userNotificationCenter:(NSUserNotificationCenter*)center didActivateNoti
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -526,46 +493,4 @@ - (void)userNotificationCenter:(NSUserNotificationCenter*)center didActivateNoti
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> -#pragma mark - SUUpdaterDelegate
-
-- (NSString*)feedURLStringForUpdater:(SUUpdater*)updater {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -113,14 +103,6 @@ index 4ef4dcb..694fd63 100644
</span> -- (void)updater:(SUUpdater*)updater didFindValidUpdate:(SUAppcastItem*)item {
- NSString* channel = [[NSUserDefaults standardUserDefaults] stringForKey:kUserDefaultsKey_ReleaseChannel];
- XLOG_INFO(@"Did find app update on channel '%@' for version %@", channel, item.versionString);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (_manualCheck) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NSAlert* alert = [[NSAlert alloc] init];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- alert.messageText = NSLocalizedString(@"A GitUp update is available!", nil);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 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:#ffe0e0;'>-- [alert addButtonWithTitle:NSLocalizedString(@"OK", nil)];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- alert.type = kGIAlertType_Note;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [alert runModal];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span> -}
-
-- (void)updaterDidNotFindUpdate:(SUUpdater*)updater {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -148,7 +130,6 @@ index 4ef4dcb..694fd63 100644
</span> -
-- (void)updater:(SUUpdater*)updater willInstallUpdateOnQuit:(SUAppcastItem*)item immediateInstallationInvocation:(NSInvocation*)invocation {
- XLOG_INFO(@"Will install app update for version %@ on quit", item.versionString);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- _updatePending = YES;
</span> - [self _showNotificationWithTitle:NSLocalizedString(@"Update Available", nil)
- action:NULL
- message:NSLocalizedString(@"Relaunch GitUp to update to version %@ (%@).", nil), item.displayVersionString, item.versionString];
</pre><pre style='margin:0'>
</pre>