<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/89143986e7d14b03816b8e133d6d22f89e80cee8">https://github.com/macports/macports-ports/commit/89143986e7d14b03816b8e133d6d22f89e80cee8</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 89143986e7d optool: fix build on macOS 12
</span>89143986e7d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 89143986e7d14b03816b8e133d6d22f89e80cee8
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Fri Dec 3 15:18:29 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> optool: fix build on macOS 12
</span>---
sysutils/optool/Portfile | 4 +-
sysutils/optool/files/patch-argparsermacOS-12.diff | 28 ++++++
.../optool/files/patch-coreparse-macOS-12.diff | 104 +++++++++++++++++++++
3 files changed, 135 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/optool/Portfile b/sysutils/optool/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f71407e35cf..fa894519af4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/optool/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/optool/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,7 +45,9 @@ post-extract {
</span> move [glob ${workpath}/CoreParse-${coreparse_commit}*] ${worksrcpath}/${name}/FSArgumentParser/CoreParse
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-ldflags-objc.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-ldflags-objc.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-argparsermacOS-12.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-coreparse-macOS-12.diff
</span> patch.pre_args -p1
if { ${os.major} < 12 } {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/optool/files/patch-argparsermacOS-12.diff b/sysutils/optool/files/patch-argparsermacOS-12.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f29cef7cdcd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/optool/files/patch-argparsermacOS-12.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,28 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Upstream: https://github.com/catap/ArgumentParser/tree/macports-macOS-12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Adaptation: update paths
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+commit 6f4837a5b586dcbd7787b1881e798920ae20285a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Kirill A. Korinsky <kirill@korins.ky>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri Dec 3 15:14:16 2021 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compatibility with https://github.com/beelsebob/CoreParse/pull/45
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/optool/FSArgumentParser/ArgumentParser/FSArgumentSignature.m b/optool/FSArgumentParser/ArgumentParser/FSArgumentSignature.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index eda9ade..edbaecd 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/optool/FSArgumentParser/ArgumentParser/FSArgumentSignature.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/optool/FSArgumentParser/ArgumentParser/FSArgumentSignature.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -108,12 +108,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSAssert([[values objectAtIndex:0] isKindOfClass:[CPKeywordToken class]], @"expecting keyword token");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSAssert([[values objectAtIndex:1] isKindOfClass:[CPKeywordToken class]], @"expecting keyword token");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSAssert([[values objectAtIndex:3] isKindOfClass:[CPKeywordToken class]], @"expecting keyword token");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NSNumber * location = [[values objectAtIndex:2] number];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NSNumber * location = [[values objectAtIndex:2] numberValue];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ valueRange.location = [location integerValue];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ valueRange.length = [location integerValue];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSNumber * length;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ([[values objectAtIndex:4] isKindOfClass:[CPNumberToken class]]) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- length = [[values objectAtIndex:4] number];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ length = [[values objectAtIndex:4] numberValue];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ valueRange.length = MAX(valueRange.location, [length integerValue]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ valueRange.length = NSNotFound; // infinite
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/optool/files/patch-coreparse-macOS-12.diff b/sysutils/optool/files/patch-coreparse-macOS-12.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c131f0cb5f1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/optool/files/patch-coreparse-macOS-12.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,104 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Upstream: https://github.com/beelsebob/CoreParse/pull/45
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Adaptation: update paths, removed tests part
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+commit 601626b30683397fc25dfc155e8192a03c1776d0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Kirill A. Korinsky <kirill@korins.ky>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri Dec 3 14:46:54 2021 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Add support macOS 12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/optool/FSArgumentParser/CoreParse/CoreParse/Built In Parsers/CPJSONParser.m b/optool/FSArgumentParser/CoreParse/CoreParse/Built In Parsers/CPJSONParser.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index bc2f537..08eab1d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/optool/FSArgumentParser/CoreParse/CoreParse/Built In Parsers/CPJSONParser.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/optool/FSArgumentParser/CoreParse/CoreParse/Built In Parsers/CPJSONParser.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -142,7 +142,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case 0:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [(CPQuotedToken *)[children objectAtIndex:0] content];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case 1:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return [(CPNumberToken *)[children objectAtIndex:0] number];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return [(CPNumberToken *)[children objectAtIndex:0] numberValue];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case 2:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case 3:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case 4:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/optool/FSArgumentParser/CoreParse/CoreParse/Grammar/CPGrammar.m b/optool/FSArgumentParser/CoreParse/CoreParse/Grammar/CPGrammar.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 048fba3..700c706 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/optool/FSArgumentParser/CoreParse/CoreParse/Grammar/CPGrammar.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/optool/FSArgumentParser/CoreParse/CoreParse/Grammar/CPGrammar.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -61,7 +61,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSArray *rules = [children objectAtIndex:1];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (CPRule *r in rules)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [r setTag:[[(CPNumberToken *)[children objectAtIndex:0] number] intValue]];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [r setTag:[[(CPNumberToken *)[children objectAtIndex:0] numberValue] intValue]];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return rules;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/optool/FSArgumentParser/CoreParse/CoreParse/Tokenisation/Token Types/CPNumberToken.h b/optool/FSArgumentParser/CoreParse/CoreParse/Tokenisation/Token Types/CPNumberToken.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a39737b..4a93656 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/optool/FSArgumentParser/CoreParse/CoreParse/Tokenisation/Token Types/CPNumberToken.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/optool/FSArgumentParser/CoreParse/CoreParse/Tokenisation/Token Types/CPNumberToken.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -48,7 +48,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /**
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * The number found in the input stream.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-@property (readwrite,copy) NSNumber *number;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@property (readwrite,copy) NSNumber *numberValue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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;'>+diff --git a/optool/FSArgumentParser/CoreParse/CoreParse/Tokenisation/Token Types/CPNumberToken.m b/optool/FSArgumentParser/CoreParse/CoreParse/Tokenisation/Token Types/CPNumberToken.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f99ed7a..c0375ee 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/optool/FSArgumentParser/CoreParse/CoreParse/Tokenisation/Token Types/CPNumberToken.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/optool/FSArgumentParser/CoreParse/CoreParse/Tokenisation/Token Types/CPNumberToken.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10,7 +10,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @implementation CPNumberToken
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-@synthesize number;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@synthesize numberValue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ + (id)tokenWithNumber:(NSNumber *)number
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,7 +23,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (nil != self)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [self setNumber:initNumber];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [self setNumberValue:initNumber];
</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 self;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,13 +36,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (void)dealloc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [number release];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [numberValue release];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [super dealloc];
</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;'>+ - (NSString *)description
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return [NSString stringWithFormat:@"<Number: %@>", [self number]];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return [NSString stringWithFormat:@"<Number: %@>", [self numberValue]];
</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;'>+ - (NSString *)name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -52,7 +52,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (NSUInteger)hash
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return [[self number] hash];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return [[self numberValue] hash];
</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;'>+ - (BOOL)isNumberToken
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -63,7 +63,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (BOOL)isEqual:(id)object
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ([object isNumberToken] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [((CPNumberToken *)object)->number isEqualToNumber:number]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [((CPNumberToken *)object)->numberValue isEqualToNumber:numberValue]);
</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></pre><pre style='margin:0'>
</pre>