<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/8feef8ae2c3550dacc5b68286f2978de5dca1cf8">https://github.com/macports/macports-ports/commit/8feef8ae2c3550dacc5b68286f2978de5dca1cf8</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 8feef8ae2c3550dacc5b68286f2978de5dca1cf8
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Jan 5 12:40:31 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5 PG: add procedure to create deps on Qt components
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/51619
</span>---
_resources/port1.0/group/qt5-1.0.tcl | 61 +++++++++++++++++++++++++++++++++---
1 file changed, 57 insertions(+), 4 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 03b66aa..5b8b437 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;'>@@ -241,6 +241,16 @@ if {[tbool just_want_qt5_variables]} {
</span> return
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# a procedure for declaring dependencies on Qt5 components, which will expand them
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# into the appropriate subports for the Qt5 flavour installed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# e.g. qt5.depends_component qtsvg qtdeclarative
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc qt5.depends_component {args} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global qt5_private_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_components ${comp}
</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> # no universal binary support in Qt 5
# see http://lists.qt-project.org/pipermail/interest/2012-December/005038.html
# and https://bugreports.qt.io/browse/QTBUG-24952
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -287,10 +297,6 @@ if { ![option universal_variant] || ![variant_isset universal] } {
</span> set qt_qmake_spec ""
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists building_qt5]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:lib/pkgconfig/Qt5Core.pc:${qt_name}-qtbase
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # use PKGCONFIG for Qt discovery in configure scripts
depends_build-append port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -617,4 +623,51 @@ namespace eval qt5pg {
</span> #
# qtwebkit: official support dropped in 5.6.0
# as of 5.7, still maintained by community
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ proc register_dependents {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global qt5_private_components
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ![exists qt5_private_components] || ${qt5_private_components} eq "" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # no Qt components have been requested
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # qt5.depends_component has never been called
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set qt5_private_components ""
</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;'>+ if { [variant_exists qt5kde] && [variant_isset qt5kde] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set qt_kde_name qt5-kde
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${qt_kde_name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach component ${qt5_private_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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-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;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ![variant_isset qt5kde]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set qt_default_name [qt5.get_default_name]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach component "qtbase ${qt5_private_components}" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${component} eq "qt5" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append path:share/doc/qt5/README.txt:${qt_default_name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif { [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_lib-append path:${path}:${qt_default_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 ${comp}"
</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;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+port::register_callback qt5pg::register_dependents
</span></pre><pre style='margin:0'>
</pre>