<pre style='margin:0'>
MarcusCalhoun-Lopez pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/499e636f435232e06becb68583fc27e2c6494da0">https://github.com/macports/macports-ports/commit/499e636f435232e06becb68583fc27e2c6494da0</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 499e636f435232e06becb68583fc27e2c6494da0
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Jan 12 03:08:51 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5 PG: allow override Qt base version
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> When building a component of Qt, the version of the base must be
</span><span style='display:block; white-space:pre;color:#404040;'> the same as the version of the component.
</span>---
_resources/port1.0/group/qt5-1.0.tcl | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
<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 c139dac..72cc142 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;'>@@ -34,7 +34,7 @@
</span> # Usage:
# PortGroup qt5 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-options qt5.using_kde
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+options qt5.using_kde qt5.base_version
</span>
global available_qt_versions
set available_qt_versions {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -124,9 +124,11 @@ global qt_name
</span>
if { [info exists qt_name] } {
default qt5.using_kde no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ default qt5.base_version ${qt_name}
</span> } else {
set qt_name [qt5.get_default_name]
default qt5.using_kde no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ default qt5.base_version {[qt5.get_default_name]}
</span> }
# Qt has what is calls reference configurations, which are said to be thoroughly tested
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -642,7 +644,7 @@ namespace eval qt5pg {
</span> # as of 5.7, still maintained by community
proc register_dependents {} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global qt5_private_components qt5_private_build_components
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global qt5_private_components qt5_private_build_components qt5.base_version
</span>
if { ![exists qt5_private_components] } {
# no Qt components have been requested
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -689,7 +691,7 @@ namespace eval qt5pg {
</span> }
} else {
# ![variant_isset qt5kde]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt_default_name [qt5.get_default_name]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set qt_default_name ${qt5.base_version}
</span> foreach component "qtbase ${qt5_private_components}" {
if { ${component} eq "qt5" } {
depends_lib-append path:share/doc/qt5/README.txt:${qt_default_name}
</pre><pre style='margin:0'>
</pre>