<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/09f30de98a117fc682d254d1a6ebda33172eab64">https://github.com/macports/macports-ports/commit/09f30de98a117fc682d254d1a6ebda33172eab64</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 09f30de98a1 libreoffice: adjustments for os.major check
</span>09f30de98a1 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 09f30de98a117fc682d254d1a6ebda33172eab64
</span>Author: Andrew Udvare <audvare@gmail.com>
AuthorDate: Tue Apr 27 13:52:52 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> libreoffice: adjustments for os.major check
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add "known_fail yes" for buildbot to skip this port on earlier versions of macOS
</span><span style='display:block; white-space:pre;color:#404040;'> Adjust message to indicate that building LibreOffice requires 10.15 or later
</span><span style='display:block; white-space:pre;color:#404040;'> Add message telling user to download a version from LibreOffice's website in this scenario
</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/62764
</span>---
office/libreoffice/Portfile | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/office/libreoffice/Portfile b/office/libreoffice/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 81c18e86dd5..6bda57b52b6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/office/libreoffice/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/office/libreoffice/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -144,9 +144,14 @@ depends_run-append \
</span> port:python${python_version} \
port:py${python_version}-lxml
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.major} < 14} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 19} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ known_fail yes
</span> pre-fetch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${name} @${version} requires OS X 10.10 or later."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "Building ${name} @${version} requires macOS 10.15 or later."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes-append "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Consider downloading a version from LibreOffice's website:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://www.libreoffice.org/download/download/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"
</span> return -code error "incompatible OS X version"
}
}
</pre><pre style='margin:0'>
</pre>