[97950] trunk/dports/aqua/qt4-mac
michaelld at macports.org
michaelld at macports.org
Thu Sep 20 12:39:52 PDT 2012
Revision: 97950
http://trac.macports.org//changeset/97950
Author: michaelld at macports.org
Date: 2012-09-20 12:39:52 -0700 (Thu, 20 Sep 2012)
Log Message:
-----------
qt4-mac :
* bump to 4.8.3_0;
* hopefully addresses tickets #27959 and #36225;
* disable +framework variant; always install as framework, and use symlinks to populate libraries and headers into ${prefix}/lib and ${prefix}/include;
* correct patchs to work with new version;
* remove old 10.8 patchfile, and replace with the single remaining path needed for linking corelib;
* install private headers for some Qt modules to allow other ports to work fully (e.g., qt4-creator-mac).
Modified Paths:
--------------
trunk/dports/aqua/qt4-mac/Portfile
trunk/dports/aqua/qt4-mac/files/patch-config.tests_unix_precomp.test.diff
trunk/dports/aqua/qt4-mac/files/patch-configure.diff
trunk/dports/aqua/qt4-mac/files/patch-mkspecs_features_qt_functions.prf.diff
trunk/dports/aqua/qt4-mac/files/patch-qmake_qmake.pri.diff
trunk/dports/aqua/qt4-mac/files/patch-src_3rdparty_webkit_Source_WebKit_qt_QtWebKit.pro.diff
trunk/dports/aqua/qt4-mac/files/patch-src_tools_bootstrap_bootstrap.pro.diff
Added Paths:
-----------
trunk/dports/aqua/qt4-mac/files/patch-src_corelib_corelib.pro.diff
Removed Paths:
-------------
trunk/dports/aqua/qt4-mac/files/patch-EXPERIMENTAL-ML-fixes.diff
Modified: trunk/dports/aqua/qt4-mac/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac/Portfile 2012-09-20 18:10:56 UTC (rev 97949)
+++ trunk/dports/aqua/qt4-mac/Portfile 2012-09-20 19:39:52 UTC (rev 97950)
@@ -11,8 +11,7 @@
name qt4-mac
conflicts qt3 qt3-mac qt4-mac-devel
-version 4.8.2
-revision 3
+version 4.8.3
categories aqua
platforms macosx
maintainers michaelld openmaintainer
@@ -27,8 +26,8 @@
master_sites trolltech
distname qt-everywhere-opensource-src-${version}
-checksums sha1 e1e2edef1d63ed677d6534d32800c2e1f7ad0e73 \
- rmd160 6a15077aee1e84076380787127b80c7bb97ebe86
+checksums sha1 bc352a283610e0cd2fe0dbedbc45613844090fcb \
+ rmd160 fe56e5da874503a79d6f84a1e15460eba5a6feae
minimum_xcodeversions {8 2.5}
@@ -205,14 +204,13 @@
patchfiles-append \
patch-src_3rdparty_webkit_Source_WebCore_WebCore.pro.diff
-# Temporary patch to get ML working; some of this is already upstream
-# https://codereview.qt-project.org/#change,31759
-# See also https://trac.macports.org/ticket/35430
+# (23) Under 10.8 only: Patch to fix corelib linking
+
platform darwin 12 {
- patchfiles-append patch-EXPERIMENTAL-ML-fixes.diff
+ patchfiles-append patch-src_corelib_corelib.pro.diff
}
-# (23) fix Framework directory in MacDeployQt tool
+# (24) fix Framework directory in MacDeployQt tool
patchfiles-append \
patch-tools_macdeployqt_shared_shared.cpp.diff
@@ -389,8 +387,12 @@
#
# -openssl-linked ensures that the MacPorts openssl is used.
#
-# -no-framework ensures that this port is installed as separate
-# libraries and headers, with guaranteed locations and names.
+# -framework ensures that this port is installed as frameworks
+# (collections of {library, headers, resources}); in
+# post-destroot, link headers and libraries from the frameworks
+# into non-framework locations as if "-no-framework" were
+# specified. Some dependent projects will not work properly if Qt
+# is installed as libraries by default, thus make it so #1.
#
# -no-phonon ensures that Qt does not install the 3rd-parth Phonon
# port or its backend to QuickTime 7; Phonon is now installed via
@@ -418,7 +420,7 @@
-dbus-linked \
-fast \
-optimized-qmake \
- -no-framework \
+ -framework \
-no-phonon \
-no-phonon-backend
@@ -571,76 +573,100 @@
reinplace "s|${prefix}/|\${prefix}/|g" ${fixfile}
}
- if {![variant_isset framework]} {
+ # remove -L entries from .prl, and .la files; this is a
+ # framework install, not a library install
- # if not doing framework install: install qt_menu.nib, used by
- # any applications making use of Qt's application class
+ foreach fixfile [exec find ${destroot_qt} -name "*.prl"] {
+ reinplace "/QMAKE_PRL_LIBS/s|-L\[^ \]*||g" ${fixfile}
+ }
+ foreach fixfile [exec find ${destroot_qt} -name "*.la"] {
+ reinplace "/dependency_libs/s|-L\[^ \]*||g" ${fixfile}
+ }
- xinstall -m 755 -d ${destroot_qt}/lib/Resources
- copy ${worksrcpath}/src/gui/mac/qt_menu.nib \
- ${destroot_qt}/lib/Resources
+ # remove redundant -F${prefix}/Library/Frameworks entries
- } else {
+ foreach fixfile [exec find ${destroot_qt} -name "*.prl"] {
+ reinplace "/QMAKE_PRL_LIBS/s|-F\[^ \]*|FREPLACEME|1" \
+ ${fixfile}
+ reinplace "/QMAKE_PRL_LIBS/s|-F\[^ \]*||g" ${fixfile}
+ reinplace "s|FREPLACEME|-F${prefix}/Library/Frameworks|1" \
+ ${fixfile}
+ }
+ foreach fixfile [exec find ${destroot_qt} -name "*.la"] {
+ reinplace "/dependency_libs/s|-F\[^ \]*|FREPLACEME|1" \
+ ${fixfile}
+ reinplace "/dependency_libs/s|-F\[^ \]*||g" ${fixfile}
+ reinplace "s|FREPLACEME|-F${prefix}/Library/Frameworks|1" \
+ ${fixfile}
+ }
- # remove -L entries from .prl, and .la files; this is a
- # framework install, not a library install
+ # move .pc files from ${qt_frameworks_dir}/pkgconfig to
+ # ${qt_pkg_config_dir}
- foreach fixfile [exec find ${destroot_qt} -name "*.prl"] {
- reinplace "/QMAKE_PRL_LIBS/s|-L\[^ \]*||g" ${fixfile}
- }
- foreach fixfile [exec find ${destroot_qt} -name "*.la"] {
- reinplace "/dependency_libs/s|-L\[^ \]*||g" ${fixfile}
- }
+ file delete -force ${destroot}${qt_pkg_config_dir}
+ xinstall -m 755 -d ${destroot}${qt_libs_dir}
+ move ${destroot}${qt_frameworks_dir}/pkgconfig \
+ ${destroot}${qt_libs_dir}
- # remove redundant -F${prefix}/Library/Frameworks entries
+ # get Qt's version numbers
- foreach fixfile [exec find ${destroot_qt} -name "*.prl"] {
- reinplace "/QMAKE_PRL_LIBS/s|-F\[^ \]*|FREPLACEME|1" \
- ${fixfile}
- reinplace "/QMAKE_PRL_LIBS/s|-F\[^ \]*||g" ${fixfile}
- reinplace "s|FREPLACEME|-F${prefix}/Library/Frameworks|1" \
- ${fixfile}
- }
- foreach fixfile [exec find ${destroot_qt} -name "*.la"] {
- reinplace "/dependency_libs/s|-F\[^ \]*|FREPLACEME|1" \
- ${fixfile}
- reinplace "/dependency_libs/s|-F\[^ \]*||g" ${fixfile}
- reinplace "s|FREPLACEME|-F${prefix}/Library/Frameworks|1" \
- ${fixfile}
- }
+ set qt_vers [split ${version} "."]
+ set qt_major [lindex ${qt_vers} 0]
+ set qt_minor [lindex ${qt_vers} 1]
+ set qt_patch [lindex ${qt_vers} 2]
- # move .pc files from ${qt_frameworks_dir}/pkgconfig to
- # ${qt_pkg_config_dir}
+ # link includes and libraries for each actual installed framework
- file delete -force ${destroot}${qt_pkg_config_dir}
- xinstall -m 755 -d ${destroot}${qt_libs_dir}
- move ${destroot}${qt_frameworks_dir}/pkgconfig \
- ${destroot}${qt_libs_dir}
+ foreach fixfile [exec find ${destroot}${qt_frameworks_dir} \
+ -name "*.framework" | \
+ sed -e "s@${destroot}@@g"] {
+ set tf_full [strsed ${fixfile} {s@\\.framework@@}]
+ set tf [strsed ${tf_full} {g at .*\/@@}]
+
# link headers into ${qt_includes_dir}, removing directories
# if they are already there first
- foreach fixfile [exec find ${destroot}${qt_frameworks_dir} \
- -name "*.framework" | \
- sed -e "s@${destroot}@@g"] {
- set tf_full [strsed ${fixfile} {s@\\.framework@@}]
- set tf [strsed ${tf_full} {g at .*\/@@}]
- set inc_file ${destroot}${qt_includes_dir}/${tf}
- if {[file exists ${inc_file}]} {
- file delete -force ${inc_file}
- }
- ln -s ${tf_full}.framework/Headers ${inc_file}
+ set inc_file ${destroot}${qt_includes_dir}/${tf}
+ if {[file exists ${inc_file}]} {
+ file delete -force ${inc_file}
}
+ ln -s ${tf_full}.framework/Headers ${inc_file}
+
+ # link libraries into ${qt_libs_dir}, all 4 number variants as
+ # well as the .prl and .la files
+
+ set libs_dir ${destroot}${qt_libs_dir}
+
+ ln -s ${tf_full}.framework/${tf}.prl ${libs_dir}/lib${tf}.prl
+ ln -s ${tf_full}.la ${libs_dir}/lib${tf}.la
+ ln -s ${tf_full}.framework/${tf} ${libs_dir}/lib${tf}.dylib
+ ln -s ${tf_full}.framework/${tf} ${libs_dir}/lib${tf}.${qt_major}.dylib
+ ln -s ${tf_full}.framework/${tf} ${libs_dir}/lib${tf}.${qt_major}.${qt_minor}.dylib
+ ln -s ${tf_full}.framework/${tf} ${libs_dir}/lib${tf}.${qt_major}.${qt_minor}.${qt_patch}.dylib
+
}
# Install documentation.
+
xinstall -m 755 -d ${worksrcpath}/${qt_docs_dir}
xinstall -m 644 -W ${worksrcpath} \
INSTALL LGPL_EXCEPTION.txt LICENSE.FDL \
LICENSE.GPL3 LICENSE.LGPL README \
${destroot}${qt_docs_dir}
+ # Install private headers needed by QtCreator
+
+ foreach {src_dir include_dir} \
+ {corelib QtCore gui QtGui script QtScript declarative QtDeclarative} {
+ set dest_dir ${destroot}${qt_frameworks_dir}/${include_dir}.framework/Headers/private
+ xinstall -m 755 -d ${dest_dir}
+ set files [exec find ${worksrcpath}/src/${src_dir} -type f -name "*_p.h"]
+ eval xinstall -m 644 [split ${files}] ${dest_dir}
+ }
+
# Move .apps into the applications_dir
+
xinstall -m 755 -d ${destroot}${qt_apps_dir}
foreach app [glob ${destroot}/${qt_bins_dir}/*.app] {
move ${app} ${destroot}${qt_apps_dir}
@@ -662,9 +688,9 @@
}
}
-variant framework description {Build as Frameworks} {
- configure.args-delete -no-framework
- configure.args-append -framework
+variant framework description {Framework Legacy Compatibility Variant} {
+ ui_error "${name} variant +framework has been disabled because ${name} now installs as both libraries and frameworks. Please install ${name} without +framework."
+ return -code error "Variant disabled"
}
variant mysql description {MySQL Qt4 Plugin Legacy Compatibility Variant} {
Deleted: trunk/dports/aqua/qt4-mac/files/patch-EXPERIMENTAL-ML-fixes.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-EXPERIMENTAL-ML-fixes.diff 2012-09-20 18:10:56 UTC (rev 97949)
+++ trunk/dports/aqua/qt4-mac/files/patch-EXPERIMENTAL-ML-fixes.diff 2012-09-20 19:39:52 UTC (rev 97950)
@@ -1,37 +0,0 @@
---- ./src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro.orig 2012-08-02 23:32:52.000000000 -0500
-+++ ./src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro 2012-08-02 23:35:52.000000000 -0500
-@@ -253,6 +253,8 @@
- LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a
- } else: equals(DARWIN_MAJOR_VERSION, "11") | contains(QMAKE_MAC_SDK, "/Developer/SDKs/MacOSX10.7.sdk") {
- LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceLion.a
-+ } else: equals(DARWIN_MAJOR_VERSION, "12") | contains(QMAKE_MAC_SDK, "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk") {
-+ LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceLion.a
- }
- }
- }
---- ./src/corelib/corelib.pro.orig 2012-08-02 23:29:31.000000000 -0500
-+++ ./src/corelib/corelib.pro 2012-08-02 23:31:24.000000000 -0500
-@@ -27,6 +27,9 @@
- } else:mac|darwin {
- LIBS_PRIVATE += -framework CoreFoundation -framework Security
- }
-+
-+LIBS_PRIVATE += -framework Foundation
-+
- mac:lib_bundle:DEFINES += QT_NO_DEBUG_PLUGIN_CHECK
- win32:DEFINES-=QT_NO_CAST_TO_ASCII
-
---- src/corelib/global/qglobal.h.orig 2012-08-07 16:13:40.000000000 -0400
-+++ src/corelib/global/qglobal.h 2012-08-07 16:14:01.000000000 -0400
-@@ -324,7 +324,10 @@
- # if !defined(MAC_OS_X_VERSION_10_7)
- # define MAC_OS_X_VERSION_10_7 MAC_OS_X_VERSION_10_6 + 1
- # endif
--# if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_7)
-+# if !defined(MAC_OS_X_VERSION_10_8)
-+# define MAC_OS_X_VERSION_10_8 MAC_OS_X_VERSION_10_7 + 1
-+# endif
-+# if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_8)
- # warning "This version of Mac OS X is unsupported"
- # endif
- #endif
Modified: trunk/dports/aqua/qt4-mac/files/patch-config.tests_unix_precomp.test.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-config.tests_unix_precomp.test.diff 2012-09-20 18:10:56 UTC (rev 97949)
+++ trunk/dports/aqua/qt4-mac/files/patch-config.tests_unix_precomp.test.diff 2012-09-20 19:39:52 UTC (rev 97950)
@@ -13,9 +13,9 @@
rm -f header.pchi header.o source.o
;;
--*g++*|c++)
+-*g++*|c++|*qcc*)
- case `"$COMPILER" -dumpversion 2>/dev/null` in
-+*g++*|c++|*gcc*|cc)
++*g++*|c++|*qcc*|*gcc*|cc)
+ case `$COMPILER -dumpversion 2>/dev/null` in
3.*)
;;
Modified: trunk/dports/aqua/qt4-mac/files/patch-configure.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-configure.diff 2012-09-20 18:10:56 UTC (rev 97949)
+++ trunk/dports/aqua/qt4-mac/files/patch-configure.diff 2012-09-20 19:39:52 UTC (rev 97950)
@@ -1,6 +1,6 @@
---- configure.orig 2012-08-08 16:12:36.000000000 -0400
-+++ configure 2012-08-08 16:39:19.000000000 -0400
-@@ -901,6 +901,7 @@
+--- configure.orig 2012-09-17 11:00:59.000000000 -0400
++++ configure 2012-09-17 11:01:07.000000000 -0400
+@@ -920,6 +920,7 @@
QT_INSTALL_DOCS=
QT_INSTALL_HEADERS=
QT_INSTALL_LIBS=
@@ -8,7 +8,7 @@
QT_INSTALL_BINS=
QT_INSTALL_PLUGINS=
QT_INSTALL_IMPORTS=
-@@ -1358,6 +1359,9 @@
+@@ -1380,6 +1381,9 @@
libdir)
QT_INSTALL_LIBS="$VAL"
;;
@@ -18,7 +18,7 @@
qtnamespace)
QT_NAMESPACE="$VAL"
;;
-@@ -3649,6 +3653,19 @@
+@@ -3697,6 +3701,19 @@
fi
QT_INSTALL_LIBS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_LIBS"`
@@ -38,7 +38,7 @@
#bins
if [ -z "$QT_INSTALL_BINS" ]; then #default
if [ "$CFG_PREFIX_INSTALL" = "no" ]; then
-@@ -4700,6 +4717,7 @@
+@@ -4752,6 +4769,7 @@
DOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_INSTALL_DOCS"`
HEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_INSTALL_HEADERS"`
LIBRARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_libspath=$QT_INSTALL_LIBS"`
@@ -46,7 +46,7 @@
BINARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_binspath=$QT_INSTALL_BINS"`
PLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_INSTALL_PLUGINS"`
IMPORTS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_impspath=$QT_INSTALL_IMPORTS"`
-@@ -4725,6 +4743,7 @@
+@@ -4777,6 +4795,7 @@
HOSTDOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_HOST_PREFIX/doc"`
HOSTHEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_HOST_PREFIX/include"`
HOSTLIBRARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_libspath=$QT_HOST_PREFIX/lib"`
@@ -54,7 +54,7 @@
HOSTBINARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_binspath=$QT_HOST_PREFIX/bin"`
HOSTPLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_HOST_PREFIX/plugins"`
HOSTIMPORTS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_impspath=$QT_HOST_PREFIX/IMPORTS"`
-@@ -4742,6 +4761,7 @@
+@@ -4794,6 +4813,7 @@
static const char qt_configure_documentation_path_str[256 + 12] = "$HOSTDOCUMENTATION_PATH_STR";
static const char qt_configure_headers_path_str [256 + 12] = "$HOSTHEADERS_PATH_STR";
static const char qt_configure_libraries_path_str [256 + 12] = "$HOSTLIBRARIES_PATH_STR";
@@ -62,7 +62,7 @@
static const char qt_configure_binaries_path_str [256 + 12] = "$HOSTBINARIES_PATH_STR";
static const char qt_configure_plugins_path_str [256 + 12] = "$HOSTPLUGINS_PATH_STR";
static const char qt_configure_imports_path_str [256 + 12] = "$HOSTIMPORTS_PATH_STR";
-@@ -4760,6 +4780,7 @@
+@@ -4812,6 +4832,7 @@
static const char qt_configure_documentation_path_str[256 + 12] = "$DOCUMENTATION_PATH_STR";
static const char qt_configure_headers_path_str [256 + 12] = "$HEADERS_PATH_STR";
static const char qt_configure_libraries_path_str [256 + 12] = "$LIBRARIES_PATH_STR";
@@ -70,7 +70,7 @@
static const char qt_configure_binaries_path_str [256 + 12] = "$BINARIES_PATH_STR";
static const char qt_configure_plugins_path_str [256 + 12] = "$PLUGINS_PATH_STR";
static const char qt_configure_imports_path_str [256 + 12] = "$IMPORTS_PATH_STR";
-@@ -4785,6 +4806,7 @@
+@@ -4837,6 +4858,7 @@
#define QT_CONFIGURE_DOCUMENTATION_PATH qt_configure_documentation_path_str + 12;
#define QT_CONFIGURE_HEADERS_PATH qt_configure_headers_path_str + 12;
#define QT_CONFIGURE_LIBRARIES_PATH qt_configure_libraries_path_str + 12;
@@ -78,7 +78,7 @@
#define QT_CONFIGURE_BINARIES_PATH qt_configure_binaries_path_str + 12;
#define QT_CONFIGURE_PLUGINS_PATH qt_configure_plugins_path_str + 12;
#define QT_CONFIGURE_IMPORTS_PATH qt_configure_imports_path_str + 12;
-@@ -4944,20 +4966,11 @@
+@@ -4996,20 +5018,11 @@
EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(CARBON_CFLAGS)"
EXTRA_OBJS="qsettings_mac.o qcore_mac.o"
EXTRA_SRCS="\"$relpath/src/corelib/io/qsettings_mac.cpp\" \"$relpath/src/corelib/kernel/qcore_mac.cpp\""
@@ -104,7 +104,7 @@
if [ '!' -z "$CFG_SDK" ]; then
echo "SDK_LFLAGS =-Wl,-syslibroot,$CFG_SDK" >>"$mkfile"
echo "SDK_CFLAGS =-isysroot $CFG_SDK" >>"$mkfile"
-@@ -5389,9 +5402,9 @@
+@@ -5441,9 +5454,9 @@
psql)
if [ "$CFG_SQL_psql" != "no" ]; then
# Be careful not to use native pg_config when cross building.
@@ -117,7 +117,7 @@
fi
[ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
[ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"
-@@ -7042,16 +7055,8 @@
+@@ -7097,16 +7110,8 @@
# set the global Mac deployment target. This is overridden on an arch-by-arch basis
# in some cases, see code further down
@@ -136,7 +136,7 @@
# disable Qt 3 support on VxWorks, Symbian and INTEGRITY
case "$XPLATFORM" in
-@@ -7782,28 +7787,28 @@
+@@ -7844,28 +7849,28 @@
# env. variable.
if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" != "no" ] ; then
if echo "$CFG_MAC_ARCHS" | grep '\<x86\>' > /dev/null 2>&1; then
@@ -181,7 +181,7 @@
fi
fi
-@@ -8550,6 +8555,7 @@
+@@ -8618,6 +8623,7 @@
QMAKE_RCC = \$\$QT_BUILD_TREE/bin/rcc
QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
QMAKE_INCDIR_QT = \$\$QT_BUILD_TREE/include
Modified: trunk/dports/aqua/qt4-mac/files/patch-mkspecs_features_qt_functions.prf.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-mkspecs_features_qt_functions.prf.diff 2012-09-20 18:10:56 UTC (rev 97949)
+++ trunk/dports/aqua/qt4-mac/files/patch-mkspecs_features_qt_functions.prf.diff 2012-09-20 19:39:52 UTC (rev 97950)
@@ -1,6 +1,6 @@
---- mkspecs/features/qt_functions.prf.orig 2012-05-11 10:33:49.000000000 -0400
-+++ mkspecs/features/qt_functions.prf 2012-05-25 13:15:09.000000000 -0400
-@@ -16,24 +16,54 @@
+--- mkspecs/features/qt_functions.prf.orig 2012-09-20 10:57:59.000000000 -0400
++++ mkspecs/features/qt_functions.prf 2012-09-20 15:31:19.000000000 -0400
+@@ -16,24 +16,75 @@
}
defineTest(qtAddLibrary) {
@@ -62,25 +62,92 @@
- for(frmwrk_dir, $$list($$QMAKE_LIBDIR_QT $$QMAKE_LIBDIR $$(DYLD_FRAMEWORK_PATH) /Library/Frameworks)) {
- exists($${frmwrk_dir}/$${LIB_NAME}.framework) {
- QMAKE_FRAMEWORKPATH *= $${frmwrk_dir}
++
++ # see if the framework, and exists in the current known paths
++
++ # add LIBS entries QMAKE_FRAMEWORKPATH, as appropriate
++
++ all_frmwrks = $$find(LIBS, -F.*) $$find(QMAKE_LFLAGS, -F.*)
++# message(qtAddLibrary: all frameworks is $$all_frmwrks)
++
++ for(frmwrk_dir, all_frmwrks) {
++
++# message(qtAddLibrary: this frmwrk_dir is $$frmwrk_dir)
++ tfp = $$frmwrk_dir
++ tfp ~= s,-F,,
++ QMAKE_FRAMEWORKPATH *= $$tfp
++# message(qtAddLibrary: this frmwrk_path is $$tfp)
++
++ }
++
+ mac:!qt_no_framework {
-+ for(frmwrk_dir, $$list($$QMAKE_FRAMEWORKDIR_QT $$QMAKE_LIBDIR_QT $$QMAKE_LIBDIR $$(DYLD_FRAMEWORK_PATH))) {
++ for(frmwrk_dir, $$list($$QMAKE_FRAMEWORKPATH $$QMAKE_FRAMEWORKDIR_QT $$QMAKE_LIBDIR_QT $$QMAKE_LIBDIR $$(DYLD_FRAMEWORK_PATH))) {
++
++# message(qtAddLibrary: looking for framework $$LIB_NAME in directory $$frmwrk_dir)
+ exists($${frmwrk_dir}/$${LIB_NAME}.framework) {
-+ QMAKE_FRAMEWORKPATH *= $${frmwrk_dir}
++
++ message(qtAddLibrary: found framework $$LIB_NAME in directory $$frmwrk_dir)
FRAMEWORK_INCLUDE = $$frmwrk_dir/$${LIB_NAME}.framework/Headers
!qt_no_framework_direct_includes:exists($$FRAMEWORK_INCLUDE) {
INCLUDEPATH -= $$FRAMEWORK_INCLUDE
-@@ -42,8 +72,7 @@
+@@ -41,10 +92,13 @@
+ }
LINKAGE = -framework $${LIB_NAME}
break()
++
}
- }
- }
+ }
}
++
++ # special for symbian
++
symbian {
isEqual(LIB_NAME, QtCore) {
-@@ -73,7 +102,16 @@
+ #workaround for dependency from f32file.h on e32svr.h which has moved location in symbian3
+@@ -70,10 +124,56 @@
+ export(TARGET.EPOCHEAPSIZE)
+ export(TARGET.CAPABILITY)
+ }
++
++ isEmpty(LINKAGE) {
++
++ # not a framework or symbian
++ # see if the library exists in the current known paths
++
++ # add LIBS entries QMAKE_LIBPATH, as appropriate
++
++ all_libs = $$find(LIBS, -L.*) $$find(QMAKE_LFLAGS, -L.*)
++# message(qtAddLibrary: all library paths is $$all_libs)
++
++ for(lib_dir, all_libs) {
++
++# message(qtAddLibrary: this lib_dir is $$lib_dir)
++ tlp = $$lib_dir
++ tlp ~= s,-L,,
++ QMAKE_LIBPATH *= $$tlp
++# message(qtAddLibrary: this lib_path is $$tlp)
++
++ }
++
++ for(lib_dir, $$list($$QMAKE_LIBPATH $$QMAKE_LIBDIR_QT $$QMAKE_LIBDIR)) {
++
++# message(qtAddLibrary: looking for library $${LIB_NAME}$${QT_LIBINFIX} in directory $$lib_dir)
++ exists($${lib_dir}/lib$${LIB_NAME}$${QT_LIBINFIX}.*) {
++
++ message(qtAddLibrary: found library $${LIB_NAME}$${QT_LIBINFIX} in directory $$lib_dir)
++ LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}
++ break()
++
++ }
++ }
++ }
++
isEmpty(LINKAGE) {
++
++ message(WARNING: Could not find library or framework $$LIB_NAME in the current known search directories; assuming a default library.)
++
if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
win32:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}d
- mac:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}_debug
@@ -97,7 +164,7 @@
}
isEmpty(LINKAGE):LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}
}
-@@ -83,6 +121,9 @@
+@@ -83,9 +183,13 @@
QMAKE_LFLAGS *= --lsb-shared-libs=$${LIB_NAME}$${QT_LIBINFIX}
}
LIBS += $$LINKAGE
@@ -107,7 +174,11 @@
export(LIBS)
export(INCLUDEPATH)
export(QMAKE_FRAMEWORKPATH)
-@@ -119,4 +160,3 @@
++ export(QMAKE_LIBPATH)
+ export(QMAKE_LFLAGS)
+ return(true)
+ }
+@@ -119,4 +223,3 @@
return(true)
}
Modified: trunk/dports/aqua/qt4-mac/files/patch-qmake_qmake.pri.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-qmake_qmake.pri.diff 2012-09-20 18:10:56 UTC (rev 97949)
+++ trunk/dports/aqua/qt4-mac/files/patch-qmake_qmake.pri.diff 2012-09-20 19:39:52 UTC (rev 97950)
@@ -1,6 +1,6 @@
--- qmake/qmake.pri.orig 2012-04-23 14:49:04.000000000 -0400
+++ qmake/qmake.pri 2012-04-17 14:38:16.000000000 -0400
-@@ -138,7 +138,7 @@
+@@ -136,7 +136,7 @@
mac {
SOURCES += qfilesystemengine_mac.cpp
SOURCES += qcore_mac.cpp qsettings_mac.cpp
Modified: trunk/dports/aqua/qt4-mac/files/patch-src_3rdparty_webkit_Source_WebKit_qt_QtWebKit.pro.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-src_3rdparty_webkit_Source_WebKit_qt_QtWebKit.pro.diff 2012-09-20 18:10:56 UTC (rev 97949)
+++ trunk/dports/aqua/qt4-mac/files/patch-src_3rdparty_webkit_Source_WebKit_qt_QtWebKit.pro.diff 2012-09-20 19:39:52 UTC (rev 97950)
@@ -9,7 +9,7 @@
DEFINES+=NS_BUILD_32_LIKE_64
}
-@@ -295,7 +295,7 @@
+@@ -297,7 +297,7 @@
!symbian-abld:!symbian-sbsv2 {
modfile.files = $$moduleFile
@@ -18,7 +18,7 @@
INSTALLS += modfile
} else {
-@@ -303,7 +303,7 @@
+@@ -305,7 +305,7 @@
inst_modfile.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} ${QMAKE_FILE_OUT}
inst_modfile.input = moduleFile
Added: trunk/dports/aqua/qt4-mac/files/patch-src_corelib_corelib.pro.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-src_corelib_corelib.pro.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/patch-src_corelib_corelib.pro.diff 2012-09-20 19:39:52 UTC (rev 97950)
@@ -0,0 +1,11 @@
+--- src/corelib/corelib.pro.orig 2012-09-17 15:22:14.000000000 -0400
++++ src/corelib/corelib.pro 2012-09-17 15:22:22.000000000 -0400
+@@ -25,7 +25,7 @@
+ LIBS_PRIVATE += -framework CoreServices -framework Security
+ }
+ } else:mac|darwin {
+- LIBS_PRIVATE += -framework CoreFoundation -framework Security
++ LIBS_PRIVATE += -framework CoreFoundation -framework Security -framework Foundation
+ }
+ mac:lib_bundle:DEFINES += QT_NO_DEBUG_PLUGIN_CHECK
+ win32:DEFINES-=QT_NO_CAST_TO_ASCII
Modified: trunk/dports/aqua/qt4-mac/files/patch-src_tools_bootstrap_bootstrap.pro.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-src_tools_bootstrap_bootstrap.pro.diff 2012-09-20 18:10:56 UTC (rev 97949)
+++ trunk/dports/aqua/qt4-mac/files/patch-src_tools_bootstrap_bootstrap.pro.diff 2012-09-20 19:39:52 UTC (rev 97950)
@@ -1,6 +1,6 @@
--- src/tools/bootstrap/bootstrap.pro.orig 2012-04-23 14:49:04.000000000 -0400
+++ src/tools/bootstrap/bootstrap.pro 2012-04-17 14:38:16.000000000 -0400
-@@ -104,7 +104,7 @@
+@@ -103,7 +103,7 @@
else:win32:SOURCES += ../../corelib/tools/qlocale_win.cpp
macx: {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120920/cb782e4f/attachment-0001.html>
More information about the macports-changes
mailing list