<!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>[121627] trunk/dports/aqua/qt5-mac/Portfile</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/121627">121627</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2014-07-02 12:25:50 -0700 (Wed, 02 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>qt5-mac: remove trailing spaces</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsaquaqt5macPortfile">trunk/dports/aqua/qt5-mac/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsaquaqt5macPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/aqua/qt5-mac/Portfile (121626 => 121627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/qt5-mac/Portfile 2014-07-02 19:23:28 UTC (rev 121626)
+++ trunk/dports/aqua/qt5-mac/Portfile 2014-07-02 19:25:50 UTC (rev 121627)
</span><span class="lines">@@ -75,17 +75,17 @@
</span><span class="cx"> universal_variant no
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if { ${subport} eq ${name} || ${subport} eq "${name}-docs" } {
</del><ins>+if { ${subport} eq ${name} || ${subport} eq "${name}-docs" } {
</ins><span class="cx"> # use the qt5 group; set 'building_qt5' so that the portgroup
</span><span class="cx"> # does not include certain parts
</span><span class="cx"> set building_qt5 1
</span><span class="cx"> PortGroup qt5 1.0
</span><span class="cx"> PortGroup xcodeversion 1.0
</span><del>-
</del><ins>+
</ins><span class="cx"> conflicts qt3 qt3-mac qt4-mac
</span><span class="cx">
</span><span class="cx"> minimum_xcodeversions {10 3.2}
</span><del>-
</del><ins>+
</ins><span class="cx"> pre-configure {
</span><span class="cx"> # See https://bugreports.qt-project.org/browse/QTBUG-34902
</span><span class="cx"> if {![catch {set installed [lindex [registry_active qt4-mac] 0]}]} {
</span><span class="lines">@@ -94,16 +94,16 @@
</span><span class="cx"> return -code error "conflicting port (qt4-mac)"
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> # More testing is required to see if this is necessary.
</span><span class="cx"> use_parallel_build no
</span><del>-
</del><ins>+
</ins><span class="cx"> # header file QtCore/private/qmachparser_p.h is included only if "defined(QT_BUILD_INTERNAL) && defined(Q_OF_MACH_O)"
</span><span class="cx"> # code from header is used only "ifdef Q_OF_MACH_O"
</span><span class="cx"> # the two must be consistent
</span><span class="cx"> # assume the header include code is correct
</span><span class="cx"> patchfiles-append patch-tst_qpluginloader.diff
</span><del>-
</del><ins>+
</ins><span class="cx"> # When testing, ensure that a universal object file is not inadvertently created.
</span><span class="cx"> patchfiles-append patch-machtest.diff
</span><span class="cx">
</span><span class="lines">@@ -112,24 +112,24 @@
</span><span class="cx"> # Post-patch: QCOMPARE(unsigned int const&, unsigned int const&
</span><span class="cx"> # Function template is only instantiated for same first and second arguments.
</span><span class="cx"> patchfiles-append patch-tst_qarraydata.diff
</span><del>-
</del><ins>+
</ins><span class="cx"> # see http://stackoverflow.com/questions/14506151/invalid-symbol-redefinition-in-inline-asm-on-llvm
</span><span class="cx"> patchfiles-append patch-tst_benchlibcallgrind.diff
</span><span class="cx">
</span><span class="cx"> # During testing, NSStringFromRect requires NSRect.
</span><span class="cx"> patchfiles-append patch-tst_qaccessibilitymac_helpers.diff
</span><del>-
</del><ins>+
</ins><span class="cx"> # --prefix is not recognized.
</span><span class="cx"> configure.pre_args-delete --prefix=${prefix}
</span><del>-
</del><ins>+
</ins><span class="cx"> # --disable-dependency-tracking is not recognized.
</span><span class="cx"> configure.universal_args-delete --disable-dependency-tracking
</span><del>-
</del><ins>+
</ins><span class="cx"> if {${configure.sdkroot} ne ""} {
</span><span class="cx"> configure.args-append \
</span><span class="cx"> -sdk [string tolower [join [lrange [split [lindex [split ${configure.sdkroot} "/"] end] "."] 0 end-1] "."]]
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> configure.args-append \
</span><span class="cx"> -prefix ${qt_dir} \
</span><span class="cx"> -docdir ${qt_docs_dir} \
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx"> -examplesdir ${qt_examples_dir} \
</span><span class="cx"> -testsdir ${qt_tests_dir} \
</span><span class="cx"> -hostdatadir ${qt_host_data_dir}
</span><del>-
</del><ins>+
</ins><span class="cx"> # Configure options:
</span><span class="cx"> configure.args-append \
</span><span class="cx"> -release \
</span><span class="lines">@@ -153,7 +153,7 @@
</span><span class="cx"> -confirm-license \
</span><span class="cx"> -shared \
</span><span class="cx"> -process
</span><del>-
</del><ins>+
</ins><span class="cx"> # Third Party Libraries:
</span><span class="cx"> configure.args-append \
</span><span class="cx"> -no-mtdev \
</span><span class="lines">@@ -161,12 +161,12 @@
</span><span class="cx"> -openssl-linked \
</span><span class="cx"> -no-xinput2 \
</span><span class="cx"> -no-xcb-xlib
</span><del>-
</del><ins>+
</ins><span class="cx"> # configure options that don't show up in configure --help
</span><span class="cx"> configure.args-append \
</span><span class="cx"> -no-libudev \
</span><span class="cx"> -no-egl
</span><del>-
</del><ins>+
</ins><span class="cx"> # Additional options:
</span><span class="cx"> configure.args-append \
</span><span class="cx"> {-make libs} \
</span><span class="lines">@@ -191,22 +191,22 @@
</span><span class="cx"> -no-kms \
</span><span class="cx"> -no-system-proxies \
</span><span class="cx"> -framework
</span><del>-
</del><ins>+
</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><del>-
</del><ins>+
</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="cx"> set merger_configure_args(i386) "-platform ${qt_qmake_spec_32}"
</span><span class="cx"> set merger_configure_args(x86_64) "-platform ${qt_qmake_spec_64}"
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> # configure options that don't show up in configure --help
</span><span class="cx"> configure.args-append \
</span><span class="cx"> -no-openvg
</span><del>-
</del><ins>+
</ins><span class="cx"> # Qt builds part of the system using environment provided my MacPorts.
</span><span class="cx"> # It builds the rest using its own internal environment.
</span><span class="cx"> # For consistency, clear MacPorts environment.
</span><span class="lines">@@ -252,45 +252,45 @@
</span><span class="cx">
</span><span class="cx"> # see https://bugreports.qt-project.org/browse/QTBUG-35514
</span><span class="cx"> build.target
</span><del>-
</del><ins>+
</ins><span class="cx"> if { [variant_isset universal] } {
</span><span class="cx"> merger-post-destroot {
</span><span class="cx"> foreach arch ${universal_archs_to_use} {
</span><span class="cx"> set dir ${destroot}-${arch}
</span><del>-
</del><ins>+
</ins><span class="cx"> reinplace "s|${worksrcpath}-${arch}|${worksrcpath}|g" ${dir}${qt_frameworks_dir}/pkgconfig/Qt5WebKit.pc
</span><del>-
</del><ins>+
</ins><span class="cx"> foreach prlfl [glob ${dir}${qt_frameworks_dir}/*.framework/*.prl] {
</span><span class="cx"> reinplace "s|${worksrcpath}-${arch}|${worksrcpath}|g" ${prlfl}
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> foreach prlfl [glob ${dir}${qt_frameworks_dir}/*.prl] {
</span><span class="cx"> reinplace "s|${worksrcpath}-${arch}|${worksrcpath}|g" ${prlfl}
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> foreach prlfl [glob ${dir}${qt_frameworks_dir}/*.framework/*.prl] {
</span><span class="cx"> reinplace "s|${worksrcpath}-${arch}|${worksrcpath}|g" ${prlfl}
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> reinplace "s|${worksrcpath}-${arch}|${worksrcpath}|g" ${dir}${qt_mkspecs_dir}/modules/qt_lib_bootstrap_private.pri
</span><del>-
</del><ins>+
</ins><span class="cx"> reinplace \
</span><span class="cx"> "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\")|" \
</span><span class="cx"> ${dir}${qt_frameworks_dir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> post-destroot {
</span><span class="cx"> # delete preprocessor comments surrounding QT_CPU_FEATURES.i386 and QT_CPU_FEATURES.x86_64
</span><span class="cx"> reinplace "/^#ifndef.*$/d" ${destroot}${qt_mkspecs_dir}/qmodule.pri
</span><span class="cx"> reinplace "/^#else.*$/d" ${destroot}${qt_mkspecs_dir}/qmodule.pri
</span><span class="cx"> reinplace "/^#endif.*$/d" ${destroot}${qt_mkspecs_dir}/qmodule.pri
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> # The file ${prefix}/share/qt5/mkspecs/qconfig.pri is still not properly merged
</span><span class="cx"> # The solution is ???.
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> post-destroot {
</span><span class="cx"> # move items out of the Frameworks directory that are more appropriate to lib directory
</span><span class="cx"> xinstall -m 775 -d ${destroot}${qt_cmake_module_dir}
</span><span class="lines">@@ -312,29 +312,29 @@
</span><span class="cx"> foreach f [glob -nocomplain -directory ${destroot}${qt_frameworks_dir} *.{a,prl,la}] {
</span><span class="cx"> file rename ${f} ${destroot}${qt_libs_dir}/
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> # move items out of the bin directory that are more appropriate to the Applications directory
</span><span class="cx"> xinstall -m 775 -d ${destroot}${qt_apps_dir}
</span><span class="cx"> foreach f [glob -nocomplain -directory ${destroot}${qt_bins_dir} *.app] {
</span><span class="cx"> file rename ${f} ${destroot}${qt_apps_dir}/
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> variant harfbuzz description {(experimental) Use HarfBuzz-NG to do text shaping} {
</span><span class="cx"> depends_lib-append port:harfbuzz
</span><span class="cx"> configure.args-replace \
</span><span class="cx"> -no-harfbuzz \
</span><span class="cx"> -system-harfbuzz
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> variant tests description {Enable tests} {
</span><span class="cx"> configure.args-replace {-nomake tests} {-make tests}
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> variant examples description {Build examples} {
</span><span class="cx"> configure.args-replace {-nomake examples} {-make examples}
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> variant debug description {Build both release and debug library} {
</span><span class="cx"> configure.args-replace -release -debug-and-release
</span><span class="cx"> }
</span><span class="lines">@@ -344,12 +344,12 @@
</span><span class="cx"> depends_lib-append \
</span><span class="cx"> path:${prefix}/bin/qdoc:${name} \
</span><span class="cx"> path:${qt_plugins_dir}/sqldrivers/libqsqlite.dylib:${name}-sqlite3-plugin
</span><del>-
</del><ins>+
</ins><span class="cx"> supported_archs noarch
</span><del>-
</del><ins>+
</ins><span class="cx"> build.target docs
</span><span class="cx"> destroot.target install_docs
</span><del>-
</del><ins>+
</ins><span class="cx"> post-extract {
</span><span class="cx"> # For the most part, generated makefiles use ${prefix}/bin/qdoc.
</span><span class="cx"> # There are a couple of places that look in ${worksrcpath}/qtbase/src/tools/qdoc/.
</span><span class="lines">@@ -359,10 +359,10 @@
</span><span class="cx"> # Similarly, location of qhelpgenerator is expected in ${worksrcpath}
</span><span class="cx"> xinstall -d -m 755 ${worksrcpath}/qttools/bin/
</span><span class="cx"> ln -s ${prefix}/bin/qhelpgenerator ${worksrcpath}/qttools/bin/
</span><del>-
</del><ins>+
</ins><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><del>- # This file is only created when the library is being built, however.
</del><ins>+ # This file is only created when the library is being built, however.
</ins><span class="cx"> xinstall -d -m 755 ${worksrcpath}/qtwebkit/Source/WebCore/generated
</span><span class="cx"> touch ${worksrcpath}/qtwebkit/Source/WebCore/generated/InspectorBackendCommands.qrc
</span><span class="cx"> }
</span><span class="lines">@@ -372,46 +372,46 @@
</span><span class="cx">
</span><span class="cx"> subport ${name}-sqlite3-plugin {
</span><span class="cx"> PortGroup qmake5 1.0
</span><del>-
</del><ins>+
</ins><span class="cx"> depends_lib-append port:sqlite3
</span><del>-
</del><ins>+
</ins><span class="cx"> # for single architecture, easier to use
</span><span class="cx"> # worksrcdir ${worksrcdir}/qtbase/src/plugins/sqldrivers/sqlite,
</span><span class="cx"> # but doesn't work for universal build
</span><span class="cx"> configure.dir ${worksrcpath}/qtbase/src/plugins/sqldrivers/sqlite
</span><span class="cx"> build.dir ${configure.dir}
</span><span class="cx"> destroot.dir ${configure.dir}
</span><del>-
</del><ins>+
</ins><span class="cx"> configure.args-append "INCLUDEPATH+=${prefix}/include" "LIBS+=\"-L${prefix}/lib -lsqlite3\""
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> subport ${name}-psql84-plugin {
</span><span class="cx"> PortGroup qmake5 1.0
</span><del>-
</del><ins>+
</ins><span class="cx"> depends_lib-append port:postgresql84
</span><del>-
</del><ins>+
</ins><span class="cx"> # for single architecture, easier to use
</span><span class="cx"> # worksrcdir ${worksrcdir}/qtbase/src/plugins/sqldrivers/psql,
</span><span class="cx"> # but doesn't work for universal build
</span><span class="cx"> configure.dir ${worksrcpath}/qtbase/src/plugins/sqldrivers/psql
</span><span class="cx"> build.dir ${configure.dir}
</span><span class="cx"> destroot.dir ${configure.dir}
</span><del>-
</del><ins>+
</ins><span class="cx"> configure.args-append "INCLUDEPATH+=${prefix}/include/postgresql84" "LIBS+=\"-L${prefix}/lib/postgresql84 -lpq\""
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> subport ${name}-mysql56-plugin {
</span><span class="cx"> PortGroup qmake5 1.0
</span><del>-
</del><ins>+
</ins><span class="cx"> depends_lib-append port:mysql56
</span><del>-
</del><ins>+
</ins><span class="cx"> # for single architecture, easier to use
</span><span class="cx"> # worksrcdir ${worksrcdir}/qtbase/src/plugins/sqldrivers/mysql,
</span><span class="cx"> # but doesn't work for universal build
</span><span class="cx"> configure.dir ${worksrcpath}/qtbase/src/plugins/sqldrivers/mysql
</span><span class="cx"> build.dir ${configure.dir}
</span><span class="cx"> destroot.dir ${configure.dir}
</span><del>-
</del><ins>+
</ins><span class="cx"> configure.args-append "INCLUDEPATH+=${prefix}/include/mysql56/mysql" "LIBS+=\"-L${prefix}/lib/mysql56/mysql -lmysqlclient_r\""
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>