Changeset 119772 for trunk/dports/aqua


Ignore:
Timestamp:
May 6, 2014, 12:13:33 PM (5 years ago)
Author:
michaelld@…
Message:

qt4-mac:
+ update to 4.8.6;
+ remove libWebKitSystemInterfaceMavericks.a since it is no longer needed;
+ remove unused patches and fix those remaining;
+ whitepsace here and there;
+ remove unused variants and related code;
+ +cxx11 variant to not work with Clang/libc++; this has been fixed in the Qt5 series, but is not simple to back-port.

Location:
trunk/dports/aqua/qt4-mac
Files:
11 deleted
7 edited

Legend:

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

    r118978 r119772  
    1616#conflicts           qt3 qt3-mac qt4-mac-devel
    1717conflicts           qt3 qt3-mac
    18 version             4.8.5
    19 revision            1
     18version             4.8.6
    2019set branch          [join [lrange [split ${version} .] 0 1] .]
    2120
     
    3231
    3332distname            qt-everywhere-opensource-src-${version}
    34 extract.only        ${distname}${extract.suffix}
    35 
    36 master_sites        http://download.qt-project.org/official_releases/qt/${branch}/${version}/  \
    37     http://trac.webkit.org/export/158483/trunk/WebKitLibraries/ \
    38     https://trac.macports.org/export/112811/trunk/dports/aqua/qt4-mac/files/
    39 
    40 checksums           ${distname}${extract.suffix} \
    41                     rmd160  1e7bb099d5d1cda0b663cebe207c846c8d04750d \
    42                     sha256  eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 \
    43                     libWebKitSystemInterfaceMavericks.a \
    44                     rmd160  b99bb61b3c433811ffa0ce68cf92ce4d51eef433 \
    45                     sha256  d5026704ae94ba6b2d6574aa35e61c83de8e2c256df1b95e4abb3495dca8f5f7
     33
     34master_sites        http://download.qt-project.org/official_releases/qt/${branch}/${version}/
     35
     36checksums           rmd160  0220d4e76ac761c9ecfb8ddab6f2c1dc6ad70c33 \
     37                    sha256  8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c
    4638
    4739minimum_xcodeversions   {8 2.5}
     
    131123patchfiles-append   patch-mkspecs_features_qt_functions.prf.diff
    132124
    133 # (7.1) (a) Change "gcc" and "g++" to @'s for replacement in
     125# (8) (a) Change "gcc" and "g++" to @'s for replacement in
    134126# post-patch; (b) add hooks for C++11.
    135127
    136128patchfiles-append   patch-mkspecs_common_g++-base.conf.diff
    137129
    138 # (7.2) Add default QMake variables for Objective C++.
     130# (9) Add default QMake variables for Objective C++.
    139131
    140132patchfiles-append   patch-mkspecs_objective_cxx.diff
    141133
    142 # (8) Add "absolute_library_soname" to the default CONFIG variables,
     134# (10) Add "absolute_library_soname" to the default CONFIG variables,
    143135# so that when a DYLIB is created, if "target.path" is set for it then
    144136# that path is prepended to its "install_name".
     
    146138patchfiles-append   patch-mkspecs_macx-g++_qmake.conf.diff
    147139
    148 # (9) Add QT_INSTALL_FRAMEWORKS and related variables to QMake, to
     140# (11) Add QT_INSTALL_FRAMEWORKS and related variables to QMake, to
    149141# provide a default variable for the location of QMake installed
    150142# frameworks.
     
    156148    patch-src_corelib_global_qlibraryinfo.h.diff
    157149
    158 # (10) In QMake, disable default MKSPECS and FEATURES path
     150# (12) In QMake, disable default MKSPECS and FEATURES path
    159151# concatinations if the shell environment variable QMAKE_NO_DEFAULTS
    160152# is set (to anything); we use this variable in this portfile to make
     
    163155patchfiles-append   patch-qmake_project.cpp.diff
    164156
    165 # (10.1) In QMake: (a) enable correct "-framework foo,bar" parsing as
     157# (13) In QMake: (a) enable correct "-framework foo,bar" parsing as
    166158# specified by Apple's LD; (b) disable "/Library/Frameworks" as a
    167159# default search path; use "PREFIX/Library/Frameworks" and replace
     
    171163patchfiles-append   patch-qmake_generators_unix_unixmakke.cpp.diff
    172164
    173 # (11) Allow easy replacement of MACOSX_DEPLOYMENT_TARGET: build for
     165# (14) Allow easy replacement of MACOSX_DEPLOYMENT_TARGET: build for
    174166# just the user's current OS.
    175167
     
    178170    patch-src_tools_bootstrap_bootstrap.pro.diff
    179171
    180 # (12) fix use of CARBON, found on PPC64; does not hurt others
     172# (15) fix use of CARBON, found on PPC64; does not hurt others
    181173
    182174patchfiles-append   \
     
    184176    patch-src_3rdparty_webkit_Source_WebCore_plugins_mac_PluginViewMac.mm.diff
    185177
    186 # (13) fix MKSPECS install location for WebKit; fix WebCore to handle
    187 # 32-bit compiling correctly on x86 and ppc
    188 
    189 patchfiles-append   \
    190     patch-src_3rdparty_webkit_Source_WebKit_qt_QtWebKit.pro.diff
    191 
    192 # (14) fix the corewlan qmake file to use non-standard Developer SDK
     178# (16) fix the corewlan qmake file to use non-standard Developer SDK
    193179# location under 10.6 and newer, e.g., for some developers doing both
    194180# iOS and OSX.  This patch does not change behavior for 10.4 or 10.5.
     
    197183patchfiles-append   patch-src_plugins_bearer_corewlan_corewlan.pro.diff
    198184
    199 # (15) fix the corewlan source to work: this patch create a new
    200 # (primary) file qcorewlanengine.mm for 10.7 and newer APIs and a
    201 # secondary one qcorewlanengine_10_6.mm for 10.6 and older APIs.  The
    202 # primary file internally selects which one to use.
    203 
    204 patchfiles-append   patch-src_plugins_bearer_corewlan_qcorewlanengine.mm.diff
    205 
    206 # (16) Use the "target.path" for libdir for core libraries instead of
     185# (17) Use the "target.path" for libdir for core libraries instead of
    207186# the standard QT_INSTALL_LIBS; allows us to set for library or
    208187# framework elsewhere and have the install still work here.
     
    210189patchfiles-append   patch-src_qbase.pri.diff
    211190
    212 # (17) (a) Disable explicit disabling of framework or static install;
     191# (18) (a) Disable explicit disabling of framework or static install;
    213192# i.e., install as a framework if that mode is selected, and as
    214193# library otherwise. (b) If installing as framework, use the new
     
    228207    patch-mkspecs_features_uitools.prf.diff
    229208
    230 # (18) fix 'macdeployqt' to look for the correct plugins location by
     209# (19) fix 'macdeployqt' to look for the correct plugins location by
    231210# default.  This is paired with a "reinplace" in post-patch
    232211
     
    234213    patch-tools_macdeployqt_macdeployqt_main.cpp.diff
    235214
    236 # (19) Under 10.4 only: patch QMake build files using just "-lQtHelp"
     215# (20) Under 10.4 only: patch QMake build files using just "-lQtHelp"
    237216# to do "-lQtHelp -lQtCLucene -lQtNetwork -lQtWebKit" instead.  For
    238217# some reason 10.5+ "knows" that how to do this correctly.
     
    244223}
    245224
    246 # (20) fix the Mac timer's use of "mach_timebase_info"
     225# (21) fix the Mac timer's use of "mach_timebase_info"
    247226
    248227patchfiles-append   \
    249228    patch-src_corelib_tools_qelapsedtimer-mac.cpp.diff
    250 
    251 # (21) fix WebCore to handle 32-bit compiling correctly on x86 and ppc
    252 
    253 patchfiles-append   \
    254     patch-src_3rdparty_webkit_Source_WebCore_WebCore.pro.diff
    255229
    256230# (22) Under 10.8 and 10.9: Patch to fix corelib linking
     
    266240patchfiles-append   \
    267241    patch-tools_macdeployqt_shared_shared.cpp.diff
    268 
    269 # (24) Fix build against libc++
    270 
    271 patchfiles-append   \
    272     patch-libc++.diff
    273 
    274 # (25) Fix CLuscene to build under 10.9 CLang
    275 # (26) Fix qglobals.h to build under 10.9 CLang
    276 # (27 a-e) Fix WebKit to build under 10.9 CLang
    277 
    278 platform darwin {
    279     if {${MINOR} == 9} {
    280         patchfiles-append \
    281             patch-src_3rdparty_clucene_src_CLucene_search_FieldCacheImpl.cpp.diff \
    282             patch-src_corelib_global_qglobal.h.diff \
    283             patch-src_3rdparty_webkit_Source_WebCore_platform_Timer.h.diff \
    284             patch-src_3rdparty_webkit_Source_WebCore_platform_Timer.cpp.diff \
    285             patch-src_3rdparty_webkit_Source_WebKit_qt_WebCoreSupport_NotificationPresenterClientQt.cpp.diff \
    286             patch-src_3rdparty_webkit_Source_WebKit_qt_Api_qgraphicswebview.cpp.diff \
    287             patch-src_3rdparty_webkit_Source_WebCore_platform_network_qt_QNetworkReplyHandler.cpp.diff
    288 
    289         # Copy new version of webkit's lib for OS X 10.9 only.
    290         # Attached by reference:
    291         # https://codereview.qt-project.org/#change,69328
    292         # http://trac.webkit.org/browser/trunk/WebKitLibraries/ChangeLog?rev=157771
    293 
    294         distfiles-append libWebKitSystemInterfaceMavericks.a
    295         post-patch {
    296             copy ${distpath}/libWebKitSystemInterfaceMavericks.a \
    297                 ${worksrcpath}/src/3rdparty/webkit/WebKitLibraries
    298         }
    299     }
    300 }
    301242
    302243# error out if trying to build on a new OSX version (> 10.9).
     
    348289    # is already in place in the 'configure' script (since there has
    349290    # to be at least 1 arch).
     291
    350292    set ARCHES ""
    351293    if {[variant_exists universal] && [variant_isset universal]} {
     
    359301    # were all patched in (2) above, and can be easily changed or
    360302    # overridden by the user in a project-local qmake .pro script.
     303
    361304    set TARGET "10.${MINOR}"
    362305    foreach fixfile {configure mkspecs/common/g++-macx.conf \
     
    368311
    369312    # Fix OS version on Bearer CoreWLAN QMake file
     313
    370314    reinplace "s|@MACOSX_VERSION_MINOR@|${MINOR}|g" \
    371315        ${worksrcpath}/src/plugins/bearer/corewlan/corewlan.pro
     
    383327        ${worksrcpath}/src/plugins/bearer/corewlan/corewlan.pro
    384328
    385     # fix 'macdeployqt' to look for the correct plugins location by default.
     329    # fix 'macdeployqt' to look for the correct
     330    # plugins location by default.
    386331
    387332    reinplace "s,@QT_PLUGINS_DIR@,${qt_plugins_dir},g" \
     
    559504# Stop configure script from searching for SQL Drivers
    560505#    not available from MacPorts.
     506
    561507foreach driver {db2 ibase oci tds} {
    562508    configure.args-append -no-sql-${driver}
     
    571517
    572518pre-configure {
     519
    573520    # use the corrected CPATH and LIBRARY_PATH for build
     521
    574522    compiler.cpath [join ${header_path} :]
    575523    compiler.library_path [join ${library_path} :]
     
    1031979}
    1032980
    1033 pre-activate {
    1034     # make sure 'none' is selected by qt4_select, so that there is no
    1035     # conflict between it and this port.
    1036     if {[file exists ${prefix}/bin/qt4_select]} {
    1037         if {[exec ${prefix}/bin/qt4_select -s] ne "none"} {
    1038             ui_msg "Disabling 'qt4_select' selection."
    1039             system "exec ${prefix}/bin/qt4_select none"
    1040         }
    1041     }
    1042 }
    1043 
    1044 variant framework description {Framework Legacy Compatibility Variant} {
    1045     ui_error "${name} variant +framework has been disabled because ${name} now installs as both libraries and frameworks.  Please install ${name} without +framework."
    1046     error "Variant disabled"
    1047 }
    1048 
    1049 variant mysql description {MySQL Qt4 Plugin Legacy Compatibility Variant} {
    1050     ui_error "${name} variant +mysql has been replaced by the port 'qt4-mac-mysql55-plugin' and its subports.  Please install ${name} without +mysql, then install your desired MySQL Qt plugin."
    1051     error "Variant disabled"
    1052 }
    1053 
    1054981variant odbc description {Enable iODBC SQL Driver} {
    1055982    depends_lib-append port:libiodbc
     
    1058985}
    1059986
    1060 variant psql83 conflicts psql84 psql90 psql91 \
    1061 description {PostgreSQL 8.3 Qt4 Plugin Legacy Compatibility Variant} {}
    1062 
    1063 variant psql84 conflicts psql83 psql90 psql91 \
    1064 description {PostgreSQL 8.4 Qt4 Plugin Legacy Compatibility Variant} {}
    1065 
    1066 variant psql90 conflicts psql83 psql84 psql91 \
    1067 description {PostgreSQL 9.0 Qt4 Plugin Legacy Compatibility Variant} {}
    1068 
    1069 variant psql91 conflicts psql83 psql84 psql90 \
    1070 description {PostgreSQL 9.1 Qt4 Plugin Legacy Compatibility Variant} {}
    1071 
    1072 global psql_version
    1073 set psql_version ""
    1074 
    1075 if {[variant_isset psql83]} {
    1076     set psql_version "83"
    1077 } elseif {[variant_isset psql84]} {
    1078     set psql_version "84"
    1079 } elseif {[variant_isset psql90]} {
    1080     set psql_version "90"
    1081 } elseif {[variant_isset psql91]} {
    1082     set psql_version "91"
    1083 }
    1084 
    1085 if {${psql_version} ne ""} {
    1086     ui_error "${name} variant +psql${psql_version} has been replaced by the port 'qt4-mac-postgresql91-plugin' and its subports.  Please install ${name} without +psql${psql_version}, then install your desired PostgreSQL Qt plugin."
    1087     error "Variant disabled"
    1088 }
    1089 
    1090987variant raster description {Use raster graphics system by default} {
    1091988    configure.args-append -graphicssystem raster
     
    11251022}
    11261023
    1127 variant cxx11 description {Add library support for C++11 (EXPERIMENTAL)} {
     1024variant cxx11 description {Add library support for C++11 (EXPERIMENTAL; does not work with libc++)} {
    11281025
    11291026    # Block compilers that do not support C++11. This variant seems to
     
    11341031        apple-gcc-4.2 gcc-4.2 llvm-gcc-4.2
    11351032
     1033    pre-fetch {
     1034
     1035        # This variant does not work with Clang libc++
     1036
     1037        if {[info exists configure.cxx_stdlib] &&
     1038            ${configure.cxx_stdlib} eq "libc++" &&
     1039            [string match *clang* ${configure.cxx}]} {
     1040
     1041            ui_msg "\nERROR: C++11 support for Qt4 is not available when using Clang and libc++.\n"
     1042            error "unsupported platform for C++11 support"
     1043
     1044        }
     1045    }
     1046
    11361047    pre-extract {
    11371048
    1138         ui_msg "WARNING: You have enabled C++11 support for Qt4, which is EXPERIMENTAL.  Qt's libraries and applications (not including QMake) will be compiled using C++11.  That said, C++11 will NOT be enabled by default when using QMake.  You can enable C++11 by specifying, e.g. \'CONFIG += c++11\', in any QMake build file."
     1049        ui_msg "\nWARNING: You have enabled C++11 support for Qt4, which is EXPERIMENTAL.  Qt's libraries and applications (not including QMake) will be compiled using C++11.  That said, C++11 will NOT be enabled by default when using QMake.  You can enable C++11 by specifying, e.g. \'CONFIG += c++11\', in any QMake build file.\n"
    11391050
    11401051    }
     
    11541065    ui_msg "NOTE: Qt database plugins for mysql55, postgresql91, and sqlite2 are NOT installed by this port\; they are installed by qt4-mac-*-plugin instead."
    11551066}
    1156 
    1157 #variant quartz conflicts x11
    1158 #variant quartz \
    1159 #description {Build for Native OSX Quartz GUI, not X11 (default)} {}
    1160 
    1161 #variant x11 conflicts quartz \
    1162 #description {Build for X11 GUI, not Native OSX Quartz} {}
    1163 
    1164 # if neither +x11 or +quartz were specified, default to the latter
    1165 #if {![variant_isset quartz] && ![variant_isset x11]} {
    1166 #    default_variants +quartz
    1167 #}
    1168 
    1169 # check to see if user specified just "-quartz", which can't work.
    1170 #if {![variant_isset quartz] && ![variant_isset x11]} {
    1171 #    return -code error \
    1172 #"\n\nThe variant -quartz will not work alone.
    1173 #Please select one of +quartz or +x11 as a variant.\n"
    1174 #}
    1175 
    1176 #if {[variant_isset x11]} {
    1177 #    return -code error "\n\nVariant +x11 is not yet functional; \
    1178 #please use +quartz for now.\n"
    1179 #}
    11801067
    11811068livecheck.type      regex
  • trunk/dports/aqua/qt4-mac/files/patch-QtHelp_10.4_only.diff

    r74979 r119772  
    11--- tools/assistant/tools/assistant/assistant.pro.orig  2011-01-10 09:05:05.000000000 -0500
    22+++ tools/assistant/tools/assistant/assistant.pro       2011-01-10 09:05:55.000000000 -0500
    3 @@ -108,3 +108,30 @@
     3@@ -120,3 +120,30 @@
    44         DEFINES += USE_STATIC_SQLITE_PLUGIN
    55     }
     
    3434--- tools/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro.orig    2011-01-10 09:05:05.000000000 -0500
    3535+++ tools/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro 2011-01-10 09:05:55.000000000 -0500
    36 @@ -15,3 +15,27 @@
     36@@ -19,3 +19,27 @@
    3737     ../shared/collectionconfiguration.cpp
    3838 HEADERS += ../shared/helpgenerator.h \
     
    6464--- tools/assistant/tools/qhelpconverter/qhelpconverter.pro.orig        2011-01-10 09:05:05.000000000 -0500
    6565+++ tools/assistant/tools/qhelpconverter/qhelpconverter.pro     2011-01-10 09:05:55.000000000 -0500
    66 @@ -45,3 +45,27 @@
     66@@ -49,3 +49,27 @@
    6767            outputpage.ui
    6868 
     
    9494--- tools/assistant/tools/qhelpgenerator/qhelpgenerator.pro.orig        2011-01-10 09:05:05.000000000 -0500
    9595+++ tools/assistant/tools/qhelpgenerator/qhelpgenerator.pro     2011-01-10 09:05:55.000000000 -0500
    96 @@ -12,3 +12,27 @@
     96@@ -17,3 +17,27 @@
    9797            main.cpp
    9898 
  • trunk/dports/aqua/qt4-mac/files/patch-configure.diff

    r113176 r119772  
    1 --- configure.orig      2013-11-11 12:18:47.000000000 -0500
    2 +++ configure   2013-11-11 12:21:48.000000000 -0500
     1--- configure.orig      2014-04-25 09:50:32.000000000 -0400
     2+++ configure   2014-04-25 10:04:24.000000000 -0400
    33@@ -924,12 +924,14 @@
    44 CFG_ICU=auto
     
    4949         if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
    5050             CFG_SYSTEM_PROXIES="$VAL"
    51 @@ -3450,6 +3462,53 @@
     51@@ -3456,6 +3468,53 @@
    5252     CFG_MAC_XARCH=no
    5353 fi
     
    103103 if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" = "auto" ]; then
    104104     if "$mactests/dwarf2.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" $MAC_CONFIG_TEST_COMMANDLINE; then
    105 @@ -3459,15 +3518,6 @@
     105@@ -3465,15 +3524,6 @@
    106106     fi
    107107 fi
     
    119119 # cross-compiling as lots of toolchains seems to have problems with this
    120120 if [ "$QT_CROSS_COMPILE" = "yes" ] && [ "$CFG_SEPARATE_DEBUG_INFO" = "auto" ]; then
    121 @@ -3694,6 +3744,19 @@
     121@@ -3700,6 +3750,19 @@
    122122     fi
    123123     QT_INSTALL_LIBS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_LIBS"`
     
    139139     if [ -z "$QT_INSTALL_BINS" ]; then #default
    140140         if [ "$CFG_PREFIX_INSTALL" = "no" ]; then
    141 @@ -4761,6 +4824,7 @@
     141@@ -4768,6 +4831,7 @@
    142142 DOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_INSTALL_DOCS"`
    143143 HEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_INSTALL_HEADERS"`
     
    147147 PLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_INSTALL_PLUGINS"`
    148148 IMPORTS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_impspath=$QT_INSTALL_IMPORTS"`
    149 @@ -4786,6 +4850,7 @@
     149@@ -4793,6 +4857,7 @@
    150150     HOSTDOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_HOST_PREFIX/doc"`
    151151     HOSTHEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_HOST_PREFIX/include"`
     
    155155     HOSTPLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_HOST_PREFIX/plugins"`
    156156     HOSTIMPORTS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_impspath=$QT_HOST_PREFIX/IMPORTS"`
    157 @@ -4803,6 +4868,7 @@
     157@@ -4810,6 +4875,7 @@
    158158 static const char qt_configure_documentation_path_str[256 + 12] = "$HOSTDOCUMENTATION_PATH_STR";
    159159 static const char qt_configure_headers_path_str      [256 + 12] = "$HOSTHEADERS_PATH_STR";
     
    163163 static const char qt_configure_plugins_path_str      [256 + 12] = "$HOSTPLUGINS_PATH_STR";
    164164 static const char qt_configure_imports_path_str      [256 + 12] = "$HOSTIMPORTS_PATH_STR";
    165 @@ -4821,6 +4887,7 @@
     165@@ -4828,6 +4894,7 @@
    166166 static const char qt_configure_documentation_path_str[256 + 12] = "$DOCUMENTATION_PATH_STR";
    167167 static const char qt_configure_headers_path_str      [256 + 12] = "$HEADERS_PATH_STR";
     
    171171 static const char qt_configure_plugins_path_str      [256 + 12] = "$PLUGINS_PATH_STR";
    172172 static const char qt_configure_imports_path_str      [256 + 12] = "$IMPORTS_PATH_STR";
    173 @@ -4846,6 +4913,7 @@
     173@@ -4853,6 +4920,7 @@
    174174 #define QT_CONFIGURE_DOCUMENTATION_PATH qt_configure_documentation_path_str + 12;
    175175 #define QT_CONFIGURE_HEADERS_PATH qt_configure_headers_path_str + 12;
     
    179179 #define QT_CONFIGURE_PLUGINS_PATH qt_configure_plugins_path_str + 12;
    180180 #define QT_CONFIGURE_IMPORTS_PATH qt_configure_imports_path_str + 12;
    181 @@ -4958,7 +5026,7 @@
     181@@ -4965,7 +5033,7 @@
    182182         EXTRA_OBJS=
    183183         EXTRA_SRCS=
     
    188188 
    189189         if [ "$PLATFORM" = "irix-cc" ] || [ "$PLATFORM" = "irix-cc-64" ]; then
    190 @@ -4997,7 +5065,7 @@
    191              done
    192          fi
    193          if [ "$BUILD_ON_MAC" = "yes" ]; then
    194 -            echo "export MACOSX_DEPLOYMENT_TARGET = 10.5" >> "$mkfile"
    195 +            echo "export MACOSX_DEPLOYMENT_TARGET = @MACOSX_DEPLOYMENT_TARGET@" >> "$mkfile"
    196              echo "CARBON_LFLAGS =-framework ApplicationServices" >>"$mkfile"
    197              echo "CARBON_CFLAGS =-fconstant-cfstrings" >>"$mkfile"
    198              EXTRA_LFLAGS="$EXTRA_LFLAGS \$(CARBON_LFLAGS)"
    199 @@ -5005,20 +5073,11 @@
     190@@ -5009,8 +5077,8 @@
     191                 # Avoid overriding the default configuration settings when building with clang/libc++
     192                 ;;
     193             *)
     194-                # For all other configurations require a minimum of 10.5
     195-                echo "export MACOSX_DEPLOYMENT_TARGET = 10.5" >> "$mkfile"
     196+                # For all other configurations require a minimum of @MACOSX_DEPLOYMENT_TARGET@
     197+                echo "export MACOSX_DEPLOYMENT_TARGET = @MACOSX_DEPLOYMENT_TARGET@" >> "$mkfile"
     198                 ;;
     199             esac
     200 
     201@@ -5021,20 +5089,11 @@
    200202             EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(CARBON_CFLAGS)"
    201203             EXTRA_OBJS="qsettings_mac.o qcore_mac.o"
     
    215217-                EXTRA_LFLAGS="$EXTRA_LFLAGS $PPC_LFLAGS"
    216218-            fi
    217 +           ARCH_CFLAGS="-arch @ARCHES@"
    218 +           ARCH_LFLAGS="-arch @ARCHES@"
    219 +           EXTRA_CFLAGS="$ARCH_CFLAGS $EXTRA_CFLAGS"
    220 +           EXTRA_CXXFLAGS="$ARCH_CFLAGS $EXTRA_CXXFLAGS"
    221 +           EXTRA_LFLAGS="$EXTRA_LFLAGS $ARCH_LFLAGS"
     219+            ARCH_CFLAGS="-arch @ARCHES@"
     220+            ARCH_LFLAGS="-arch @ARCHES@"
     221+            EXTRA_CFLAGS="$ARCH_CFLAGS $EXTRA_CFLAGS"
     222+            EXTRA_CXXFLAGS="$ARCH_CFLAGS $EXTRA_CXXFLAGS"
     223+            EXTRA_LFLAGS="$EXTRA_LFLAGS $ARCH_LFLAGS"
    222224            if [ '!' -z "$CFG_SDK" ]; then
    223225                echo "SDK_LFLAGS =-Wl,-syslibroot,$CFG_SDK" >>"$mkfile"
    224226                echo "SDK_CFLAGS =-isysroot $CFG_SDK" >>"$mkfile"
    225 @@ -6957,7 +7016,7 @@
     227@@ -6997,7 +7056,7 @@
    226228 
    227229 # detect OpenVG support
     
    232234             CFG_OPENVG=yes
    233235         fi
    234 @@ -6988,7 +7047,7 @@
     236@@ -7028,7 +7087,7 @@
    235237             CFG_OPENVG=no
    236238         fi
     
    241243     fi
    242244 fi
    243 @@ -7179,16 +7238,8 @@
     245@@ -7219,19 +7278,7 @@
    244246 
    245247 # set the global Mac deployment target. This is overridden on an arch-by-arch basis
    246248 # in some cases, see code further down
    247249-case "$PLATFORM,$CFG_MAC_COCOA" in
    248 -    macx*,yes)
    249 -       # Cocoa
    250 -       QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.5
    251 -       ;;
    252 -    macx*,no)
    253 -       # gcc, Carbon
    254 -       QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.4
    255 -       ;;
     250-*macx-clang-libc++,yes)
     251-    # Avoid overriding the default configuration setting when building with clang/libc++
     252-    ;;
     253-macx*,yes)
     254-    # Cocoa
     255-    QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.5
     256-    ;;
     257-macx*,no)
     258-    # gcc, Carbon
     259-    QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.4
     260-    ;;
    256261-esac
    257 +
    258262+QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET @MACOSX_DEPLOYMENT_TARGET@
    259263 
    260264 # disable Qt 3 support on VxWorks, Symbian and INTEGRITY
    261265 case "$XPLATFORM" in
    262 @@ -7467,6 +7518,10 @@
     266@@ -7510,6 +7557,10 @@
    263267     QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GUI"
    264268 fi
     
    271275 if [ "x$PLATFORM_MAC" = "xyes" ] && [ "$XPLATFORM_MINGW" != "yes" ] && [ "$XPLATFORM_SYMBIAN" != "yes" ]; then
    272276     #On Mac we implicitly link against libz, so we
    273 @@ -7930,28 +7985,32 @@
    274  # env. variable.
    275  if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" != "no" ] ; then
    276      if echo "$CFG_MAC_ARCHS" | grep '\<x86\>' > /dev/null 2>&1; then
    277 -        QMakeVar add QMAKE_CFLAGS "-Xarch_i386 -mmacosx-version-min=10.4"
    278 -        QMakeVar add QMAKE_CXXFLAGS "-Xarch_i386 -mmacosx-version-min=10.4"
    279 -        QMakeVar add QMAKE_LFLAGS "-Xarch_i386 -mmacosx-version-min=10.4"
    280 -        QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86 "-arch i386 -Xarch_i386 -mmacosx-version-min=10.4"
    281 +        QMakeVar add QMAKE_CFLAGS "-Xarch_i386 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
    282 +        QMakeVar add QMAKE_CXXFLAGS "-Xarch_i386 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
    283 +        QMakeVar add QMAKE_LFLAGS "-Xarch_i386 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
    284 +        QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86 "-arch i386 -Xarch_i386 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
    285 +        QMakeVar add QMAKE_OBJECTIVE_CXXFLAGS_X86 "-arch i386 -Xarch_i386 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
    286      fi
    287      if echo "$CFG_MAC_ARCHS" | grep '\<ppc\>' > /dev/null 2>&1; then
    288 -        QMakeVar add QMAKE_CFLAGS "-Xarch_ppc -mmacosx-version-min=10.4"
    289 -        QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc -mmacosx-version-min=10.4"
    290 -        QMakeVar add QMAKE_LFLAGS "-Xarch_ppc -mmacosx-version-min=10.4"
    291 -        QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC "-arch ppc -Xarch_ppc -mmacosx-version-min=10.4"
    292 +        QMakeVar add QMAKE_CFLAGS "-Xarch_ppc -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
    293 +        QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
    294 +        QMakeVar add QMAKE_LFLAGS "-Xarch_ppc -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
    295 +        QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC "-arch ppc -Xarch_ppc -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
    296 +        QMakeVar add QMAKE_OBJECTIVE_CXXFLAGS_PPC "-arch ppc -Xarch_ppc -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
    297      fi
    298      if echo "$CFG_MAC_ARCHS" | grep '\<x86_64\>' > /dev/null 2>&1; then
    299 -        QMakeVar add QMAKE_CFLAGS "-Xarch_x86_64 -mmacosx-version-min=10.5"
    300 -        QMakeVar add QMAKE_CXXFLAGS "-Xarch_x86_64 -mmacosx-version-min=10.5"
    301 -        QMakeVar add QMAKE_LFLAGS "-Xarch_x86_64 -mmacosx-version-min=10.5"
    302 -        QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86_64 "-arch x86_64 -Xarch_x86_64 -mmacosx-version-min=10.5"
    303 +        QMakeVar add QMAKE_CFLAGS "-Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
    304 +        QMakeVar add QMAKE_CXXFLAGS "-Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
    305 +        QMakeVar add QMAKE_LFLAGS "-Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
    306 +        QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86_64 "-arch x86_64 -Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
    307 +        QMakeVar add QMAKE_OBJECTIVE_CXXFLAGS_X86_64 "-arch x86_64 -Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
    308      fi
    309      if echo "$CFG_MAC_ARCHS" | grep '\<ppc64\>' > /dev/null 2>&1; then
    310 -        QMakeVar add QMAKE_CFLAGS "-Xarch_ppc64 -mmacosx-version-min=10.5"
    311 -        QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc64 -mmacosx-version-min=10.5"
    312 -        QMakeVar add QMAKE_LFLAGS "-Xarch_ppc64 -mmacosx-version-min=10.5"
    313 -        QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC_64 "-arch ppc64 -Xarch_ppc64 -mmacosx-version-min=10.5"
    314 +        QMakeVar add QMAKE_CFLAGS "-Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
    315 +        QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
    316 +        QMakeVar add QMAKE_LFLAGS "-Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
    317 +        QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC_64 "-arch ppc64 -Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
    318 +        QMakeVar add QMAKE_OBJECTIVE_CXXFLAGS_PPC_64 "-arch ppc64 -Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
    319      fi
    320  fi
    321  
    322 @@ -8709,6 +8768,7 @@
     277@@ -7981,28 +8032,32 @@
     278         ;;
     279     *)
     280         if echo "$CFG_MAC_ARCHS" | grep '\<x86\>' > /dev/null 2>&1; then
     281-            QMakeVar add QMAKE_CFLAGS "-Xarch_i386 -mmacosx-version-min=10.4"
     282-            QMakeVar add QMAKE_CXXFLAGS "-Xarch_i386 -mmacosx-version-min=10.4"
     283-            QMakeVar add QMAKE_LFLAGS "-Xarch_i386 -mmacosx-version-min=10.4"
     284-            QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86 "-arch i386 -Xarch_i386 -mmacosx-version-min=10.4"
     285+            QMakeVar add QMAKE_CFLAGS "-Xarch_i386 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     286+            QMakeVar add QMAKE_CXXFLAGS "-Xarch_i386 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     287+            QMakeVar add QMAKE_LFLAGS "-Xarch_i386 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     288+            QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86 "-arch i386 -Xarch_i386 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     289+            QMakeVar add QMAKE_OBJECTIVE_CXXFLAGS_X86 "-arch i386 -Xarch_i386 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     290         fi
     291         if echo "$CFG_MAC_ARCHS" | grep '\<ppc\>' > /dev/null 2>&1; then
     292-            QMakeVar add QMAKE_CFLAGS "-Xarch_ppc -mmacosx-version-min=10.4"
     293-            QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc -mmacosx-version-min=10.4"
     294-            QMakeVar add QMAKE_LFLAGS "-Xarch_ppc -mmacosx-version-min=10.4"
     295-            QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC "-arch ppc -Xarch_ppc -mmacosx-version-min=10.4"
     296+            QMakeVar add QMAKE_CFLAGS "-Xarch_ppc -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     297+            QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     298+            QMakeVar add QMAKE_LFLAGS "-Xarch_ppc -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     299+            QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC "-arch ppc -Xarch_ppc -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     300+            QMakeVar add QMAKE_OBJECTIVE_CXXFLAGS_PPC "-arch ppc -Xarch_ppc -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     301         fi
     302         if echo "$CFG_MAC_ARCHS" | grep '\<x86_64\>' > /dev/null 2>&1; then
     303-            QMakeVar add QMAKE_CFLAGS "-Xarch_x86_64 -mmacosx-version-min=10.5"
     304-            QMakeVar add QMAKE_CXXFLAGS "-Xarch_x86_64 -mmacosx-version-min=10.5"
     305-            QMakeVar add QMAKE_LFLAGS "-Xarch_x86_64 -mmacosx-version-min=10.5"
     306-            QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86_64 "-arch x86_64 -Xarch_x86_64 -mmacosx-version-min=10.5"
     307+            QMakeVar add QMAKE_CFLAGS "-Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     308+            QMakeVar add QMAKE_CXXFLAGS "-Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     309+            QMakeVar add QMAKE_LFLAGS "-Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     310+            QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86_64 "-arch x86_64 -Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     311+            QMakeVar add QMAKE_OBJECTIVE_CXXFLAGS_X86_64 "-arch x86_64 -Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     312         fi
     313         if echo "$CFG_MAC_ARCHS" | grep '\<ppc64\>' > /dev/null 2>&1; then
     314-            QMakeVar add QMAKE_CFLAGS "-Xarch_ppc64 -mmacosx-version-min=10.5"
     315-            QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc64 -mmacosx-version-min=10.5"
     316-            QMakeVar add QMAKE_LFLAGS "-Xarch_ppc64 -mmacosx-version-min=10.5"
     317-            QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC_64 "-arch ppc64 -Xarch_ppc64 -mmacosx-version-min=10.5"
     318+            QMakeVar add QMAKE_CFLAGS "-Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     319+            QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     320+            QMakeVar add QMAKE_LFLAGS "-Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     321+            QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC_64 "-arch ppc64 -Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     322+            QMakeVar add QMAKE_OBJECTIVE_CXXFLAGS_PPC_64 "-arch ppc64 -Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     323         fi
     324         ;;
     325     esac
     326@@ -8762,6 +8817,7 @@
    323327 QMAKE_RCC        = \$\$QT_BUILD_TREE/bin/rcc
    324328 QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
     
    328332 
    329333 EOF
    330 @@ -8747,6 +8807,11 @@
     334@@ -8800,6 +8856,11 @@
    331335     echo "DEFINES *= QT_EDITION=QT_EDITION_DESKTOP" >> "$CACHEFILE.tmp"
    332336 fi
     
    340344 if [ '!' -z "$OPENSSL_LIBS" ]; then
    341345     echo "OPENSSL_LIBS = $OPENSSL_LIBS" >> "$CACHEFILE.tmp"
    342 @@ -8906,6 +8971,7 @@
     346@@ -8959,6 +9020,7 @@
    343347 else
    344348    echo "Debug .................. $CFG_DEBUG"
  • trunk/dports/aqua/qt4-mac/files/patch-cxx11.diff

    r102010 r119772  
    2121--- src/gui/kernel/qcocoaview_mac.mm.orig       2013-01-22 16:04:44.000000000 -0500
    2222+++ src/gui/kernel/qcocoaview_mac.mm    2013-01-22 16:05:57.000000000 -0500
    23 @@ -1346,7 +1346,7 @@
     23@@ -1352,7 +1352,7 @@
    2424     // Save supported actions:
    2525     [theView setSupportedActions: qt_mac_mapDropActions(dragPrivate()->possible_actions)];
     
    235235--- src/gui/styles/qmacstyle_mac.mm.orig        2013-01-22 19:50:08.000000000 -0500
    236236+++ src/gui/styles/qmacstyle_mac.mm     2013-01-22 19:55:50.000000000 -0500
    237 @@ -3471,8 +3471,8 @@
     237@@ -3468,8 +3468,8 @@
    238238                     tti.version = qt_mac_hitheme_version;
    239239                     tti.state = tds;
     
    246246                     CGContextSetFillColor(cg, colorComp);
    247247                     tti.fontID = themeId;
    248 @@ -3714,8 +3714,8 @@
     248@@ -3701,8 +3701,8 @@
    249249                 tti.version = qt_mac_hitheme_version;
    250250                 tti.state = tds;
     
    257257                 CGContextSetFillColor(cg, colorComp);
    258258                 switch (d->aquaSizeConstrain(opt, w)) {
    259 @@ -3895,8 +3895,8 @@
     259@@ -3882,8 +3882,8 @@
    260260                 CGContextSetShouldAntialias(cg, true);
    261261                 CGContextSetShouldSmoothFonts(cg, true);
     
    268268                 CGContextSetFillColor(cg, colorComp);
    269269                 HIThemeTextInfo tti;
    270 @@ -5031,8 +5031,8 @@
     270@@ -5018,8 +5018,8 @@
    271271                 tti.version = qt_mac_hitheme_version;
    272272                 tti.state = tds;
     
    285285 #if !defined(Q_CC_DIAB)
    286286 #  define QT_INIT_TEXTUNDOCOMMAND(c, a1, a2, a3, a4, a5, a6, a7, a8) \
    287 -          QTextUndoCommand c = { a1, a2, 0, 0, quint8(a3), a4, a5, a6, { a7 }, a8 }
     287-          QTextUndoCommand c = { a1, a2, 0, 0, quint8(a3), a4, quint32(a5), quint32(a6), { int(a7) }, quint32(a8) }
    288288+  QTextUndoCommand c; \
    289289+  c.command = a1; \
     
    304304 }
    305305 
    306 -static const int layouts[2][5][14] =
     306-static const uint layouts[2][5][14] =
    307307+static const UInt32 layouts[2][5][14] =
    308308 {
     
    313313     }
    314314 
    315 -    const int *currentLayout = layouts[orientation == Qt::Vertical][tmpPolicy];
     315-    const uint *currentLayout = layouts[orientation == Qt::Vertical][tmpPolicy];
    316316+    const UInt32 *currentLayout = layouts[orientation == Qt::Vertical][tmpPolicy];
    317317 
     
    342342     // make sure we transmit data in network order
    343343     r = htons(r);
    344 --- src/opengl/gl2paintengineex/qtriangulator.cpp.orig  2013-01-22 16:04:44.000000000 -0500
    345 +++ src/opengl/gl2paintengineex/qtriangulator.cpp       2013-01-22 16:05:57.000000000 -0500
    346 @@ -1710,7 +1710,7 @@
    347          } else {
    348              Q_ASSERT(i + 1 < m_parent->m_indices.size());
    349              // {node, from, to, next, previous, winding, mayIntersect, pointingUp, originallyPointingUp}
    350 -            Edge edge = {0, m_parent->m_indices.at(i), m_parent->m_indices.at(i + 1), -1, -1, 0, true, false, false};
    351 +            Edge edge = {0, int(m_parent->m_indices.at(i)), int(m_parent->m_indices.at(i + 1)), -1, -1, 0, true, false, false};
    352              m_edges.add(edge);
    353          }
    354      }
    355344--- src/openvg/qpaintengine_vg.cpp.orig 2013-01-22 16:04:44.000000000 -0500
    356345+++ src/openvg/qpaintengine_vg.cpp      2013-01-22 16:05:57.000000000 -0500
     
    467456 
    468457     // If the string is newly-translated, then we need to adopt it.
    469 --- src/3rdparty/webkit/Source/JavaScriptCore/wtf/NullPtr.h.orig        2013-01-22 16:04:44.000000000 -0500
    470 +++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/NullPtr.h     2013-01-22 16:05:57.000000000 -0500
    471 @@ -31,16 +31,21 @@
     458--- src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSONObject.cpp.orig      2014-05-01 10:03:45.000000000 -0400
     459+++ src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSONObject.cpp   2014-05-01 10:06:59.000000000 -0400
     460@@ -320,7 +320,7 @@
     461             default:
     462                 static const char hexDigits[] = "0123456789abcdef";
     463                 UChar ch = data[i];
     464-                UChar hex[] = { '\\', 'u', hexDigits[(ch >> 12) & 0xF], hexDigits[(ch >> 8) & 0xF], hexDigits[(ch >> 4) & 0xF], hexDigits[ch & 0xF] };
     465+                UChar hex[] = { '\\', 'u', (UChar) hexDigits[(ch >> 12) & 0xF], (UChar) hexDigits[(ch >> 8) & 0xF], (UChar) hexDigits[(ch >> 4) & 0xF], (UChar) hexDigits[ch & 0xF] };
     466                 builder.append(hex, sizeof(hex) / sizeof(UChar));
     467                 break;
     468         }
     469--- src/3rdparty/webkit/Source/JavaScriptCore/wtf/NullPtr.h.orig        2014-04-10 14:37:11.000000000 -0400
     470+++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/NullPtr.h     2014-05-01 10:22:02.000000000 -0400
     471@@ -31,16 +31,22 @@
    472472 // nullptr_t type and nullptr object. They are defined in the same namespaces they
    473473 // would be in compiler and library that had the support.
     
    480480+#include <cstddef>
    481481 
    482 -#if __has_feature(cxx_nullptr) || (GCC_VERSION_AT_LEAST(4, 6, 0) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && _MSC_VER >= 1600 && !COMPILER(INTEL))
     482-#if __has_feature(cxx_nullptr) || (GCC_VERSION_AT_LEAST(4, 6, 0) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && _MSC_VER >= 1600 && !COMPILER(INTEL)) || defined(_LIBCPP_VERSION)
    483483+// libstdc++ supports nullptr_t starting with gcc 4.6.
    484484+#if defined(__GLIBCXX__) && __GLIBCXX__ < 20110325
     
    491491 
    492492 #else
    493 -
     493 
    494494+#warning "reverting to non NULLPTR"
    495495 namespace std {
     
    549549 }
    550550 
     551--- src/3rdparty/webkit/Source/JavaScriptCore/runtime/JSONObject.cpp.orig       2014-05-01 10:33:20.000000000 -0400
     552+++ src/3rdparty/webkit/Source/JavaScriptCore/runtime/JSONObject.cpp    2014-05-01 10:34:03.000000000 -0400
     553@@ -335,7 +335,7 @@
     554             default:
     555                 static const char hexDigits[] = "0123456789abcdef";
     556                 UChar ch = data[i];
     557-                UChar hex[] = { '\\', 'u', hexDigits[(ch >> 12) & 0xF], hexDigits[(ch >> 8) & 0xF], hexDigits[(ch >> 4) & 0xF], hexDigits[ch & 0xF] };
     558+                UChar hex[] = { '\\', 'u', (UChar) hexDigits[(ch >> 12) & 0xF], (UChar) hexDigits[(ch >> 8) & 0xF], (UChar) hexDigits[(ch >> 4) & 0xF], (UChar) hexDigits[ch & 0xF] };
     559                 builder.append(hex, WTF_ARRAY_LENGTH(hex));
     560                 break;
     561         }
    551562--- src/3rdparty/webkit/Source/WebCore/dom/DocumentMarkerController.cpp.orig    2013-01-22 16:04:44.000000000 -0500
    552563+++ src/3rdparty/webkit/Source/WebCore/dom/DocumentMarkerController.cpp 2013-01-22 16:05:57.000000000 -0500
     
    560571     }
    561572 }
     573--- src/3rdparty/webkit/Source/WebCore/dom/Element.cpp.orig     2014-05-01 10:46:05.000000000 -0400
     574+++ src/3rdparty/webkit/Source/WebCore/dom/Element.cpp  2014-05-01 10:52:18.000000000 -0400
     575@@ -1080,7 +1080,7 @@
     576 {
     577     // Ref currentStyle in case it would otherwise be deleted when setRenderStyle() is called.
     578     RefPtr<RenderStyle> currentStyle(renderStyle());
     579-    bool hasParentStyle = parentNodeForRenderingAndStyle() ? parentNodeForRenderingAndStyle()->renderStyle() : false;
     580+    bool hasParentStyle = parentNodeForRenderingAndStyle() ? (parentNodeForRenderingAndStyle()->renderStyle() != NULL) : false;
     581     bool hasDirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByDirectAdjacentRules();
     582     bool hasIndirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByForwardPositionalRules();
     583 
     584--- src/plugins/accessible/widgets/itemviews.cpp.orig   2014-05-01 12:08:45.000000000 -0400
     585+++ src/plugins/accessible/widgets/itemviews.cpp        2014-05-01 12:28:22.000000000 -0400
     586@@ -393,7 +393,7 @@
     587     QModelIndex index = view()->model()->index(0, column, view()->rootIndex());
     588     if (!index.isValid() || view()->selectionMode() & QAbstractItemView::NoSelection)
     589         return false;
     590-    view()->selectionModel()->select(index, QItemSelectionModel::Columns & QItemSelectionModel::Deselect);
     591+    view()->selectionModel()->select(index, QItemSelectionModel::SelectionFlags(QItemSelectionModel::Columns & QItemSelectionModel::Deselect));
     592     return true;
     593 }
     594 
     595--- tools/designer/src/lib/shared/previewmanager.cpp.orig       2014-05-01 12:33:00.000000000 -0400
     596+++ tools/designer/src/lib/shared/previewmanager.cpp    2014-05-01 12:33:16.000000000 -0400
     597@@ -817,7 +817,7 @@
     598 {
     599     typedef PreviewManagerPrivate::PreviewDataList PreviewDataList;
     600     if (d->m_previews.empty())
     601-        return false;
     602+        return 0;
     603 
     604     // find matching window
     605     const PreviewDataList::const_iterator cend =  d->m_previews.constEnd();
     606--- src/scripttools/debugging/qscriptdebuggerconsole.cpp.orig   2014-05-01 13:47:57.000000000 -0400
     607+++ src/scripttools/debugging/qscriptdebuggerconsole.cpp        2014-05-01 13:48:11.000000000 -0400
     608@@ -489,7 +489,7 @@
     609     d->input += QLatin1Char('\n');
     610     QScriptSyntaxCheckResult check = QScriptEngine::checkSyntax(d->input);
     611     if (check.state() == QScriptSyntaxCheckResult::Intermediate)
     612-        return false;
     613+        return 0;
     614     d->input.chop(1); // remove the last \n
     615     cmd = QString();
     616     cmd.append(d->commandPrefix);
  • trunk/dports/aqua/qt4-mac/files/patch-qmake_qmake.pri.diff

    r97950 r119772  
    1 --- qmake/qmake.pri.orig        2012-04-23 14:49:04.000000000 -0400
    2 +++ qmake/qmake.pri     2012-04-17 14:38:16.000000000 -0400
    3 @@ -136,7 +136,7 @@
     1--- qmake/qmake.pri.orig        2014-04-10 14:37:13.000000000 -0400
     2+++ qmake/qmake.pri     2014-05-01 08:39:42.000000000 -0400
     3@@ -135,7 +135,7 @@
     4         SOURCES += qfilesystemengine_unix.cpp qfilesystemiterator_unix.cpp qfsfileengine_unix.cpp
    45         mac {
    5            SOURCES += qfilesystemengine_mac.cpp
    66           SOURCES += qcore_mac.cpp qsettings_mac.cpp
    77-          QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 #enables weak linking for 10.4 (exported)
  • trunk/dports/aqua/qt4-mac/files/patch-src_tools_bootstrap_bootstrap.pro.diff

    r97950 r119772  
    77-   QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 #enables weak linking for 10.4 (exported)
    88+   QMAKE_MACOSX_DEPLOYMENT_TARGET = @MACOSX_DEPLOYMENT_TARGET@
    9     SOURCES += ../../corelib/io/qfilesystemengine_mac.cpp
    109    SOURCES += ../../corelib/kernel/qcore_mac.cpp
    1110    LIBS += -framework CoreServices
     11 }
  • trunk/dports/aqua/qt4-mac/files/patch-tools_macdeployqt_shared_shared.cpp.diff

    r98334 r119772  
    11--- tools/macdeployqt/shared/shared.cpp.orig    2012-08-12 19:01:35.000000000 -0400
    22+++ tools/macdeployqt/shared/shared.cpp 2012-08-12 19:01:55.000000000 -0400
    3 @@ -139,7 +139,7 @@
     3@@ -141,7 +141,7 @@
    44                 state = DylibName;
    55                 continue;
Note: See TracChangeset for help on using the changeset viewer.