[137229] trunk/dports
mcalhoun at macports.org
mcalhoun at macports.org
Sat Jun 6 22:28:14 PDT 2015
Revision: 137229
https://trac.macports.org/changeset/137229
Author: mcalhoun at macports.org
Date: 2015-06-06 22:28:14 -0700 (Sat, 06 Jun 2015)
Log Message:
-----------
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)
Modified Paths:
--------------
trunk/dports/_resources/port1.0/group/qt5-1.0.tcl
trunk/dports/aqua/qt5-mac/Portfile
trunk/dports/aqua/qt5-mac/files/patch-shared.diff
trunk/dports/aqua/qt5-mac/files/patch-tst_qpluginloader.diff
Removed Paths:
-------------
trunk/dports/aqua/qt5-mac/files/patch-avfmediaplayersession.diff
trunk/dports/aqua/qt5-mac/files/patch-qmacstyle_mac.diff
Modified: trunk/dports/_resources/port1.0/group/qt5-1.0.tcl
===================================================================
--- 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)
@@ -65,28 +65,12 @@
# standard install directory
global qt_dir
-set qt_dir ${prefix}
+set qt_dir ${prefix}/libexec/qt5-mac
-# standard Qt documents directory
-global qt_docs_dir
-set qt_docs_dir ${qt_dir}/share/doc/${qt_name}
+# standard Qt non-.app executables directory
+global qt_bins_dir
+set qt_bins_dir ${qt_dir}/bin
-# 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
-
# standard Qt includes directory
global qt_includes_dir
set qt_includes_dir ${qt_dir}/include
@@ -97,53 +81,89 @@
# standard Qt libraries directory
global qt_frameworks_dir
-set qt_frameworks_dir ${qt_dir}/Library/Frameworks
+set qt_frameworks_dir ${qt_libs_dir}
-# standard Qt non-.app executables directory
-global qt_bins_dir
-set qt_bins_dir ${qt_dir}/bin
+global qt_archdata_dir
+set qt_archdata_dir ${qt_dir}
-# standard Qt .app executables directory, if created
-global qt_apps_dir
-set qt_apps_dir ${applications_dir}/Qt5
+# standard Qt plugins directory
+global qt_plugins_dir
+set qt_plugins_dir ${qt_archdata_dir}/plugins
+# 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
+
# standard Qt data directory
global qt_data_dir
-set qt_data_dir ${qt_dir}/share/${qt_name}
+set qt_data_dir ${qt_dir}
+# standard Qt documents directory
+global qt_docs_dir
+set qt_docs_dir ${qt_data_dir}/doc
+
# standard Qt translations directory
global qt_translations_dir
-set qt_translations_dir ${qt_dir}/share/${qt_name}/translations
+set qt_translations_dir ${qt_data_dir}/translations
# standard Qt sysconf directory
global qt_sysconf_dir
-set qt_sysconf_dir ${qt_dir}/etc/${qt_name}
+set qt_sysconf_dir ${qt_dir}/etc/xdg
# standard Qt examples directory
global qt_examples_dir
-set qt_examples_dir ${qt_dir}/share/${qt_name}/examples
+set qt_examples_dir ${qt_dir}/examples
# standard Qt tests directory
global qt_tests_dir
-set qt_tests_dir ${qt_dir}/share/${qt_name}/tests
+set qt_tests_dir ${qt_dir}/tests
+# data used by qmake
+global qt_host_data_dir
+set qt_host_data_dir ${qt_dir}
+
# standard Qt demos directory
-global qt_demos_dir
-set qt_demos_dir ${qt_dir}/share/${qt_name}/demos
+#global qt_demos_dir
+#set qt_demos_dir ${qt_dir}/share/${qt_name}/demos
+# 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}
+
# standard CMake module directory for Qt-related files
-global qt_cmake_module_dir
-set qt_cmake_module_dir ${qt_libs_dir}/cmake
+#global qt_cmake_module_dir
+#set qt_cmake_module_dir ${qt_libs_dir}/cmake
# standard qmake command location
global qt_qmake_cmd
set qt_qmake_cmd ${qt_dir}/bin/qmake
+# 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
+
# standard qmake spec
-# 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++"?
+# other platforms required? (see http://doc.qt.io/qt-5/supported-platforms.html and http://doc.qt.io/QtSupportedPlatforms/index.html)
global qt_qmake_spec
global qt_qmake_spec_32
global qt_qmake_spec_64
@@ -162,26 +182,6 @@
set qt_qmake_spec ""
}
-# 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}
-
# standard cmake info for Qt5
global qt_cmake_defines
set qt_cmake_defines \
Modified: trunk/dports/aqua/qt5-mac/Portfile
===================================================================
--- 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)
@@ -4,8 +4,7 @@
PortSystem 1.0
name qt5-mac
-version 5.3.2
-revision 1
+version 5.4.1
set branch [join [lrange [split ${version} .] 0 1] .]
categories aqua
@@ -23,50 +22,33 @@
master_sites http://download.qt-project.org/official_releases/qt/${branch}/${version}/single/
-checksums rmd160 5cd61acc2fbfba2597a386a09d83710ed2fdf483 \
- sha256 c8d3fd2ead30705c6673c5e4af6c6f3973346b4fb2bd6079c7be0943a5b0282d
+checksums rmd160 43dab9f974b09e5fdf32686ae125359fb01faa2f \
+ sha256 8768a96d73883ae01a11b9b0a23fb9387e84499670de0d47535afe35d0bfe67e
-if { ${os.major} < 10 } {
+if { ${os.major} < 11 } {
pre-fetch {
- 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"
+ 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"
return -code error "unsupported OS"
}
-} 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"
- }
} elseif { ${os.major} > 14 } {
pre-fetch {
ui_warn "OS X subsequent to 10.10 (Yosemite) is not a Reference Configuration for Qt."
- ui_warn "See http://qt-project.org/doc/qt-5/supported-platforms.html#reference-configurations"
+ ui_warn "See http://doc.qt.io/qt-5/supported-platforms.html#reference-configurations"
}
} else {
- # 11 <= ${os.major} <= 13
+ # 11 <= ${os.major} <= 14
if { [variant_isset universal] } {
pre-fetch {
ui_warn "Multiple architectures is not a Reference Configuration for Qt."
- ui_warn "See http://qt-project.org/doc/qt-5/supported-platforms.html#reference-configurations"
+ ui_warn "See http://doc.qt.io/qt-5/supported-platforms.html#reference-configurations"
}
} else {
if { ${build_arch} eq "i386" } {
pre-fetch {
ui_warn "32-bit mode is not a Reference Configuration for Qt."
- ui_warn "See http://qt-project.org/doc/qt-5/supported-platforms.html#reference-configurations"
+ ui_warn "See http://doc.qt.io/qt-5/supported-platforms.html#reference-configurations"
}
}
}
@@ -86,66 +68,101 @@
conflicts qt3 qt3-mac qt4-mac
- minimum_xcodeversions {10 3.2}
+ minimum_xcodeversions {11 4.1}
- # See https://bugreports.qt-project.org/browse/QTBUG-34902
+ # See https://bugreports.qt.io/browse/QTBUG-34902
conflicts_build-append qt4-mac
# Kuba states in https://trac.macports.org/ticket/44207#comment:7
# "There's no reason to have parallel building disabled. Really."
- #use_parallel_build no
+ # TODO: Uncomment out for testing only. Be sure to comment out next line before commit.
+ 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
+ # 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
- # When testing, ensure that a universal object file is not inadvertently created.
- patchfiles-append patch-machtest.diff
+ #needed? qtwebengine/src/3rdparty/chromium/build/gyp_helper.py
- # 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
+ # qtwebengine/src/core/gyp_run.pro
+ # calls
+ # qtwebengine/tools/buildscripts/gyp_qtwebengine
+ # gyp_qtwebengine insists on x64 and libcpp ?
- # see http://stackoverflow.com/questions/14506151/invalid-symbol-redefinition-in-inline-asm-on-llvm
- patchfiles-append patch-tst_benchlibcallgrind.diff
+ # qtwebengine/src/3rdparty/ninja/bootstrap.py calls g++ (must set CXX)
- # During testing, NSStringFromRect requires NSRect.
- patchfiles-append patch-tst_qaccessibilitymac_helpers.diff
+ 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
+ # 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
+ }
+
# see #44934 (and #35067 for the qt4-mac version)
- patchfiles-append patch-shared.diff
+ if { true } {
+ set framework_list [split ${qt_frameworks_dir} '/']
+ set qt_list [split ${qt_dir} '/']
- # see https://bugreports.qt-project.org/browse/QTBUG-41136
- patchfiles-append patch-avfmediaplayersession.diff
+ while {[llength ${qt_list}] && [llength ${framework_list}]} {
+ set var_qt [lindex $qt_list 0]
+ set var_framework [lindex $framework_list 0]
- # see https://bugreports.qt-project.org/browse/QTBUG-41367
- patchfiles-append patch-qmacstyle_mac.diff
+ if { ${var_qt} ne ${var_framework} } {
+ break
+ }
+ # 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
+ }
+ }
+
# --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] "."]]
- }
-
+ # Installation options:
+ #-extprefix SYSROOT/PREFIX
+ #-hostprefix EXTPREFIX
+ #-libexecdir ARCHDATADIR/libexec
+ #-hostbindir HOSTPREFIX/bin
+ #-hostlibdir HOSTPREFIX/lib
configure.args-append \
-prefix ${qt_dir} \
- -docdir ${qt_docs_dir} \
+ -bindir ${qt_bins_dir} \
-headerdir ${qt_includes_dir} \
+ -libdir ${qt_libs_dir} \
+ -archdatadir ${qt_archdata_dir} \
-plugindir ${qt_plugins_dir} \
-importdir ${qt_imports_dir} \
-qmldir ${qt_qml_dir} \
-datadir ${qt_data_dir} \
- -libdir ${qt_frameworks_dir} \
- -bindir ${qt_bins_dir} \
+ -docdir ${qt_docs_dir} \
-translationdir ${qt_translations_dir} \
-sysconfdir ${qt_sysconf_dir} \
-examplesdir ${qt_examples_dir} \
@@ -157,51 +174,18 @@
-release \
-opensource \
-confirm-license \
+ -c++11 \
-shared \
- -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
-
+ -largefile \
+ -accessibility
+
foreach driver { db2 ibase mysql oci odbc psql sqlite sqlite2 tds } {
configure.args-append -no-sql-${driver}
}
+ configure.args-append \
+ -qml-debug
+
if { ![variant_isset universal] } {
configure.args-append "-platform ${qt_qmake_spec}"
} else {
@@ -209,8 +193,71 @@
set merger_configure_args(x86_64) "-platform ${qt_qmake_spec_64}"
}
+ 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] "."]]
+ }
+
# configure options that don't show up in configure --help
configure.args-append \
+ -no-libudev \
+ -no-egl \
-no-openvg
# Qt builds part of the system using environment provided my MacPorts.
@@ -242,9 +289,6 @@
}
if { ${subport} eq ${name} } {
- # remove this when updating to the next version
- incr revision
-
depends_lib \
port:zlib \
port:libpng \
@@ -257,9 +301,11 @@
path:lib/pkgconfig/glib-2.0.pc:glib2 \
port:icu \
port:pcre \
- port:libiconv
+ port:libiconv \
+ port:harfbuzz \
+ port:pulseaudio
- # see https://bugreports.qt-project.org/browse/QTBUG-35514
+ # see https://bugreports.qt.io/browse/QTBUG-35514
build.target
if { [variant_isset universal] } {
@@ -267,25 +313,36 @@
foreach arch ${universal_archs_to_use} {
set dir ${destroot}-${arch}
- reinplace "s|${worksrcpath}-${arch}|${worksrcpath}|g" ${dir}${qt_frameworks_dir}/pkgconfig/Qt5WebKit.pc
+ # Libs.private contains the value of ${worksrcpath}-${arch}, which prevents merging
+ reinplace "s|${worksrcpath}-${arch}|${worksrcpath}|g" ${dir}${qt_libs_dir}/pkgconfig/Qt5WebKit.pc
- foreach prlfl [glob ${dir}${qt_frameworks_dir}/*.framework/*.prl] {
+ foreach prlfl [glob ${dir}${qt_libs_dir}/*.framework/*.prl] {
reinplace "s|${worksrcpath}-${arch}|${worksrcpath}|g" ${prlfl}
}
- foreach prlfl [glob ${dir}${qt_frameworks_dir}/*.prl] {
+ foreach prlfl [glob ${dir}${qt_libs_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|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
- 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
+ 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
+ }
+ }
}
}
@@ -301,50 +358,30 @@
}
post-destroot {
-
# see #44204
- 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}
- }
+ foreach f [glob -nocomplain -tails -directory ${destroot}${qt_libs_dir} *.framework] {
+ set framework [file rootname ${f}]
- # 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}/
+ 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]
}
- }
- 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}/
- }
- # 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}/
+ ln -s [string repeat ../ [llength ${include_list}]][join ${framework_list} /]/${f}/Headers ${destroot}${qt_includes_dir}/${framework}
}
}
- 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}
}
@@ -360,7 +397,7 @@
subport ${name}-docs {
depends_lib-append \
- path:${prefix}/bin/qdoc:${name} \
+ path:${qt_bins_dir}/qdoc:${name} \
path:${qt_plugins_dir}/sqldrivers/libqsqlite.dylib:${name}-sqlite3-plugin
supported_archs noarch
@@ -370,13 +407,11 @@
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/.
- ln -s ${prefix}/bin/qdoc ${worksrcpath}/qtbase/src/tools/qdoc/
- ln -s ${prefix}/bin/qdoc ${worksrcpath}/qtbase/bin
+ ln -s ${qt_bins_dir}/qdoc ${worksrcpath}/qtbase/bin
# Similarly, location of qhelpgenerator is expected in ${worksrcpath}
xinstall -d -m 755 ${worksrcpath}/qttools/bin/
- ln -s ${prefix}/bin/qhelpgenerator ${worksrcpath}/qttools/bin/
+ ln -s ${qt_bins_dir}/qhelpgenerator ${worksrcpath}/qttools/bin/
# Without this file, the makefile ${worksrcpath}/qtwebkit/Source/WebCore/Makefile.WebCore.Target
# keeps generating itself over and over again.
@@ -386,7 +421,7 @@
}
}
-# See http://qt-project.org/doc/qt-5/sql-driver.html for info on building SQL Database Drivers
+# See http://doc.qt.io/qt-5/sql-driver.html for info on building SQL Database Drivers
subport ${name}-sqlite3-plugin {
PortGroup qmake5 1.0
Deleted: trunk/dports/aqua/qt5-mac/files/patch-avfmediaplayersession.diff
===================================================================
--- 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)
@@ -1,11 +0,0 @@
---- 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
Deleted: trunk/dports/aqua/qt5-mac/files/patch-qmacstyle_mac.diff
===================================================================
--- 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)
@@ -1,14 +0,0 @@
---- .//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);
- }
-
Modified: trunk/dports/aqua/qt5-mac/files/patch-shared.diff
===================================================================
--- 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)
@@ -1,11 +1,11 @@
---- .//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 @@
+--- 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 @@
state = DylibName;
continue;
} else if (part < parts.count() && parts.at(part).endsWith(".framework")) {
- info.installName += "/" + (qtPath + "lib/").simplified();
-+ info.installName += "/" + (qtPath + "Frameworks/").simplified();
++ info.installName += "/" + (qtPath + "__MACPORTS_FRAMWORK_DIR__/").simplified();
info.frameworkDirectory = info.installName;
state = FrameworkName;
continue;
Modified: trunk/dports/aqua/qt5-mac/files/patch-tst_qpluginloader.diff
===================================================================
--- 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)
@@ -1,6 +1,6 @@
-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 @@
+--- .//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 @@
void tst_QPluginLoader::loadMachO_data()
{
@@ -9,7 +9,7 @@
QTest::addColumn<int>("parseResult");
QTest::newRow("/dev/null") << int(QMachOParser::NotSuitable);
-@@ -355,7 +355,7 @@
+@@ -347,7 +347,7 @@
void tst_QPluginLoader::loadMachO()
{
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150606/4d0db1d2/attachment-0001.html>
More information about the macports-changes
mailing list