<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1e02dcfd8ee5fbae43d37af864d6c817827d170c">https://github.com/macports/macports-ports/commit/1e02dcfd8ee5fbae43d37af864d6c817827d170c</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 1e02dcfd8ee Fix some bogus lint in qt5's Portfile and one real problem
</span>1e02dcfd8ee is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1e02dcfd8ee5fbae43d37af864d6c817827d170c
</span>Author: Perry E. Metzger <perry@piermont.com>
AuthorDate: Mon Mar 1 08:39:49 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> Fix some bogus lint in qt5's Portfile and one real problem
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Note that it appears that `lint --nitpick` produces really bad
</span><span style='display:block; white-space:pre;color:#404040;'> warnings for a file like this. It probably needs fixing.
</span>---
aqua/qt5/Portfile | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/Portfile b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ff4f611b513..82e7b0ea5b8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +1,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,6 +29,7 @@ if { ${subport} eq "${name}-qtwebkit-examples" } {
</span>
set just_want_qt5_variables yes
PortGroup qt5 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> unset just_want_qt5_variables
# get Qt's version numbers
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -955,6 +955,7 @@ foreach {module module_info} [array get modules] {
</span> if { ${module} eq "qtbase" } {
# this subport uses configure script (NOT qmake)
PortGroup qt5 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> PortGroup developerversion 1.0
if { ${os.platform} ne "darwin" } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1528,7 +1529,7 @@ foreach {module module_info} [array get modules] {
</span> patchfiles-append patch-webkit_XPathGrammar.y.diff
patchfiles-append patch-webkit_makegrammar.pl.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # work around changed vm_param.h in MacOSX.sdk 11+ -- the older code in 2014-vintage qtwebkit expects
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # work around changed vm_param.h in MacOSX.sdk 11+ -- the older code in 2014-vintage qtwebkit expects
</span> # PAGE_SHIFT to be set to I386_PAGE_SHIFT when on x86_64
# the 11.0 + SDK defines that only if MAC_OS_X_VERSION_MIN_REQUIRED is < 101600 (to support arm64 after that)
if {${os.platform} eq "darwin" && ${os.major} >= 20} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1608,8 +1609,10 @@ foreach {module module_info} [array get modules] {
</span> # special case
if { ${module} eq "qtwebengine" } {
PortGroup conflicts_build 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # see https://doc.qt.io/qt-5/qtwebengine-platform-notes.html
PortGroup xcodeversion 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> minimum_xcodeversions {16 8.3.3}
if { ${os.major} < 16 } {
pre-fetch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2072,11 +2075,13 @@ foreach {component component_info} [array get qt5pg::qt5_component_lib] {
</span> if { [vercmp ${qt_version_removed} ${qt_version}] <= 0 } {
subport ${name}-${component}${suffix} {
PortGroup obsolete 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
if { ${component} ne "qtquick1" && ${component} ne "qtwebkit-examples" && ${component} ne "qtdoc" && ${suffix} ne "-plugin" } {
subport ${name}-${component}${suffix}-docs {
PortGroup obsolete 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
}
}
</pre><pre style='margin:0'>
</pre>