<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d8dbf1ca9a33db649627b17767b9d81c141edf5d">https://github.com/macports/macports-ports/commit/d8dbf1ca9a33db649627b17767b9d81c141edf5d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d8dbf1ca9a33db649627b17767b9d81c141edf5d
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Tue Nov 6 23:08:19 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5 PG: add option for minimum working Qt version
</span>---
_resources/port1.0/group/qt5-1.0.tcl | 24 +++++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/qt5-1.0.tcl b/_resources/port1.0/group/qt5-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 0bcc772..68e30ff 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/qt5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/qt5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -579,6 +579,9 @@ proc qt5.depends_runtime_component {args} {
</span> options qt5.kde_variant
default qt5.kde_variant no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+options qt5.min_version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default qt5.min_version 5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # use PKGCONFIG for Qt discovery in configure scripts
depends_build-append port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -717,7 +720,7 @@ proc eval_variants {variations} {
</span>
namespace eval qt5pg {
proc register_dependents {} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global qt5_private_components qt5_private_build_components qt5_private_runtime_components qt5.name qt5.version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global qt5_private_components qt5_private_build_components qt5_private_runtime_components qt5.name qt5.version qt5.min_version
</span>
if { ![exists qt5_private_components] } {
# no Qt components have been requested
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -792,7 +795,11 @@ namespace eval qt5pg {
</span> if {[vercmp ${qt5.version} ${version_intro}] >= 0} {
depends_lib-append path:${path}:${qt5.name}-${component}
} else {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${qt5.version} ${qt5.min_version}] >= 0} {
</span> ui_warn "${component} does not exist in Qt ${qt5.version}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # port will fail during pre-fetch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
} else {
return -code error "unknown component ${component}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -806,7 +813,11 @@ namespace eval qt5pg {
</span> if {[vercmp ${qt5.version} ${version_intro}] >= 0} {
depends_build-append path:${path}:${qt5.name}-${component}
} else {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${qt5.version} ${qt5.min_version}] >= 0} {
</span> ui_warn "${component} does not exist in Qt ${qt5.version}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # port will fail during pre-fetch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
} else {
return -code error "unknown component ${component}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -820,7 +831,11 @@ namespace eval qt5pg {
</span> if {[vercmp ${qt5.version} ${version_intro}] >= 0} {
depends_run-append path:${path}:${qt5.name}-${component}
} else {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${qt5.version} ${qt5.min_version}] >= 0} {
</span> ui_warn "${component} does not exist in Qt ${qt5.version}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # port will fail during pre-fetch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
} else {
return -code error "unknown component ${component}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -834,4 +849,11 @@ if {!${private_building_qt5}} {
</span> port::register_callback qt5pg::register_dependents
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${qt5.version} ${qt5.min_version}] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "Qt version ${qt5.min_version} or above is required, but Qt version ${qt5.version} is installed"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "Qt version too old"
</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;'>+
</span> unset private_building_qt5
</pre><pre style='margin:0'>
</pre>