Changeset 96486


Ignore:
Timestamp:
Aug 11, 2012, 9:54:27 PM (7 years ago)
Author:
michaelld@…
Message:

qt4-mac :
+ Corrects detection of corewlan +universal builds.
+ Removes warnings when building on 10.8.
+ also addresses tickets:

  • #35523 : correctly select the "pg_config" for psql variant selected (if any), to allow building as universal;
  • #34934 : correctly use mach timer info to compute time;
  • #34902 : patch Qt QMake build system to allow full compilation on 32-bit systems;
  • #34864 : correct +framework header links; and
  • #34856 : disable ccache for now; try to fix later; it's involved.
Location:
trunk/dports/aqua/qt4-mac
Files:
2 added
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/aqua/qt4-mac/Portfile

    r96204 r96486  
    1313conflicts           qt3 qt3-mac qt4-mac-devel
    1414version             4.8.2
     15revision            1
    1516categories          aqua
    1617platforms           macosx
     
    140141    patch-src_3rdparty_webkit_Source_WebCore_plugins_mac_PluginViewMac.mm.diff
    141142
    142 # (14) fix MKSPECS install location for WebKit
     143# (14) fix MKSPECS install location for WebKit; fix WebCore to handle
     144# 32-bit compiling correctly on x86 and ppc
    143145
    144146patchfiles-append   \
     
    183185# default.  This is paired with a "reinplace" in post-patch
    184186
    185 patchfiles-append patch-tools_macdeployqt_macdeployqt_main.cpp.diff
     187patchfiles-append   \
     188    patch-tools_macdeployqt_macdeployqt_main.cpp.diff
    186189
    187190# (20) Under 10.4 only: patch QMake build files using just "-lQtHelp"
     
    192195    patchfiles-append patch-QtHelp_10.4_only.diff
    193196}
     197
     198# (21) fix the Mac timer's use of "mach_timebase_info"
     199
     200patchfiles-append   \
     201    patch-src_corelib_tools_qelapsedtimer-mac.cpp.diff
     202
     203# (22) fix WebCore to handle 32-bit compiling correctly on x86 and ppc
     204
     205patchfiles-append   \
     206    patch-src_3rdparty_webkit_Source_WebCore_WebCore.pro.diff
    194207
    195208# Temporary patch to get ML working; some of this is already upstream
     
    201214
    202215###############################################
     216
     217# disable CCACHE for now (ticket #34856)
     218
     219configure.ccache no
     220
     221# create the global for the psql version, if selected
     222
     223global psql_version
     224set psql_version ""
    203225
    204226# find a way to specify the OS MINOR version.
     
    281303    reinplace "s,@QT_PLUGINS_DIR@,${qt_plugins_dir},g" \
    282304        ${worksrcpath}/tools/macdeployqt/macdeployqt/main.cpp
     305
     306    # fix path to "pg_config", if the variant was selected
     307
     308    if {${psql_version} != ""} {
     309        reinplace "s,@PATH_TO_PG_CONFIG@,${prefix}/lib/postgresql${psql_version}/bin/,g" ${worksrcpath}/configure
     310    }
    283311
    284312    # if no debug, then do not even build debug code
     
    589617
    590618        foreach fixfile [exec find ${destroot}${qt_frameworks_dir} \
    591                              -name "*.framework"] {
     619                             -name "*.framework" | \
     620                             sed -e "s@${destroot}@@g"] {
    592621            set tf_full [strsed ${fixfile} {s@\\.framework@@}]
    593622            set tf [strsed ${tf_full} {g@.*\/@@}]
     
    660689description {Enable Postgre SQL Driver version 9.1} {}
    661690
    662 set psql_version ""
    663691if {[variant_isset psql83]} {
    664692    set psql_version "83"
  • trunk/dports/aqua/qt4-mac/files/patch-EXPERIMENTAL-ML-fixes.diff

    r96204 r96486  
    2222 win32:DEFINES-=QT_NO_CAST_TO_ASCII
    2323 
     24--- src/corelib/global/qglobal.h.orig   2012-08-07 16:13:40.000000000 -0400
     25+++ src/corelib/global/qglobal.h        2012-08-07 16:14:01.000000000 -0400
     26@@ -324,7 +324,10 @@
     27 #  if !defined(MAC_OS_X_VERSION_10_7)
     28 #       define MAC_OS_X_VERSION_10_7 MAC_OS_X_VERSION_10_6 + 1
     29 #  endif
     30-#  if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_7)
     31+#  if !defined(MAC_OS_X_VERSION_10_8)
     32+#       define MAC_OS_X_VERSION_10_8 MAC_OS_X_VERSION_10_7 + 1
     33+#  endif
     34+#  if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_8)
     35 #    warning "This version of Mac OS X is unsupported"
     36 #  endif
     37 #endif
  • trunk/dports/aqua/qt4-mac/files/patch-config.tests_unix_compile.test.diff

    r94241 r96486  
    66 
    77-"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG-=debug_and_release" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
    8 +"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG-=debug_and_release app_bundle" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CFLAGS*=$CXXFLAGS" "QMAKE_CFLAGS+=$MAC_ARCH_CXXFLAGS" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
     8+"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG-=debug_and_release app_bundle" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CFLAGS*=$CXXFLAGS" "QMAKE_CFLAGS+=$MAC_ARCH_CXXFLAGS" "QMAKE_OBJECTIVE_CFLAGS*=$CXXFLAGS" "QMAKE_OBJECTIVE_CFLAGS+=$MAC_ARCH_CXXFLAGS" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
    99 
    1010 if [ "$VERBOSE" = "yes" ]; then
  • trunk/dports/aqua/qt4-mac/files/patch-configure.diff

    r94298 r96486  
    1 --- configure.orig      2012-05-28 09:16:17.000000000 -0400
    2 +++ configure   2012-05-28 09:16:26.000000000 -0400
     1--- configure.orig      2012-08-08 16:12:36.000000000 -0400
     2+++ configure   2012-08-08 16:39:19.000000000 -0400
    33@@ -901,6 +901,7 @@
    44 QT_INSTALL_DOCS=
     
    105105                echo "SDK_LFLAGS =-Wl,-syslibroot,$CFG_SDK" >>"$mkfile"
    106106                echo "SDK_CFLAGS =-isysroot $CFG_SDK" >>"$mkfile"
     107@@ -5389,9 +5402,9 @@
     108         psql)
     109             if [ "$CFG_SQL_psql" != "no" ]; then
     110                 # Be careful not to use native pg_config when cross building.
     111-                if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then
     112-                    QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
     113-                    QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
     114+                if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" @PATH_TO_PG_CONFIG@pg_config >/dev/null 2>&1; then
     115+                    QT_CFLAGS_PSQL=`@PATH_TO_PG_CONFIG@pg_config --includedir 2>/dev/null`
     116+                    QT_LFLAGS_PSQL=`@PATH_TO_PG_CONFIG@pg_config --libdir 2>/dev/null`
     117                 fi
     118                 [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
     119                 [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"
    107120@@ -7042,16 +7055,8 @@
    108121 
  • trunk/dports/aqua/qt4-mac/files/patch-src_3rdparty_webkit_Source_WebKit_qt_QtWebKit.pro.diff

    r94241 r96486  
    1 --- src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro.orig      2012-04-23 14:49:04.000000000 -0400
    2 +++ src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro   2012-04-17 14:38:16.000000000 -0400
     1--- src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro.orig      2012-08-08 16:27:13.000000000 -0400
     2+++ src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro   2012-08-08 16:33:29.000000000 -0400
     3@@ -233,7 +233,7 @@
     4                        $$SOURCE_DIR/../WebKitLibraries/
     5 
     6         DEFINES+=NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
     7-        contains(CONFIG, "x86") {
     8+        contains(CONFIG, "x86")|contains(CONFIG, "ppc") {
     9             DEFINES+=NS_BUILD_32_LIKE_64
     10         }
     11 
    312@@ -295,7 +295,7 @@
    413 
Note: See TracChangeset for help on using the changeset viewer.