<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/8dae9d8626b5a8a405c4729d9f047dc9c9870ebe">https://github.com/macports/macports-ports/commit/8dae9d8626b5a8a405c4729d9f047dc9c9870ebe</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 8dae9d8626b MenuMeters: patch to build 2.1.6.1 on 10.15 and below
</span>8dae9d8626b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8dae9d8626b5a8a405c4729d9f047dc9c9870ebe
</span>Author: Andrew Udvare <audvare@gmail.com>
AuthorDate: Tue Nov 16 22:31:42 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> MenuMeters: patch to build 2.1.6.1 on 10.15 and below
</span>---
aqua/MenuMeters/Portfile | 21 +++----
aqua/MenuMeters/files/patch-bc.diff | 111 ++++++++++++++++++++++++++++++++++++
2 files changed, 119 insertions(+), 13 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/MenuMeters/Portfile b/aqua/MenuMeters/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cf5f7171b54..b46f2c7ae2b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/MenuMeters/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/MenuMeters/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,19 +18,12 @@ long_description The MenuMeters monitors are true SystemUIServer plugins
</span> using command-drag and remember their positions in the menubar \
across logins and restarts.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.major} >= 20} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup yujitach MenuMeters 2.1.6.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 d2e666567655456b19579fc618c84ba30acec872 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2dde435032cced14e60d4f98dadb25208cd7d9c338f524f1ed1eb71096ecd19e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1541706
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup yujitach MenuMeters 2.1.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 132cac3ddf41a778e0d62dfbbcd10a37bb037e30 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ef27af706b22e1acef014a69b13b2b672aafe07f664048c3462bf68beaef0947 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1541639
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup yujitach MenuMeters 2.1.6.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 d2e666567655456b19579fc618c84ba30acec872 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2dde435032cced14e60d4f98dadb25208cd7d9c338f524f1ed1eb71096ecd19e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1541706
</span>
if {${os.major} < 15} {
known_fail yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,6 +33,8 @@ if {${os.major} < 15} {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-bc.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> xcode.configuration Release
xcode.target "${name} No Sparkle"
xcode.destroot.settings \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/MenuMeters/files/patch-bc.diff b/aqua/MenuMeters/files/patch-bc.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a6ef0dd58c3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/MenuMeters/files/patch-bc.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,111 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git MenuMetersMenuExtraBase.m MenuMetersMenuExtraBase.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 19b1d89..ed1b1e1 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- MenuMetersMenuExtraBase.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ MenuMetersMenuExtraBase.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -114,16 +114,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if([ourPrefs loadBoolPref:bundleID defaultValue:YES]){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(!statusItem){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ statusItem=[[NSStatusBar systemStatusBar] statusItemWithLength:NSVariableStatusItemLength];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (__MAC_OS_X_VERSION_MAX_ALLOWED >= 101600)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(@available(macOS 11,*)){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // 11.0.1 does not keep the position unless autosaveName is explicitly set,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // see https://github.com/feedback-assistant/reports/issues/151 .
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // This is done here in order not to lose positions on pre-macOS 11 systems.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ statusItem.autosaveName=self.bundleID;
</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;'>++#if (__MAC_OS_X_VERSION_MAX_ALLOWED >= 101200)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(@available(macOS 10.12,*)){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ statusItem.behavior=NSStatusItemBehaviorRemovalAllowed;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [statusItem addObserver:self forKeyPath:@"visible" options:NSKeyValueObservingOptionNew context:nil];
</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;'>+ statusItem.menu = self.menu;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ statusItem.menu.delegate = self;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -222,27 +226,30 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -(BOOL)isDark
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (__MAC_OS_X_VERSION_MAX_ALLOWED >= 101400)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(@available(macOS 10.14,*)){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // https://github.com/ruiaureliano/macOS-Appearance/blob/master/Appearance/Source/AppDelegate.swift
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [statusItem.button.effectiveAppearance.name containsString:@"ark"];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }else{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // https://stackoverflow.com/questions/25207077/how-to-detect-if-os-x-is-in-dark-mode
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // On 10.10 there is no documented API for theme, so we'll guess a couple of different ways.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOL isDark = NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [defaults synchronize];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NSString *interfaceStyle = [defaults stringForKey:@"AppleInterfaceStyle"];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (interfaceStyle && [interfaceStyle isEqualToString:@"Dark"]) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- isDark = YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return isDark;
</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;'>++ // https://stackoverflow.com/questions/25207077/how-to-detect-if-os-x-is-in-dark-mode
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // On 10.10 there is no documented API for theme, so we'll guess a couple of different ways.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOL isDark = NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [defaults synchronize];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NSString *interfaceStyle = [defaults stringForKey:@"AppleInterfaceStyle"];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (interfaceStyle && [interfaceStyle isEqualToString:@"Dark"]) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ isDark = YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return isDark;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -(NSColor*)menuBarTextColor
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (__MAC_OS_X_VERSION_MAX_ALLOWED >= 101400)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(@available(macOS 10.14,*)){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [NSColor labelColor];
</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;'>+ if (self.isDark){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [NSColor whiteColor];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -258,9 +265,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return height;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (void)setupAppearance {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (__MAC_OS_X_VERSION_MAX_ALLOWED >= 101400)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(@available(macOS 10.14,*)){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [NSAppearance setCurrentAppearance:statusItem.button.effectiveAppearance];
</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;'>+ #pragma mark NSMenuDelegate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (void)menuNeedsUpdate:(NSMenu*)menu {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git PrefPane/MenuMetersPref.m PrefPane/MenuMetersPref.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 115e9de..ea2bdb4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- PrefPane/MenuMetersPref.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ PrefPane/MenuMetersPref.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -166,6 +166,7 @@ static void scChangeCallback(SCDynamicStoreRef store, CFArrayRef changedKeys, vo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [self setupSparkleUI];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (__MAC_OS_X_VERSION_MAX_ALLOWED >= 101600)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (@available(macOS 10.16, *)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSToolbar *toolbar = [NSToolbar new];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ toolbar.delegate = self;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -177,6 +178,7 @@ static void scChangeCallback(SCDynamicStoreRef store, CFArrayRef changedKeys, vo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [self.window.toolbar setSelectedItemIdentifier:selectedIdentifier];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prefTabs.delegate = self;
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (NSArray *)toolbarDefaultItemIdentifiers:(NSToolbar *)toolbar {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -203,9 +205,11 @@ static void scChangeCallback(SCDynamicStoreRef store, CFArrayRef changedKeys, vo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ item.paletteLabel = tabItem.label;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ item.label = tabItem.label;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ item.action = @selector(toolbarSelection:);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (__MAC_OS_X_VERSION_MAX_ALLOWED >= 101600)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (@available(macOS 10.16, *)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ item.image = [NSImage imageWithSystemSymbolName:itemIdent accessibilityDescription:@""];
</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;'>+ return item;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>