<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[137229] trunk/dports</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/137229">137229</a></dd>
<dt>Author</dt> <dd>mcalhoun@macports.org</dd>
<dt>Date</dt> <dd>2015-06-06 22:28:14 -0700 (Sat, 06 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>qt5-mac:
* update Version (5.3.2 -> 5.4.1, fixes #47582)
* install qt5-mac in private directory (see #44193 for details)
* prevent installation on unsupported OS versions (fixes #47581)
* install links so that pkg-config files are correct (fixes #44204)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdports_resourcesport10groupqt510tcl">trunk/dports/_resources/port1.0/group/qt5-1.0.tcl</a></li>
<li><a href="#trunkdportsaquaqt5macPortfile">trunk/dports/aqua/qt5-mac/Portfile</a></li>
<li><a href="#trunkdportsaquaqt5macfilespatchshareddiff">trunk/dports/aqua/qt5-mac/files/patch-shared.diff</a></li>
<li><a href="#trunkdportsaquaqt5macfilespatchtst_qpluginloaderdiff">trunk/dports/aqua/qt5-mac/files/patch-tst_qpluginloader.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsaquaqt5macfilespatchavfmediaplayersessiondiff">trunk/dports/aqua/qt5-mac/files/patch-avfmediaplayersession.diff</a></li>
<li><a href="#trunkdportsaquaqt5macfilespatchqmacstyle_macdiff">trunk/dports/aqua/qt5-mac/files/patch-qmacstyle_mac.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdports_resourcesport10groupqt510tcl"></a>
<div class="modfile"><h4>Modified: trunk/dports/_resources/port1.0/group/qt5-1.0.tcl (137228 => 137229)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/_resources/port1.0/group/qt5-1.0.tcl 2015-06-07 05:28:13 UTC (rev 137228)
+++ trunk/dports/_resources/port1.0/group/qt5-1.0.tcl 2015-06-07 05:28:14 UTC (rev 137229)
</span><span class="lines">@@ -65,28 +65,12 @@
</span><span class="cx">
</span><span class="cx"> # standard install directory
</span><span class="cx"> global qt_dir
</span><del>-set qt_dir ${prefix}
</del><ins>+set qt_dir ${prefix}/libexec/qt5-mac
</ins><span class="cx">
</span><del>-# standard Qt documents directory
-global qt_docs_dir
-set qt_docs_dir ${qt_dir}/share/doc/${qt_name}
</del><ins>+# standard Qt non-.app executables directory
+global qt_bins_dir
+set qt_bins_dir ${qt_dir}/bin
</ins><span class="cx">
</span><del>-# standard Qt plugins directory
-global qt_plugins_dir
-set qt_plugins_dir ${qt_dir}/share/${qt_name}/plugins
-
-# standard Qt mkspecs directory
-global qt_mkspecs_dir
-set qt_mkspecs_dir ${qt_dir}/share/${qt_name}/mkspecs
-
-# standard Qt imports directory
-global qt_imports_dir
-set qt_imports_dir ${qt_dir}/share/${qt_name}/imports
-
-# standard Qt qml directory
-global qt_qml_dir
-set qt_qml_dir ${qt_dir}/share/${qt_name}/qml
-
</del><span class="cx"> # standard Qt includes directory
</span><span class="cx"> global qt_includes_dir
</span><span class="cx"> set qt_includes_dir ${qt_dir}/include
</span><span class="lines">@@ -97,53 +81,89 @@
</span><span class="cx">
</span><span class="cx"> # standard Qt libraries directory
</span><span class="cx"> global qt_frameworks_dir
</span><del>-set qt_frameworks_dir ${qt_dir}/Library/Frameworks
</del><ins>+set qt_frameworks_dir ${qt_libs_dir}
</ins><span class="cx">
</span><del>-# standard Qt non-.app executables directory
-global qt_bins_dir
-set qt_bins_dir ${qt_dir}/bin
</del><ins>+global qt_archdata_dir
+set qt_archdata_dir ${qt_dir}
</ins><span class="cx">
</span><del>-# standard Qt .app executables directory, if created
-global qt_apps_dir
-set qt_apps_dir ${applications_dir}/Qt5
</del><ins>+# standard Qt plugins directory
+global qt_plugins_dir
+set qt_plugins_dir ${qt_archdata_dir}/plugins
</ins><span class="cx">
</span><ins>+# standard Qt imports directory
+global qt_imports_dir
+set qt_imports_dir ${qt_archdata_dir}/imports
+
+# standard Qt qml directory
+global qt_qml_dir
+set qt_qml_dir ${qt_archdata_dir}/qml
+
</ins><span class="cx"> # standard Qt data directory
</span><span class="cx"> global qt_data_dir
</span><del>-set qt_data_dir ${qt_dir}/share/${qt_name}
</del><ins>+set qt_data_dir ${qt_dir}
</ins><span class="cx">
</span><ins>+# standard Qt documents directory
+global qt_docs_dir
+set qt_docs_dir ${qt_data_dir}/doc
+
</ins><span class="cx"> # standard Qt translations directory
</span><span class="cx"> global qt_translations_dir
</span><del>-set qt_translations_dir ${qt_dir}/share/${qt_name}/translations
</del><ins>+set qt_translations_dir ${qt_data_dir}/translations
</ins><span class="cx">
</span><span class="cx"> # standard Qt sysconf directory
</span><span class="cx"> global qt_sysconf_dir
</span><del>-set qt_sysconf_dir ${qt_dir}/etc/${qt_name}
</del><ins>+set qt_sysconf_dir ${qt_dir}/etc/xdg
</ins><span class="cx">
</span><span class="cx"> # standard Qt examples directory
</span><span class="cx"> global qt_examples_dir
</span><del>-set qt_examples_dir ${qt_dir}/share/${qt_name}/examples
</del><ins>+set qt_examples_dir ${qt_dir}/examples
</ins><span class="cx">
</span><span class="cx"> # standard Qt tests directory
</span><span class="cx"> global qt_tests_dir
</span><del>-set qt_tests_dir ${qt_dir}/share/${qt_name}/tests
</del><ins>+set qt_tests_dir ${qt_dir}/tests
</ins><span class="cx">
</span><ins>+# data used by qmake
+global qt_host_data_dir
+set qt_host_data_dir ${qt_dir}
+
</ins><span class="cx"> # standard Qt demos directory
</span><del>-global qt_demos_dir
-set qt_demos_dir ${qt_dir}/share/${qt_name}/demos
</del><ins>+#global qt_demos_dir
+#set qt_demos_dir ${qt_dir}/share/${qt_name}/demos
</ins><span class="cx">
</span><ins>+# standard Qt mkspecs directory
+global qt_mkspecs_dir
+set qt_mkspecs_dir ${qt_dir}/mkspecs
+
+# standard Qt .app executables directory, if created?
+#global qt_apps_dir
+#set qt_apps_dir ${qt_bins_dir}
+
</ins><span class="cx"> # standard CMake module directory for Qt-related files
</span><del>-global qt_cmake_module_dir
-set qt_cmake_module_dir ${qt_libs_dir}/cmake
</del><ins>+#global qt_cmake_module_dir
+#set qt_cmake_module_dir ${qt_libs_dir}/cmake
</ins><span class="cx">
</span><span class="cx"> # standard qmake command location
</span><span class="cx"> global qt_qmake_cmd
</span><span class="cx"> set qt_qmake_cmd ${qt_dir}/bin/qmake
</span><span class="cx">
</span><ins>+# standard moc command location
+global qt_moc_cmd
+set qt_moc_cmd ${qt_dir}/bin/moc
+
+# standard uic command location
+global qt_uic_cmd
+set qt_uic_cmd ${qt_dir}/bin/uic
+
+# standard lrelease command location
+global qt_lrelease_cmd
+set qt_lrelease_cmd ${qt_dir}/bin/lrelease
+
+# standard PKGCONFIG path
+global qt_pkg_config_dir
+set qt_pkg_config_dir ${qt_libs_dir}/pkgconfig
+
</ins><span class="cx"> # standard qmake spec
</span><del>-# configure script prefers clang (but "[a]dvertise[s] g++ as an alternative on Lion and below").
-# According to http://qt-project.org/doc/qt-5/supported-platforms.html#reference-configurations,
-# however, Snow Leopard is only tested on "GCC as provided by Apple"
-# Create a variant for Snow Leopard that uses "-platform macx-g++-32" or "-platform macx-g++"?
</del><ins>+# other platforms required? (see http://doc.qt.io/qt-5/supported-platforms.html and http://doc.qt.io/QtSupportedPlatforms/index.html)
</ins><span class="cx"> global qt_qmake_spec
</span><span class="cx"> global qt_qmake_spec_32
</span><span class="cx"> global qt_qmake_spec_64
</span><span class="lines">@@ -162,26 +182,6 @@
</span><span class="cx"> set qt_qmake_spec ""
</span><span class="cx"> }
</span><span class="cx">
</span><del>-# standard moc command location
-global qt_moc_cmd
-set qt_moc_cmd ${qt_dir}/bin/moc
-
-# standard uic command location
-global qt_uic_cmd
-set qt_uic_cmd ${qt_dir}/bin/uic
-
-# standard lrelease command location
-global qt_lrelease_cmd
-set qt_lrelease_cmd ${qt_dir}/bin/lrelease
-
-# standard PKGCONFIG path
-global qt_pkg_config_dir
-set qt_pkg_config_dir ${qt_libs_dir}/pkgconfig
-
-# data used by qmake
-global qt_host_data_dir
-set qt_host_data_dir ${qt_dir}/share/${qt_name}
-
</del><span class="cx"> # standard cmake info for Qt5
</span><span class="cx"> global qt_cmake_defines
</span><span class="cx"> set qt_cmake_defines \
</span></span></pre></div>
<a id="trunkdportsaquaqt5macPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/aqua/qt5-mac/Portfile (137228 => 137229)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/qt5-mac/Portfile 2015-06-07 05:28:13 UTC (rev 137228)
+++ trunk/dports/aqua/qt5-mac/Portfile 2015-06-07 05:28:14 UTC (rev 137229)
</span><span class="lines">@@ -4,8 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name qt5-mac
</span><del>-version 5.3.2
-revision 1
</del><ins>+version 5.4.1
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx">
</span><span class="cx"> categories aqua
</span><span class="lines">@@ -23,50 +22,33 @@
</span><span class="cx">
</span><span class="cx"> master_sites http://download.qt-project.org/official_releases/qt/${branch}/${version}/single/
</span><span class="cx">
</span><del>-checksums rmd160 5cd61acc2fbfba2597a386a09d83710ed2fdf483 \
- sha256 c8d3fd2ead30705c6673c5e4af6c6f3973346b4fb2bd6079c7be0943a5b0282d
</del><ins>+checksums rmd160 43dab9f974b09e5fdf32686ae125359fb01faa2f \
+ sha256 8768a96d73883ae01a11b9b0a23fb9387e84499670de0d47535afe35d0bfe67e
</ins><span class="cx">
</span><del>-if { ${os.major} < 10 } {
</del><ins>+if { ${os.major} < 11 } {
</ins><span class="cx"> pre-fetch {
</span><del>- ui_error "OS X prior to 10.7 (Lion) is not a Reference Configuration for Qt."
- ui_error "OS X prior to 10.6 (Snow Leopard) is not even tested."
- ui_error "See http://qt-project.org/doc/qt-5/supported-platforms.html#reference-configurations"
</del><ins>+ ui_error "OS X prior to 10.8 (Mountain Lion) is not a Reference Configuration for Qt."
+ ui_error "OS X prior to 10.7 (Lion) is not even tested."
+ ui_error "See http://doc.qt.io/qt-5/supported-platforms.html#reference-configurations"
</ins><span class="cx"> return -code error "unsupported OS"
</span><span class="cx"> }
</span><del>-} elseif { ${os.major} == 10 } {
- pre-fetch {
- ui_warn "OS X prior to 10.7 (Lion) is not a Reference Configuration for Qt."
- if { [variant_isset universal] } {
- ui_warn "OS X 10.6 (Snow Leopard) is \"occasionally tested\" but ONLY in 32-bit mode."
- ui_warn "OS X 10.6 (Snow Leopard) is deprecated and scheduled for removal in Qt 5.4."
- } else {
- if { ${build_arch} eq "i386" } {
- ui_warn "OS X 10.6 (Snow Leopard) is \"occasionally tested\"."
- ui_warn "OS X 10.6 (Snow Leopard) is deprecated and scheduled for removal in Qt 5.4."
- } else {
- ui_warn "OS X 10.6 (Snow Leopard) is \"occasionally tested\" but ONLY in 32-bit mode."
- ui_warn "OS X 10.6 (Snow Leopard) is deprecated and scheduled for removal in Qt 5.4."
- }
- }
- ui_warn "See http://qt-project.org/doc/qt-5/supported-platforms.html#reference-configurations"
- }
</del><span class="cx"> } elseif { ${os.major} > 14 } {
</span><span class="cx"> pre-fetch {
</span><span class="cx"> ui_warn "OS X subsequent to 10.10 (Yosemite) is not a Reference Configuration for Qt."
</span><del>- ui_warn "See http://qt-project.org/doc/qt-5/supported-platforms.html#reference-configurations"
</del><ins>+ ui_warn "See http://doc.qt.io/qt-5/supported-platforms.html#reference-configurations"
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- # 11 <= ${os.major} <= 13
</del><ins>+ # 11 <= ${os.major} <= 14
</ins><span class="cx"> if { [variant_isset universal] } {
</span><span class="cx"> pre-fetch {
</span><span class="cx"> ui_warn "Multiple architectures is not a Reference Configuration for Qt."
</span><del>- ui_warn "See http://qt-project.org/doc/qt-5/supported-platforms.html#reference-configurations"
</del><ins>+ ui_warn "See http://doc.qt.io/qt-5/supported-platforms.html#reference-configurations"
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> if { ${build_arch} eq "i386" } {
</span><span class="cx"> pre-fetch {
</span><span class="cx"> ui_warn "32-bit mode is not a Reference Configuration for Qt."
</span><del>- ui_warn "See http://qt-project.org/doc/qt-5/supported-platforms.html#reference-configurations"
</del><ins>+ ui_warn "See http://doc.qt.io/qt-5/supported-platforms.html#reference-configurations"
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -86,66 +68,101 @@
</span><span class="cx">
</span><span class="cx"> conflicts qt3 qt3-mac qt4-mac
</span><span class="cx">
</span><del>- minimum_xcodeversions {10 3.2}
</del><ins>+ minimum_xcodeversions {11 4.1}
</ins><span class="cx">
</span><del>- # See https://bugreports.qt-project.org/browse/QTBUG-34902
</del><ins>+ # See https://bugreports.qt.io/browse/QTBUG-34902
</ins><span class="cx"> conflicts_build-append qt4-mac
</span><span class="cx">
</span><span class="cx"> # Kuba states in https://trac.macports.org/ticket/44207#comment:7
</span><span class="cx"> # "There's no reason to have parallel building disabled. Really."
</span><del>- #use_parallel_build no
</del><ins>+ # TODO: Uncomment out for testing only. Be sure to comment out next line before commit.
+ use_parallel_build no
</ins><span class="cx">
</span><del>- # header file QtCore/private/qmachparser_p.h is included only if "defined(QT_BUILD_INTERNAL) && defined(Q_OF_MACH_O)"
- # code from header is used only "ifdef Q_OF_MACH_O"
- # the two must be consistent
- # assume the header include code is correct
- patchfiles-append patch-tst_qpluginloader.diff
</del><ins>+ # qtwebengine/src/core/gyp_run.pro buils an executable using g++
+ # This causes an error if UsingTheRightCompiler (https://trac.macports.org/wiki/UsingTheRightCompiler)
+ # Quick fix is to use full path to g++ (should use ${configure.cxx} instead?)
+ # N.B. that the python executable is found from the configuration environment
+ #patchfiles-append patch-ninja-compiler.diff
</ins><span class="cx">
</span><del>- # When testing, ensure that a universal object file is not inadvertently created.
- patchfiles-append patch-machtest.diff
</del><ins>+ #needed? qtwebengine/src/3rdparty/chromium/build/gyp_helper.py
</ins><span class="cx">
</span><del>- # On testing of 32-bit systems,
- # Pre-patch: QCOMPARE(unsigned long const&, unsigned int const&
- # Post-patch: QCOMPARE(unsigned int const&, unsigned int const&
- # Function template is only instantiated for same first and second arguments.
- patchfiles-append patch-tst_qarraydata.diff
</del><ins>+ # qtwebengine/src/core/gyp_run.pro
+ # calls
+ # qtwebengine/tools/buildscripts/gyp_qtwebengine
+ # gyp_qtwebengine insists on x64 and libcpp ?
</ins><span class="cx">
</span><del>- # see http://stackoverflow.com/questions/14506151/invalid-symbol-redefinition-in-inline-asm-on-llvm
- patchfiles-append patch-tst_benchlibcallgrind.diff
</del><ins>+ # qtwebengine/src/3rdparty/ninja/bootstrap.py calls g++ (must set CXX)
</ins><span class="cx">
</span><del>- # During testing, NSStringFromRect requires NSRect.
- patchfiles-append patch-tst_qaccessibilitymac_helpers.diff
</del><ins>+ if { [variant_isset tests] } {
+ # header file QtCore/private/qmachparser_p.h is included only if "defined(QT_BUILD_INTERNAL) && defined(Q_OF_MACH_O)"
+ # code from header is used only "ifdef Q_OF_MACH_O"
+ # the two must be consistent
+ # assume the header include code is correct
+ patchfiles-append patch-tst_qpluginloader.diff
</ins><span class="cx">
</span><ins>+ # see http://stackoverflow.com/questions/14506151/invalid-symbol-redefinition-in-inline-asm-on-llvm
+ patchfiles-append patch-tst_benchlibcallgrind.diff
+
+ # When testing, ensure that a universal object file is not inadvertently created.
+ patchfiles-append patch-machtest.diff
+
+ # On testing of 32-bit systems,
+ # Pre-patch: QCOMPARE(unsigned long const&, unsigned int const&
+ # Post-patch: QCOMPARE(unsigned int const&, unsigned int const&
+ # Function template is only instantiated for same first and second arguments.
+ patchfiles-append patch-tst_qarraydata.diff
+
+ # During testing, NSStringFromRect requires NSRect.
+ patchfiles-append patch-tst_qaccessibilitymac_helpers.diff
+ }
+
</ins><span class="cx"> # see #44934 (and #35067 for the qt4-mac version)
</span><del>- patchfiles-append patch-shared.diff
</del><ins>+ if { true } {
+ set framework_list [split ${qt_frameworks_dir} '/']
+ set qt_list [split ${qt_dir} '/']
</ins><span class="cx">
</span><del>- # see https://bugreports.qt-project.org/browse/QTBUG-41136
- patchfiles-append patch-avfmediaplayersession.diff
</del><ins>+ while {[llength ${qt_list}] && [llength ${framework_list}]} {
+ set var_qt [lindex $qt_list 0]
+ set var_framework [lindex $framework_list 0]
</ins><span class="cx">
</span><del>- # see https://bugreports.qt-project.org/browse/QTBUG-41367
- patchfiles-append patch-qmacstyle_mac.diff
</del><ins>+ if { ${var_qt} ne ${var_framework} } {
+ break
+ }
</ins><span class="cx">
</span><ins>+ # remove first element from list
+ set qt_list [lreplace ${qt_list} 0 0]
+ set framework_list [lreplace ${framework_list} 0 0]
+ }
+ set libreplace [string repeat ../ [llength ${qt_list}]][join ${framework_list} /]
+ if { ${libreplace} ne "lib" } {
+ patchfiles-append patch-shared.diff
+ reinplace "s|__MACPORTS_FRAMWORK_DIR__|${libreplace}|g" ${worksrcpath}/qttools/src/macdeployqt/shared/shared.cpp
+ }
+ }
+
</ins><span class="cx"> # --prefix is not recognized.
</span><span class="cx"> configure.pre_args-delete --prefix=${prefix}
</span><span class="cx">
</span><span class="cx"> # --disable-dependency-tracking is not recognized.
</span><span class="cx"> configure.universal_args-delete --disable-dependency-tracking
</span><span class="cx">
</span><del>- if {${configure.sdkroot} ne ""} {
- configure.args-append \
- -sdk [string tolower [join [lrange [split [lindex [split ${configure.sdkroot} "/"] end] "."] 0 end-1] "."]]
- }
-
</del><ins>+ # Installation options:
+ #-extprefix SYSROOT/PREFIX
+ #-hostprefix EXTPREFIX
+ #-libexecdir ARCHDATADIR/libexec
+ #-hostbindir HOSTPREFIX/bin
+ #-hostlibdir HOSTPREFIX/lib
</ins><span class="cx"> configure.args-append \
</span><span class="cx"> -prefix ${qt_dir} \
</span><del>- -docdir ${qt_docs_dir} \
</del><ins>+ -bindir ${qt_bins_dir} \
</ins><span class="cx"> -headerdir ${qt_includes_dir} \
</span><ins>+ -libdir ${qt_libs_dir} \
+ -archdatadir ${qt_archdata_dir} \
</ins><span class="cx"> -plugindir ${qt_plugins_dir} \
</span><span class="cx"> -importdir ${qt_imports_dir} \
</span><span class="cx"> -qmldir ${qt_qml_dir} \
</span><span class="cx"> -datadir ${qt_data_dir} \
</span><del>- -libdir ${qt_frameworks_dir} \
- -bindir ${qt_bins_dir} \
</del><ins>+ -docdir ${qt_docs_dir} \
</ins><span class="cx"> -translationdir ${qt_translations_dir} \
</span><span class="cx"> -sysconfdir ${qt_sysconf_dir} \
</span><span class="cx"> -examplesdir ${qt_examples_dir} \
</span><span class="lines">@@ -157,51 +174,18 @@
</span><span class="cx"> -release \
</span><span class="cx"> -opensource \
</span><span class="cx"> -confirm-license \
</span><ins>+ -c++11 \
</ins><span class="cx"> -shared \
</span><del>- -process
-
- # Third Party Libraries:
- configure.args-append \
- -no-mtdev \
- -no-harfbuzz \
- -openssl-linked \
- -no-xinput2 \
- -no-xcb-xlib
-
- # configure options that don't show up in configure --help
- configure.args-append \
- -no-libudev \
- -no-egl
-
- # Additional options:
- configure.args-append \
- {-make libs} \
- {-make tools} \
- {-nomake examples} \
- {-nomake tests} \
- -verbose \
- -no-optimized-qmake \
- -nis \
- -cups \
- -iconv \
- -no-evdev \
- -icu \
- -fontconfig \
- -strip \
- -no-pch \
- -dbus-linked \
- -no-xcb \
- -glib \
- -directfb \
- -no-linuxfb \
- -no-kms \
- -no-system-proxies \
- -framework
-
</del><ins>+ -largefile \
+ -accessibility
+
</ins><span class="cx"> foreach driver { db2 ibase mysql oci odbc psql sqlite sqlite2 tds } {
</span><span class="cx"> configure.args-append -no-sql-${driver}
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ configure.args-append \
+ -qml-debug
+
</ins><span class="cx"> if { ![variant_isset universal] } {
</span><span class="cx"> configure.args-append "-platform ${qt_qmake_spec}"
</span><span class="cx"> } else {
</span><span class="lines">@@ -209,8 +193,71 @@
</span><span class="cx"> set merger_configure_args(x86_64) "-platform ${qt_qmake_spec_64}"
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ configure.args-append \
+ -force-pkg-config
+
+ # Third Party Libraries:
+ configure.args-append \
+ -system-zlib \
+ -no-mtdev \
+ -no-journald \
+ -system-libpng \
+ -system-libjpeg \
+ -system-freetype \
+ -system-harfbuzz \
+ -openssl-linked \
+ -system-pcre \
+ --disable-xcb \
+ --disable-xkbcommon \
+ -no-xinput2 \
+ -no-xcb-xlib \
+ -glib \
+ -pulseaudio \
+ -no-alsa \
+ -no-gtkstyle
+
+ # Additional options:
+ configure.args-append \
+ {-make libs} \
+ {-make tools} \
+ {-nomake examples} \
+ {-nomake tests} \
+ -gui \
+ -widgets \
+ -rpath \
+ -verbose \
+ -no-optimized-qmake \
+ -nis \
+ -cups \
+ -iconv \
+ -no-evdev \
+ -icu \
+ -fontconfig \
+ -strip \
+ -no-pch \
+ -dbus-linked \
+ -no-use-gold-linker \
+ -no-separate-debug-info \
+ -no-xcb \
+ -no-eglfs \
+ -no-directfb \
+ -no-linuxfb \
+ -no-kms \
+ -no-system-proxies
+
+ # MacOS/iOS options:
+ configure.args-append \
+ -framework
+
+ if {${configure.sdkroot} ne ""} {
+ configure.args-append \
+ -sdk [string tolower [join [lrange [split [lindex [split ${configure.sdkroot} "/"] end] "."] 0 end-1] "."]]
+ }
+
</ins><span class="cx"> # configure options that don't show up in configure --help
</span><span class="cx"> configure.args-append \
</span><ins>+ -no-libudev \
+ -no-egl \
</ins><span class="cx"> -no-openvg
</span><span class="cx">
</span><span class="cx"> # Qt builds part of the system using environment provided my MacPorts.
</span><span class="lines">@@ -242,9 +289,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if { ${subport} eq ${name} } {
</span><del>- # remove this when updating to the next version
- incr revision
-
</del><span class="cx"> depends_lib \
</span><span class="cx"> port:zlib \
</span><span class="cx"> port:libpng \
</span><span class="lines">@@ -257,9 +301,11 @@
</span><span class="cx"> path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span class="cx"> port:icu \
</span><span class="cx"> port:pcre \
</span><del>- port:libiconv
</del><ins>+ port:libiconv \
+ port:harfbuzz \
+ port:pulseaudio
</ins><span class="cx">
</span><del>- # see https://bugreports.qt-project.org/browse/QTBUG-35514
</del><ins>+ # see https://bugreports.qt.io/browse/QTBUG-35514
</ins><span class="cx"> build.target
</span><span class="cx">
</span><span class="cx"> if { [variant_isset universal] } {
</span><span class="lines">@@ -267,25 +313,36 @@
</span><span class="cx"> foreach arch ${universal_archs_to_use} {
</span><span class="cx"> set dir ${destroot}-${arch}
</span><span class="cx">
</span><del>- reinplace "s|${worksrcpath}-${arch}|${worksrcpath}|g" ${dir}${qt_frameworks_dir}/pkgconfig/Qt5WebKit.pc
</del><ins>+ # Libs.private contains the value of ${worksrcpath}-${arch}, which prevents merging
+ reinplace "s|${worksrcpath}-${arch}|${worksrcpath}|g" ${dir}${qt_libs_dir}/pkgconfig/Qt5WebKit.pc
</ins><span class="cx">
</span><del>- foreach prlfl [glob ${dir}${qt_frameworks_dir}/*.framework/*.prl] {
</del><ins>+ foreach prlfl [glob ${dir}${qt_libs_dir}/*.framework/*.prl] {
</ins><span class="cx"> reinplace "s|${worksrcpath}-${arch}|${worksrcpath}|g" ${prlfl}
</span><span class="cx"> }
</span><span class="cx">
</span><del>- foreach prlfl [glob ${dir}${qt_frameworks_dir}/*.prl] {
</del><ins>+ foreach prlfl [glob ${dir}${qt_libs_dir}/*.prl] {
</ins><span class="cx"> reinplace "s|${worksrcpath}-${arch}|${worksrcpath}|g" ${prlfl}
</span><span class="cx"> }
</span><span class="cx">
</span><del>- foreach prlfl [glob ${dir}${qt_frameworks_dir}/*.framework/*.prl] {
- reinplace "s|${worksrcpath}-${arch}|${worksrcpath}|g" ${prlfl}
- }
-
</del><span class="cx"> reinplace "s|${worksrcpath}-${arch}|${worksrcpath}|g" ${dir}${qt_mkspecs_dir}/modules/qt_lib_bootstrap_private.pri
</span><ins>+ reinplace "s|macx-clang-32|macx-clang|g" ${dir}${qt_libs_dir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
+
+
+ if { [variant_isset examples] } {
+ reinplace "s|${worksrcpath}-${arch}|${worksrcpath}|g" ${dir}${qt_examples_dir}/declarative/tutorials/gettingStarted/parts/part5/filedialog/Makefile
+ reinplace -E "/\\w*-arch \\\\/d" ${dir}${qt_examples_dir}/declarative/tutorials/gettingStarted/parts/part5/filedialog/Makefile
+ reinplace -E "/\\w*${arch} \\\\/d" ${dir}${qt_examples_dir}/declarative/tutorials/gettingStarted/parts/part5/filedialog/Makefile
+ reinplace -E {s:-arch +[^ ]+::g} ${dir}${qt_examples_dir}/declarative/tutorials/gettingStarted/parts/part5/filedialog/Makefile
+ reinplace "s|macx-clang-32|macx-clang|g" ${dir}${qt_examples_dir}/declarative/tutorials/gettingStarted/parts/part5/filedialog/Makefile
</ins><span class="cx">
</span><del>- reinplace \
- "s|^set(_qt5_corelib_extra_includes \"\${_qt5Core_install_prefix}/share/qt5//mkspecs/macx-clang.*\")$|set(_qt5_corelib_extra_includes \"\${_qt5Core_install_prefix}/share/qt5//mkspecs/macx-clang-32\" \"\${_qt5Core_install_prefix}/share/qt5//mkspecs/macx-clang\")|" \
- ${dir}${qt_frameworks_dir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
</del><ins>+ reinplace "s|${worksrcpath}-${arch}|${worksrcpath}|g" ${dir}${qt_examples_dir}/multimedia/spectrum/fftreal.framework/fftreal.prl
+ reinplace "s|${worksrcpath}-${arch}|${worksrcpath}|g" ${dir}${qt_examples_dir}/multimedia/spectrum/spectrum.app/Contents/Frameworks/fftreal.framework/fftreal.prl
+ reinplace "s|${worksrcpath}-${arch}|${worksrcpath}|g" ${dir}${qt_examples_dir}/sensors/grue/libgruesensor.prl
+ reinplace "s|${worksrcpath}-${arch}|${worksrcpath}|g" ${dir}${qt_examples_dir}/declarative/tutorials/gettingStarted/parts/part5/filedialog/Makefile
+ if { [variant_isset debug] } {
+ reinplace "s|${worksrcpath}-${arch}|${worksrcpath}|g" ${dir}${qt_examples_dir}/widgets/tools/plugandpaint/plugins/libpnp_basictools_debug.prl
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -301,50 +358,30 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-destroot {
</span><del>-
</del><span class="cx"> # see #44204
</span><del>- foreach f [glob -nocomplain -directory ${destroot}${qt_frameworks_dir}/pkgconfig *.pc] {
- set framework [file rootname [file tail ${f}]]
- set incname [string map {Qt5 Qt} ${framework}]
- reinplace "s|-I\${includedir}/${incname}|-I\${includedir}|g" ${f}
- reinplace "s|includedir=\${prefix}/include|includedir=\${libdir}/${framework}/Headers|g" ${f}
- }
</del><ins>+ foreach f [glob -nocomplain -tails -directory ${destroot}${qt_libs_dir} *.framework] {
+ set framework [file rootname ${f}]
</ins><span class="cx">
</span><del>- # move items out of the Frameworks directory that are more appropriate to lib directory
- xinstall -m 775 -d ${destroot}${qt_cmake_module_dir}
- foreach d [glob -tails -nocomplain -directory ${destroot}${qt_frameworks_dir}/cmake *] {
- xinstall -m 775 -d ${destroot}${qt_cmake_module_dir}/${d}
- foreach f [glob -nocomplain -directory ${destroot}${qt_frameworks_dir}/cmake/${d} *.cmake] {
- # ${qt_frameworks_dir} is ${qt_dir}/Library/Frameworks while
- # ${qt_libs_dir} is ${qt_dir}/lib
- # unless modified, cmake files will point to a directory that is too high in the directory hierarchy
- reinplace "s|/../../../../|/../../../|g" ${f}
- file rename ${f} ${destroot}${qt_cmake_module_dir}/${d}/
</del><ins>+ set include_list [split ${qt_includes_dir} '/']
+ set framework_list [split ${qt_libs_dir} '/']
+
+ while {[llength ${include_list}] && [llength ${framework_list}]} {
+ set var_include [lindex $include_list 0]
+ set var_framework [lindex $framework_list 0]
+
+ if { ${var_include} ne ${var_framework} } {
+ break
+ }
+
+ # remove first element from list
+ set include_list [lreplace ${include_list} 0 0]
+ set framework_list [lreplace ${framework_list} 0 0]
</ins><span class="cx"> }
</span><del>- }
- xinstall -m 775 -d ${destroot}${qt_pkg_config_dir}
- foreach f [glob -nocomplain -directory ${destroot}${qt_frameworks_dir}/pkgconfig *.pc] {
- file rename ${f} ${destroot}${qt_pkg_config_dir}
- }
- xinstall -m 775 -d ${destroot}${qt_libs_dir}/
- foreach f [glob -nocomplain -directory ${destroot}${qt_frameworks_dir} *.{a,prl,la}] {
- file rename ${f} ${destroot}${qt_libs_dir}/
- }
</del><span class="cx">
</span><del>- # move items out of the bin directory that are more appropriate to the Applications directory
- xinstall -m 775 -d ${destroot}${qt_apps_dir}
- foreach f [glob -nocomplain -directory ${destroot}${qt_bins_dir} *.app] {
- file rename ${f} ${destroot}${qt_apps_dir}/
</del><ins>+ ln -s [string repeat ../ [llength ${include_list}]][join ${framework_list} /]/${f}/Headers ${destroot}${qt_includes_dir}/${framework}
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- variant harfbuzz description {(experimental) Use HarfBuzz-NG to do text shaping} {
- depends_lib-append port:harfbuzz
- configure.args-replace \
- -no-harfbuzz \
- -system-harfbuzz
- }
-
</del><span class="cx"> variant tests description {Enable tests} {
</span><span class="cx"> configure.args-replace {-nomake tests} {-make tests}
</span><span class="cx"> }
</span><span class="lines">@@ -360,7 +397,7 @@
</span><span class="cx">
</span><span class="cx"> subport ${name}-docs {
</span><span class="cx"> depends_lib-append \
</span><del>- path:${prefix}/bin/qdoc:${name} \
</del><ins>+ path:${qt_bins_dir}/qdoc:${name} \
</ins><span class="cx"> path:${qt_plugins_dir}/sqldrivers/libqsqlite.dylib:${name}-sqlite3-plugin
</span><span class="cx">
</span><span class="cx"> supported_archs noarch
</span><span class="lines">@@ -370,13 +407,11 @@
</span><span class="cx">
</span><span class="cx"> post-extract {
</span><span class="cx"> # For the most part, generated makefiles use ${prefix}/bin/qdoc.
</span><del>- # There are a couple of places that look in ${worksrcpath}/qtbase/src/tools/qdoc/.
- ln -s ${prefix}/bin/qdoc ${worksrcpath}/qtbase/src/tools/qdoc/
- ln -s ${prefix}/bin/qdoc ${worksrcpath}/qtbase/bin
</del><ins>+ ln -s ${qt_bins_dir}/qdoc ${worksrcpath}/qtbase/bin
</ins><span class="cx">
</span><span class="cx"> # Similarly, location of qhelpgenerator is expected in ${worksrcpath}
</span><span class="cx"> xinstall -d -m 755 ${worksrcpath}/qttools/bin/
</span><del>- ln -s ${prefix}/bin/qhelpgenerator ${worksrcpath}/qttools/bin/
</del><ins>+ ln -s ${qt_bins_dir}/qhelpgenerator ${worksrcpath}/qttools/bin/
</ins><span class="cx">
</span><span class="cx"> # Without this file, the makefile ${worksrcpath}/qtwebkit/Source/WebCore/Makefile.WebCore.Target
</span><span class="cx"> # keeps generating itself over and over again.
</span><span class="lines">@@ -386,7 +421,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-# See http://qt-project.org/doc/qt-5/sql-driver.html for info on building SQL Database Drivers
</del><ins>+# See http://doc.qt.io/qt-5/sql-driver.html for info on building SQL Database Drivers
</ins><span class="cx">
</span><span class="cx"> subport ${name}-sqlite3-plugin {
</span><span class="cx"> PortGroup qmake5 1.0
</span></span></pre></div>
<a id="trunkdportsaquaqt5macfilespatchavfmediaplayersessiondiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/aqua/qt5-mac/files/patch-avfmediaplayersession.diff (137228 => 137229)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/qt5-mac/files/patch-avfmediaplayersession.diff 2015-06-07 05:28:13 UTC (rev 137228)
+++ trunk/dports/aqua/qt5-mac/files/patch-avfmediaplayersession.diff 2015-06-07 05:28:14 UTC (rev 137229)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- qtmultimedia/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm.orig 2014-10-26 12:44:28.000000000 -0700
-+++ qtmultimedia/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm 2014-10-26 12:46:11.000000000 -0700
-@@ -295,7 +295,7 @@
- //AVPlayerItem "status" property value observer.
- if (context == AVFMediaPlayerSessionObserverStatusObservationContext)
- {
-- AVPlayerStatus status = [[change objectForKey:NSKeyValueChangeNewKey] integerValue];
-+ AVPlayerStatus status = (AVPlayerStatus)[[change objectForKey:NSKeyValueChangeNewKey] integerValue];
- switch (status)
- {
- //Indicates that the status of the player is not yet known because
</del></span></pre></div>
<a id="trunkdportsaquaqt5macfilespatchqmacstyle_macdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/aqua/qt5-mac/files/patch-qmacstyle_mac.diff (137228 => 137229)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/qt5-mac/files/patch-qmacstyle_mac.diff 2015-06-07 05:28:13 UTC (rev 137228)
+++ trunk/dports/aqua/qt5-mac/files/patch-qmacstyle_mac.diff 2015-06-07 05:28:14 UTC (rev 137229)
</span><span class="lines">@@ -1,14 +0,0 @@
</span><del>---- .//qtbase/src/widgets/styles/qmacstyle_mac.mm.orig 2014-09-11 03:48:01.000000000 -0700
-+++ .//qtbase/src/widgets/styles/qmacstyle_mac.mm 2014-10-28 19:28:34.000000000 -0700
-@@ -3667,9 +3667,9 @@
-
- NSBezierPath *pushButtonFocusRingPath;
- if (bdi.kind == kThemeBevelButton)
-- pushButtonFocusRingPath = [NSBezierPath bezierPathWithRect:focusRect];
-+ pushButtonFocusRingPath = [NSBezierPath bezierPathWithRect:NSRectFromCGRect(focusRect)];
- else
-- pushButtonFocusRingPath = [NSBezierPath bezierPathWithRoundedRect:focusRect xRadius:4 yRadius:4];
-+ pushButtonFocusRingPath = [NSBezierPath bezierPathWithRoundedRect:NSRectFromCGRect(focusRect) xRadius:4 yRadius:4];
- qt_drawFocusRingOnPath(cg, pushButtonFocusRingPath);
- }
-
</del></span></pre></div>
<a id="trunkdportsaquaqt5macfilespatchshareddiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/aqua/qt5-mac/files/patch-shared.diff (137228 => 137229)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/qt5-mac/files/patch-shared.diff 2015-06-07 05:28:13 UTC (rev 137228)
+++ trunk/dports/aqua/qt5-mac/files/patch-shared.diff 2015-06-07 05:28:14 UTC (rev 137229)
</span><span class="lines">@@ -1,11 +1,11 @@
</span><del>---- .//qttools/src/macdeployqt/shared/shared.cpp.orig 2014-09-11 03:48:25.000000000 -0700
-+++ .//qttools/src/macdeployqt/shared/shared.cpp 2014-10-26 11:14:49.000000000 -0700
-@@ -168,7 +168,7 @@
</del><ins>+--- qttools/src/macdeployqt/shared/shared.cpp.orig 2015-02-16 21:57:17.000000000 -0700
++++ qttools/src/macdeployqt/shared/shared.cpp 2015-05-31 10:36:56.000000000 -0700
+@@ -196,7 +196,7 @@
</ins><span class="cx"> state = DylibName;
</span><span class="cx"> continue;
</span><span class="cx"> } else if (part < parts.count() && parts.at(part).endsWith(".framework")) {
</span><span class="cx"> - info.installName += "/" + (qtPath + "lib/").simplified();
</span><del>-+ info.installName += "/" + (qtPath + "Frameworks/").simplified();
</del><ins>++ info.installName += "/" + (qtPath + "__MACPORTS_FRAMWORK_DIR__/").simplified();
</ins><span class="cx"> info.frameworkDirectory = info.installName;
</span><span class="cx"> state = FrameworkName;
</span><span class="cx"> continue;
</span></span></pre></div>
<a id="trunkdportsaquaqt5macfilespatchtst_qpluginloaderdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/aqua/qt5-mac/files/patch-tst_qpluginloader.diff (137228 => 137229)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/qt5-mac/files/patch-tst_qpluginloader.diff 2015-06-07 05:28:13 UTC (rev 137228)
+++ trunk/dports/aqua/qt5-mac/files/patch-tst_qpluginloader.diff 2015-06-07 05:28:14 UTC (rev 137229)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>-x--- .//qtbase/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp.orig 2014-02-01 13:37:28.000000000 -0700
-+++ .//qtbase/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp 2014-04-19 10:57:51.000000000 -0700
-@@ -319,7 +319,7 @@
</del><ins>+--- .//qtbase/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp.orig 2015-05-30 18:33:03.000000000 -0700
++++ .//qtbase/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp 2015-05-30 18:34:54.000000000 -0700
+@@ -311,7 +311,7 @@
</ins><span class="cx">
</span><span class="cx"> void tst_QPluginLoader::loadMachO_data()
</span><span class="cx"> {
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> QTest::addColumn<int>("parseResult");
</span><span class="cx">
</span><span class="cx"> QTest::newRow("/dev/null") << int(QMachOParser::NotSuitable);
</span><del>-@@ -355,7 +355,7 @@
</del><ins>+@@ -347,7 +347,7 @@
</ins><span class="cx">
</span><span class="cx"> void tst_QPluginLoader::loadMachO()
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>