[121627] trunk/dports/aqua/qt5-mac/Portfile
mojca at macports.org
mojca at macports.org
Wed Jul 2 12:25:50 PDT 2014
Revision: 121627
https://trac.macports.org/changeset/121627
Author: mojca at macports.org
Date: 2014-07-02 12:25:50 -0700 (Wed, 02 Jul 2014)
Log Message:
-----------
qt5-mac: remove trailing spaces
Modified Paths:
--------------
trunk/dports/aqua/qt5-mac/Portfile
Modified: trunk/dports/aqua/qt5-mac/Portfile
===================================================================
--- 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)
@@ -75,17 +75,17 @@
universal_variant no
}
-if { ${subport} eq ${name} || ${subport} eq "${name}-docs" } {
+if { ${subport} eq ${name} || ${subport} eq "${name}-docs" } {
# use the qt5 group; set 'building_qt5' so that the portgroup
# does not include certain parts
set building_qt5 1
PortGroup qt5 1.0
PortGroup xcodeversion 1.0
-
+
conflicts qt3 qt3-mac qt4-mac
minimum_xcodeversions {10 3.2}
-
+
pre-configure {
# See https://bugreports.qt-project.org/browse/QTBUG-34902
if {![catch {set installed [lindex [registry_active qt4-mac] 0]}]} {
@@ -94,16 +94,16 @@
return -code error "conflicting port (qt4-mac)"
}
}
-
+
# More testing is required to see if this is necessary.
use_parallel_build no
-
+
# 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
-
+
# When testing, ensure that a universal object file is not inadvertently created.
patchfiles-append patch-machtest.diff
@@ -112,24 +112,24 @@
# 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
-
+
# see http://stackoverflow.com/questions/14506151/invalid-symbol-redefinition-in-inline-asm-on-llvm
patchfiles-append patch-tst_benchlibcallgrind.diff
# During testing, NSStringFromRect requires NSRect.
patchfiles-append patch-tst_qaccessibilitymac_helpers.diff
-
+
# --prefix is not recognized.
configure.pre_args-delete --prefix=${prefix}
-
+
# --disable-dependency-tracking is not recognized.
configure.universal_args-delete --disable-dependency-tracking
-
+
if {${configure.sdkroot} ne ""} {
configure.args-append \
-sdk [string tolower [join [lrange [split [lindex [split ${configure.sdkroot} "/"] end] "."] 0 end-1] "."]]
}
-
+
configure.args-append \
-prefix ${qt_dir} \
-docdir ${qt_docs_dir} \
@@ -145,7 +145,7 @@
-examplesdir ${qt_examples_dir} \
-testsdir ${qt_tests_dir} \
-hostdatadir ${qt_host_data_dir}
-
+
# Configure options:
configure.args-append \
-release \
@@ -153,7 +153,7 @@
-confirm-license \
-shared \
-process
-
+
# Third Party Libraries:
configure.args-append \
-no-mtdev \
@@ -161,12 +161,12 @@
-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} \
@@ -191,22 +191,22 @@
-no-kms \
-no-system-proxies \
-framework
-
+
foreach driver { db2 ibase mysql oci odbc psql sqlite sqlite2 tds } {
configure.args-append -no-sql-${driver}
}
-
+
if { ![variant_isset universal] } {
configure.args-append "-platform ${qt_qmake_spec}"
} else {
set merger_configure_args(i386) "-platform ${qt_qmake_spec_32}"
set merger_configure_args(x86_64) "-platform ${qt_qmake_spec_64}"
}
-
+
# configure options that don't show up in configure --help
configure.args-append \
-no-openvg
-
+
# Qt builds part of the system using environment provided my MacPorts.
# It builds the rest using its own internal environment.
# For consistency, clear MacPorts environment.
@@ -252,45 +252,45 @@
# see https://bugreports.qt-project.org/browse/QTBUG-35514
build.target
-
+
if { [variant_isset universal] } {
merger-post-destroot {
foreach arch ${universal_archs_to_use} {
set dir ${destroot}-${arch}
-
+
reinplace "s|${worksrcpath}-${arch}|${worksrcpath}|g" ${dir}${qt_frameworks_dir}/pkgconfig/Qt5WebKit.pc
-
+
foreach prlfl [glob ${dir}${qt_frameworks_dir}/*.framework/*.prl] {
reinplace "s|${worksrcpath}-${arch}|${worksrcpath}|g" ${prlfl}
}
-
+
foreach prlfl [glob ${dir}${qt_frameworks_dir}/*.prl] {
reinplace "s|${worksrcpath}-${arch}|${worksrcpath}|g" ${prlfl}
}
-
+
foreach prlfl [glob ${dir}${qt_frameworks_dir}/*.framework/*.prl] {
reinplace "s|${worksrcpath}-${arch}|${worksrcpath}|g" ${prlfl}
}
-
+
reinplace "s|${worksrcpath}-${arch}|${worksrcpath}|g" ${dir}${qt_mkspecs_dir}/modules/qt_lib_bootstrap_private.pri
-
+
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
}
}
-
+
post-destroot {
# delete preprocessor comments surrounding QT_CPU_FEATURES.i386 and QT_CPU_FEATURES.x86_64
reinplace "/^#ifndef.*$/d" ${destroot}${qt_mkspecs_dir}/qmodule.pri
reinplace "/^#else.*$/d" ${destroot}${qt_mkspecs_dir}/qmodule.pri
reinplace "/^#endif.*$/d" ${destroot}${qt_mkspecs_dir}/qmodule.pri
}
-
+
# The file ${prefix}/share/qt5/mkspecs/qconfig.pri is still not properly merged
# The solution is ???.
}
-
+
post-destroot {
# move items out of the Frameworks directory that are more appropriate to lib directory
xinstall -m 775 -d ${destroot}${qt_cmake_module_dir}
@@ -312,29 +312,29 @@
foreach f [glob -nocomplain -directory ${destroot}${qt_frameworks_dir} *.{a,prl,la}] {
file rename ${f} ${destroot}${qt_libs_dir}/
}
-
+
# 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}/
}
}
-
+
variant harfbuzz description {(experimental) Use HarfBuzz-NG to do text shaping} {
depends_lib-append port:harfbuzz
configure.args-replace \
-no-harfbuzz \
-system-harfbuzz
}
-
+
variant tests description {Enable tests} {
configure.args-replace {-nomake tests} {-make tests}
}
-
+
variant examples description {Build examples} {
configure.args-replace {-nomake examples} {-make examples}
}
-
+
variant debug description {Build both release and debug library} {
configure.args-replace -release -debug-and-release
}
@@ -344,12 +344,12 @@
depends_lib-append \
path:${prefix}/bin/qdoc:${name} \
path:${qt_plugins_dir}/sqldrivers/libqsqlite.dylib:${name}-sqlite3-plugin
-
+
supported_archs noarch
-
+
build.target docs
destroot.target install_docs
-
+
post-extract {
# For the most part, generated makefiles use ${prefix}/bin/qdoc.
# There are a couple of places that look in ${worksrcpath}/qtbase/src/tools/qdoc/.
@@ -359,10 +359,10 @@
# Similarly, location of qhelpgenerator is expected in ${worksrcpath}
xinstall -d -m 755 ${worksrcpath}/qttools/bin/
ln -s ${prefix}/bin/qhelpgenerator ${worksrcpath}/qttools/bin/
-
+
# Without this file, the makefile ${worksrcpath}/qtwebkit/Source/WebCore/Makefile.WebCore.Target
# keeps generating itself over and over again.
- # This file is only created when the library is being built, however.
+ # This file is only created when the library is being built, however.
xinstall -d -m 755 ${worksrcpath}/qtwebkit/Source/WebCore/generated
touch ${worksrcpath}/qtwebkit/Source/WebCore/generated/InspectorBackendCommands.qrc
}
@@ -372,46 +372,46 @@
subport ${name}-sqlite3-plugin {
PortGroup qmake5 1.0
-
+
depends_lib-append port:sqlite3
-
+
# for single architecture, easier to use
# worksrcdir ${worksrcdir}/qtbase/src/plugins/sqldrivers/sqlite,
# but doesn't work for universal build
configure.dir ${worksrcpath}/qtbase/src/plugins/sqldrivers/sqlite
build.dir ${configure.dir}
destroot.dir ${configure.dir}
-
+
configure.args-append "INCLUDEPATH+=${prefix}/include" "LIBS+=\"-L${prefix}/lib -lsqlite3\""
}
subport ${name}-psql84-plugin {
PortGroup qmake5 1.0
-
+
depends_lib-append port:postgresql84
-
+
# for single architecture, easier to use
# worksrcdir ${worksrcdir}/qtbase/src/plugins/sqldrivers/psql,
# but doesn't work for universal build
configure.dir ${worksrcpath}/qtbase/src/plugins/sqldrivers/psql
build.dir ${configure.dir}
destroot.dir ${configure.dir}
-
+
configure.args-append "INCLUDEPATH+=${prefix}/include/postgresql84" "LIBS+=\"-L${prefix}/lib/postgresql84 -lpq\""
}
subport ${name}-mysql56-plugin {
PortGroup qmake5 1.0
-
+
depends_lib-append port:mysql56
-
+
# for single architecture, easier to use
# worksrcdir ${worksrcdir}/qtbase/src/plugins/sqldrivers/mysql,
# but doesn't work for universal build
configure.dir ${worksrcpath}/qtbase/src/plugins/sqldrivers/mysql
build.dir ${configure.dir}
destroot.dir ${configure.dir}
-
+
configure.args-append "INCLUDEPATH+=${prefix}/include/mysql56/mysql" "LIBS+=\"-L${prefix}/lib/mysql56/mysql -lmysqlclient_r\""
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140702/dc558c93/attachment-0001.html>
More information about the macports-changes
mailing list