<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/8641b4f6d571a1b083361c6e2c20b727bdaef065">https://github.com/macports/macports-ports/commit/8641b4f6d571a1b083361c6e2c20b727bdaef065</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 8641b4f qt5 PG: add procedure to add runtime dependencies
</span>8641b4f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8641b4f6d571a1b083361c6e2c20b727bdaef065
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Jan 6 09:43:23 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5 PG: add procedure to add runtime dependencies
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See
</span><span style='display:block; white-space:pre;color:#404040;'> https://lists.macports.org/pipermail/macports-dev/2017-December/037001.html
</span>---
_resources/port1.0/group/qt5-1.0.tcl | 35 ++++++++++++++++++++++++++++++++++-
1 file changed, 34 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 4b37ccc..8662656 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;'>@@ -598,6 +598,12 @@ proc qt5.depends_build_component {args} {
</span> lappend qt5_private_build_components ${comp}
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+proc qt5.depends_runtime_component {args} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global qt5_private_runtime_components
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach comp ${args} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend qt5_private_runtime_components ${comp}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
options qt5.kde_variant
default qt5.kde_variant no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -736,7 +742,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.name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global qt5_private_components qt5_private_build_components qt5_private_runtime_components qt5.name
</span>
if { ![exists qt5_private_components] } {
# no Qt components have been requested
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -747,6 +753,10 @@ namespace eval qt5pg {
</span> # qt5.depends_build_component has never been called
set qt5_private_build_components ""
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ![exists qt5_private_runtime_components] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # qt5.depends_build_component has never been called
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set qt5_private_runtime_components ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
if { [variant_exists qt5kde] && [variant_isset qt5kde] } {
set qt_kde_name qt5-kde
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -774,6 +784,20 @@ namespace eval qt5pg {
</span> qtwebview -
qtenginio {
# these components are subports
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:${qt_kde_name}-${component}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # qt5-kde provides all components except those above
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach component ${qt5_private_runtime_components} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch -exact ${component} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtwebkit -
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtwebengine -
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtwebview -
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtenginio {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # these components are subports
</span> depends_build-append port:${qt_kde_name}-${component}
}
default {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -803,6 +827,15 @@ namespace eval qt5pg {
</span> return -code error "unknown component ${component}"
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach component ${qt5_private_runtime_components} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [info exists qt5pg::qt5_component_lib(${component})] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set component_info $qt5pg::qt5_component_lib(${component})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set path [lindex ${component_info} 2]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append path:${path}:${qt5.name}-${component}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "unknown component ${component}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
}
</pre><pre style='margin:0'>
</pre>