[93699] branches/mld-qt-481/dports/aqua/qt4-mac
michaelld at macports.org
michaelld at macports.org
Mon May 28 08:25:26 PDT 2012
Revision: 93699
https://trac.macports.org/changeset/93699
Author: michaelld at macports.org
Date: 2012-05-28 08:25:24 -0700 (Mon, 28 May 2012)
Log Message:
-----------
qt4-mac test branch : fix patches to work with 4.8.2.
Modified Paths:
--------------
branches/mld-qt-481/dports/aqua/qt4-mac/Portfile
branches/mld-qt-481/dports/aqua/qt4-mac/files/patch-configure.diff
Removed Paths:
-------------
branches/mld-qt-481/dports/aqua/qt4-mac/files/patch-src_3rdparty_webkit_Source_WebKit_qt_qt_webkit_version.pri.diff
Modified: branches/mld-qt-481/dports/aqua/qt4-mac/Portfile
===================================================================
--- branches/mld-qt-481/dports/aqua/qt4-mac/Portfile 2012-05-28 14:29:37 UTC (rev 93698)
+++ branches/mld-qt-481/dports/aqua/qt4-mac/Portfile 2012-05-28 15:25:24 UTC (rev 93699)
@@ -139,34 +139,29 @@
patch-src_3rdparty_webkit_Source_WebCore_plugins_PluginView.h.diff \
patch-src_3rdparty_webkit_Source_WebCore_plugins_mac_PluginViewMac.mm.diff
-# (14) fix QtWebKit version info to match Qt's
+# (14) fix MKSPECS install location for WebKit
patchfiles-append \
- patch-src_3rdparty_webkit_Source_WebKit_qt_qt_webkit_version.pri.diff
-
-# (15) fix MKSPECS install location for WebKit
-
-patchfiles-append \
patch-src_3rdparty_webkit_Source_WebKit_qt_QtWebKit.pro.diff
-# (16) fix the corewlan qmake file to use non-standard Developer SDK
+# (15) fix the corewlan qmake file to use non-standard Developer SDK
# location under 10.6 and newer, e.g., for some developers doing both
# iOS and OSX. This patch does not change behavior for 10.4 or 10.5.
# Also include fix to use the correct SDK.
patchfiles-append patch-src_plugins_bearer_corewlan_corewlan.pro.diff
-# (17) fix the corewlan source to work under 10.7
+# (16) fix the corewlan source to work under 10.7
patchfiles-append patch-src_plugins_bearer_corewlan_qcorewlanengine.mm.diff
-# (18) Use the "target.path" for libdir for core libraries instead of
+# (17) Use the "target.path" for libdir for core libraries instead of
# the standard QT_INSTALL_LIBS; allows us to set for library or
# framework elsewhere and have the install still work here.
patchfiles-append patch-src_qbase.pri.diff
-# (19) (a) Disable explicit disabling of framework or static install;
+# (18) (a) Disable explicit disabling of framework or static install;
# i.e., install as a framework if that mode is selected, and as
# library otherwise. (b) If installing as framework, use the new
# QT_INSTALL_FRAMEWORKS directory; otherwise, use the old
@@ -184,12 +179,12 @@
patch-tools_designer_src_uitools_uitools.pro.diff \
patch-mkspecs_features_uitools.prf.diff
-# (20) fix 'macdeployqt' to look for the correct plugins location by
+# (19) fix 'macdeployqt' to look for the correct plugins location by
# default. This is paired with a "reinplace" in post-patch
patchfiles-append patch-tools_macdeployqt_macdeployqt_main.cpp.diff
-# (21) Under 10.4 only: patch QMake build files using just "-lQtHelp"
+# (20) Under 10.4 only: patch QMake build files using just "-lQtHelp"
# to do "-lQtHelp -lQtCLucene -lQtNetwork -lQtWebKit" instead. For
# some reason 10.5+ "knows" that how to do this correctly.
Modified: branches/mld-qt-481/dports/aqua/qt4-mac/files/patch-configure.diff
===================================================================
--- branches/mld-qt-481/dports/aqua/qt4-mac/files/patch-configure.diff 2012-05-28 14:29:37 UTC (rev 93698)
+++ branches/mld-qt-481/dports/aqua/qt4-mac/files/patch-configure.diff 2012-05-28 15:25:24 UTC (rev 93699)
@@ -1,6 +1,6 @@
---- configure.orig 2012-04-23 14:49:04.000000000 -0400
-+++ configure 2012-04-20 23:36:12.000000000 -0400
-@@ -841,6 +841,7 @@
+--- configure.orig 2012-05-28 09:16:17.000000000 -0400
++++ configure 2012-05-28 09:16:26.000000000 -0400
+@@ -901,6 +901,7 @@
QT_INSTALL_DOCS=
QT_INSTALL_HEADERS=
QT_INSTALL_LIBS=
@@ -8,7 +8,7 @@
QT_INSTALL_BINS=
QT_INSTALL_PLUGINS=
QT_INSTALL_IMPORTS=
-@@ -1298,6 +1299,9 @@
+@@ -1358,6 +1359,9 @@
libdir)
QT_INSTALL_LIBS="$VAL"
;;
@@ -18,16 +18,7 @@
qtnamespace)
QT_NAMESPACE="$VAL"
;;
-@@ -3322,7 +3326,7 @@
- CFG_FRAMEWORK=no
- fi
-
--QMAKE_CONF_COMPILER=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_CXX[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1," | tail -1`
-+QMAKE_CONF_COMPILER=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_CXX[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1," | grep -v "\\\\$" | tail -1`
- TEST_COMPILER="$CXX"
-
- [ -z "$TEST_COMPILER" ] && TEST_COMPILER=$QMAKE_CONF_COMPILER
-@@ -3589,6 +3593,19 @@
+@@ -3649,6 +3653,19 @@
fi
QT_INSTALL_LIBS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_LIBS"`
@@ -47,7 +38,7 @@
#bins
if [ -z "$QT_INSTALL_BINS" ]; then #default
if [ "$CFG_PREFIX_INSTALL" = "no" ]; then
-@@ -4640,6 +4657,7 @@
+@@ -4700,6 +4717,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"`
@@ -55,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"`
-@@ -4665,6 +4683,7 @@
+@@ -4725,6 +4743,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"`
@@ -63,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"`
-@@ -4682,6 +4701,7 @@
+@@ -4742,6 +4761,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";
@@ -71,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";
-@@ -4700,6 +4720,7 @@
+@@ -4760,6 +4780,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";
@@ -79,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";
-@@ -4725,6 +4746,7 @@
+@@ -4785,6 +4806,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;
@@ -87,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;
-@@ -4917,20 +4939,11 @@
+@@ -4944,20 +4966,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\""
@@ -113,7 +104,7 @@
if [ '!' -z "$CFG_SDK" ]; then
echo "SDK_LFLAGS =-Wl,-syslibroot,$CFG_SDK" >>"$mkfile"
echo "SDK_CFLAGS =-isysroot $CFG_SDK" >>"$mkfile"
-@@ -7015,16 +7028,8 @@
+@@ -7042,16 +7055,8 @@
# set the global Mac deployment target. This is overridden on an arch-by-arch basis
# in some cases, see code further down
@@ -132,7 +123,7 @@
# disable Qt 3 support on VxWorks, Symbian and INTEGRITY
case "$XPLATFORM" in
-@@ -7755,28 +7760,28 @@
+@@ -7782,28 +7787,28 @@
# env. variable.
if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" != "no" ] ; then
if echo "$CFG_MAC_ARCHS" | grep '\<x86\>' > /dev/null 2>&1; then
@@ -177,7 +168,7 @@
fi
fi
-@@ -8523,6 +8528,7 @@
+@@ -8550,6 +8555,7 @@
QMAKE_RCC = \$\$QT_BUILD_TREE/bin/rcc
QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
QMAKE_INCDIR_QT = \$\$QT_BUILD_TREE/include
Deleted: branches/mld-qt-481/dports/aqua/qt4-mac/files/patch-src_3rdparty_webkit_Source_WebKit_qt_qt_webkit_version.pri.diff
===================================================================
--- branches/mld-qt-481/dports/aqua/qt4-mac/files/patch-src_3rdparty_webkit_Source_WebKit_qt_qt_webkit_version.pri.diff 2012-05-28 14:29:37 UTC (rev 93698)
+++ branches/mld-qt-481/dports/aqua/qt4-mac/files/patch-src_3rdparty_webkit_Source_WebKit_qt_qt_webkit_version.pri.diff 2012-05-28 15:25:24 UTC (rev 93699)
@@ -1,14 +0,0 @@
---- src/3rdparty/webkit/Source/WebKit/qt/qt_webkit_version.pri.orig 2012-05-02 14:15:12.000000000 -0400
-+++ src/3rdparty/webkit/Source/WebKit/qt/qt_webkit_version.pri 2012-05-02 14:17:45.000000000 -0400
-@@ -1,7 +1,7 @@
--QT_WEBKIT_VERSION = 4.9.0
--QT_WEBKIT_MAJOR_VERSION = 4
--QT_WEBKIT_MINOR_VERSION = 9
--QT_WEBKIT_PATCH_VERSION = 0
-+QT_WEBKIT_VERSION = $$QT_VERSION
-+QT_WEBKIT_MAJOR_VERSION = $$QT_MAJOR_VERSION
-+QT_WEBKIT_MINOR_VERSION = $$QT_MINOR_VERSION
-+QT_WEBKIT_PATCH_VERSION = $$QT_PATCH_VERSION
-
- QT.webkit.name = QtWebKit
- QT.webkit.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtWebKit
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120528/c94d8cac/attachment.html>
More information about the macports-changes
mailing list