<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/00a3af1ce716ec52f437ccc7a7e3f208b74028e3">https://github.com/macports/macports-ports/commit/00a3af1ce716ec52f437ccc7a7e3f208b74028e3</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 00a3af1ce716ec52f437ccc7a7e3f208b74028e3
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Mon Jan 13 17:45:13 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5-qtcreator: use Tcl system instead of exec
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The Tcl command exec seems to have a limit of 150 characters for the
</span><span style='display:block; white-space:pre;color:#404040;'> name of the subprocess.
</span>---
devel/qt5-qtcreator/Portfile | 57 +++-----------------------------------------
1 file changed, 3 insertions(+), 54 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qt5-qtcreator/Portfile b/devel/qt5-qtcreator/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index eeb18aa..d6b1e2d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/qt5-qtcreator/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/qt5-qtcreator/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,26 +93,9 @@ if { ${subport} eq ${name} } {
</span> #
# modify for our purposes
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # for unknown reason, using system instead of exec results in "QWidget: Cannot create a QWidget without QApplication"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # surround sdktool with catch since, as of 4.2.0, sdktool causes Tcl to register an error when asked to create a file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span> set sdktool ${destroot}${qt_apps_dir}/Qt\ Creator.app/Contents/Resources/sdktool
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [catch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exec \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${sdktool}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- addQt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --id qt.5.macports \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --name "Qt %{Qt:Version} from MacPorts" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --qmake "${qt_qmake_cmd}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --type Qt4ProjectManager.QtVersion.Desktop
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } msg] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ![file exists ${destroot}${qt_apps_dir}/Qt\ Creator.app/Contents/Resources/QtProject/qtcreator/qtversion.xml] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error ${msg}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "sdktool failure"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "\"${sdktool}\" addQt --id qt.5.macports --name \"Qt %{Qt:Version} from MacPorts\" --qmake \"${qt_qmake_cmd}\" --type Qt4ProjectManager.QtVersion.Desktop"
</span>
if { [variant_isset universal] } {
foreach arch ${universal_archs} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -124,24 +107,7 @@ if { ${subport} eq ${name} } {
</span> set qt_qmake_spec_arch ${qt_qmake_spec_64}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [catch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exec \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${sdktool}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- addKit \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --id qt.5.macports_${arch}_kit \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --name "Desktop Qt %{Qt:Version} from MacPorts ${arch}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --Ctoolchain x86-macos-generic-mach_o-${toolchain_bit}bit \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --Cxxtoolchain x86-macos-generic-mach_o-${toolchain_bit}bit \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --qt qt.5.macports \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --debuggerengine 256 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --devicetype Desktop \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --mkspec ${qt_qmake_spec_arch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } msg] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ![file exists ${destroot}${qt_apps_dir}/Qt\ Creator.app/Contents/Resources/QtProject/qtcreator/profiles.xml] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error ${msg}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "sdktool failure"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "\"${sdktool}\" addKit --id qt.5.macports_${arch}_kit --name \"Desktop Qt %{Qt:Version} from MacPorts ${arch}\" --Ctoolchain x86-macos-generic-mach_o-${toolchain_bit}bit --Cxxtoolchain x86-macos-generic-mach_o-${toolchain_bit}bit --qt qt.5.macports --debuggerengine 256 --devicetype Desktop --mkspec ${qt_qmake_spec_arch}"
</span> }
} else {
if { ${build_arch} eq "i386" } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -150,24 +116,7 @@ if { ${subport} eq ${name} } {
</span> set toolchain_bit 64
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [catch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exec \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${sdktool}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- addKit \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --id qt.5.macports_${build_arch}_kit \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --name "Desktop Qt %{Qt:Version} from MacPorts ${build_arch}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --Ctoolchain x86-macos-generic-mach_o-${toolchain_bit}bit \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --Cxxtoolchain x86-macos-generic-mach_o-${toolchain_bit}bit \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --qt qt.5.macports \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --debuggerengine 256 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --devicetype Desktop \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --mkspec ${qt_qmake_spec}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } msg] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ![file exists ${destroot}${qt_apps_dir}/Qt\ Creator.app/Contents/Resources/QtProject/qtcreator/profiles.xml] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error ${msg}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "sdktool failure"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "\"${sdktool}\" addKit --id qt.5.macports_${build_arch}_kit --name \"Desktop Qt %{Qt:Version} from MacPorts ${build_arch}\" --Ctoolchain x86-macos-generic-mach_o-${toolchain_bit}bit --Cxxtoolchain x86-macos-generic-mach_o-${toolchain_bit}bit --qt qt.5.macports --debuggerengine 256 --devicetype Desktop --mkspec ${qt_qmake_spec}"
</span> }
# N.B. that at some point in the future, QtCreator.ini may need to be created
</pre><pre style='margin:0'>
</pre>