<pre style='margin:0'>
Zhenfu Shi (i0ntempest) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bd95a6f7810aa01aa58d7d978f66a37f7aa52090">https://github.com/macports/macports-ports/commit/bd95a6f7810aa01aa58d7d978f66a37f7aa52090</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 bd95a6f7810 MaciASL: port line number patch
</span>bd95a6f7810 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit bd95a6f7810aa01aa58d7d978f66a37f7aa52090
</span>Author: i0ntempest <szf1234@me.com>
AuthorDate: Sat Oct 8 14:44:58 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> MaciASL: port line number patch
</span>---
devel/MaciASL/Portfile | 19 +++++++++++++----
devel/MaciASL/files/patch-codesign.patch | 34 ------------------------------
devel/MaciASL/files/patch-line_number.diff | 21 ++++++++++++++++++
3 files changed, 36 insertions(+), 38 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/MaciASL/Portfile b/devel/MaciASL/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 05f75130db3..d5a7385f685 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/MaciASL/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/MaciASL/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup github 1.0
</span> PortGroup xcode 1.0
github.setup acidanthera MaciASL 1.6.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories devel aqua
maintainers {i0ntempest @i0ntempest} openmaintainer
license GPL-3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,10 +25,21 @@ platforms macosx
</span> depends_run-append \
port:acpica
<span style='display:block; white-space:pre;background:#ffe0e0;'>-xcode.target MaciASL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-xcode.configuration Release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+xcode.target MaciASL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+xcode.configuration \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See https://github.com/acidanthera/MaciASL/pull/16
</span> patchfiles-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-codesign.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-line_number.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.major} >= 22} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xcode.build.settings-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CODE_SIGN_IDENTITY=-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xcode.build.settings-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CODE_SIGN_IDENTITY= CODE_SIGNING_REQUIRED=NO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot {
file copy ${worksrcpath}/build/${xcode.configuration}/MaciASL.app ${destroot}${applications_dir}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/MaciASL/files/patch-codesign.patch b/devel/MaciASL/files/patch-codesign.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index de38f54a81f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/MaciASL/files/patch-codesign.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,34 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- MaciASL.xcodeproj/project.pbxproj 2020-08-11 09:26:11.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ MaciASL.xcodeproj/project.pbxproj 2020-10-18 23:38:43.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -687,6 +687,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- B013B844160C529700F6A7F2 /* Debug */ = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- isa = XCBuildConfiguration;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- buildSettings = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CODE_SIGN_IDENTITY = "";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMBINE_HIDPI_IMAGES = YES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GCC_PRECOMPILE_PREFIX_HEADER = YES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GCC_PREFIX_HEADER = "MaciASL/MaciASL-Prefix.pch";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -700,6 +701,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- B013B845160C529700F6A7F2 /* Release */ = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- isa = XCBuildConfiguration;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- buildSettings = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CODE_SIGN_IDENTITY = "";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMBINE_HIDPI_IMAGES = YES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GCC_PRECOMPILE_PREFIX_HEADER = YES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GCC_PREFIX_HEADER = "MaciASL/MaciASL-Prefix.pch";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -771,6 +773,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CLANG_WARN_CONSTANT_CONVERSION = YES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CLANG_WARN_ENUM_CONVERSION = YES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CLANG_WARN_INT_CONVERSION = YES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CODE_SIGN_IDENTITY = "";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMBINE_HIDPI_IMAGES = YES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GCC_PRECOMPILE_PREFIX_HEADER = YES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GCC_PREFIX_HEADER = "ACPIImporter/ACPIImporter-Prefix.pch";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -790,6 +793,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CLANG_WARN_CONSTANT_CONVERSION = YES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CLANG_WARN_ENUM_CONVERSION = YES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CLANG_WARN_INT_CONVERSION = YES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CODE_SIGN_IDENTITY = "";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMBINE_HIDPI_IMAGES = YES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GCC_PRECOMPILE_PREFIX_HEADER = YES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GCC_PREFIX_HEADER = "ACPIImporter/ACPIImporter-Prefix.pch";
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/MaciASL/files/patch-line_number.diff b/devel/MaciASL/files/patch-line_number.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..26b51e7ae5b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/MaciASL/files/patch-line_number.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/MaciASL/AppDelegate.m b/MaciASL/AppDelegate.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index def7e7e..f15073e 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- MaciASL/AppDelegate.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ MaciASL/AppDelegate.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -401,14 +401,14 @@ -(void)drawHashMarksAndLabelsInRect:(NSRect)rect {
</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;'>+ // TODO: Calculate string width based on actual values instead of trying to estimate it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NSInteger height = (NSInteger)lineHeight, start = (NSInteger)((NSInteger)scrollView.documentVisibleRect.origin.y / lineHeight) + 1, stop = 1 + start + MIN((textLength - start), (NSInteger)ceil(scrollView.documentVisibleRect.size.height / height));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NSInteger height = (NSInteger)lineHeight, start = (NSInteger)(((NSInteger)scrollView.documentVisibleRect.origin.y + rect.origin.y) / lineHeight) + 1, stop = 1 + start + MIN((textLength - start), (NSInteger)ceil(scrollView.documentVisibleRect.size.height / height));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (self.ruleThickness < MAX(18,((NSInteger)log10(stop)+1)*9)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.ruleThickness = ((NSInteger)log10(stop)+1)*9;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</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;'>+ rect.size.width -= 2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- rect.origin.y -= (NSInteger)(scrollView.documentVisibleRect.origin.y) % height + 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rect.origin.y -= (NSInteger)(scrollView.documentVisibleRect.origin.y + rect.origin.y) % height + 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rect.size.height = height;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while (start < stop) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (start > 0) {
</span></pre><pre style='margin:0'>
</pre>