Changeset 107841 for trunk/dports/aqua


Ignore:
Timestamp:
Jul 7, 2013, 2:09:09 AM (6 years ago)
Author:
michaelld@…
Message:

qt4-mac: update to 4.8.5.

Location:
trunk/dports/aqua/qt4-mac
Files:
1 deleted
4 edited

Legend:

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

    r103430 r107841  
    1616#conflicts           qt3 qt3-mac qt4-mac-devel
    1717conflicts           qt3 qt3-mac
    18 version             4.8.4
    19 revision            6
     18version             4.8.5
     19set version_to_minor [join [lrange [split ${version} "."] 0 1] "."]
    2020
    2121categories          aqua
     
    3030                    cross-platform GUI-based applications.
    3131
    32 master_sites        trolltech
     32master_sites        http://download.qt-project.org/official_releases/qt/${version_to_minor}/${version}/
    3333distname            qt-everywhere-opensource-src-${version}
    3434
    35 checksums           sha1    f5880f11c139d7d8d01ecb8d874535f7d9553198 \
    36                     rmd160  3c09a3b1411385d0917225f01ac2ff3a2ce83fda
     35checksums           sha1    745f9ebf091696c0d5403ce691dc28c039d77b9e \
     36                    rmd160  1e7bb099d5d1cda0b663cebe207c846c8d04750d
    3737
    3838minimum_xcodeversions   {8 2.5}
     
    156156# hurt others
    157157
    158 patchfiles-append   patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_mac_MediaPlayerPrivateQTKit.mm.diff
     158# patchfiles-append   patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_mac_MediaPlayerPrivateQTKit.mm.diff
    159159
    160160# (13) fix use of CARBON, found on PPC64; does not hurt others
     
    239239patchfiles-append   \
    240240    patch-tools_macdeployqt_shared_shared.cpp.diff
    241 
    242 # (25) fix spurious global struct declariation
    243 
    244 patchfiles-append   \
    245     patch-src_gui_kernel_qt_cocoa_helpers_mac_p.h.diff
    246241
    247242###############################################
     
    10501045    depends_lib-append port:mesa
    10511046
    1052     post-patch {
    1053 
    1054         # fix variable name in 'configure' for OpenVG
    1055 
    1056         reinplace "s@CONFIG_ARG@QMAKE_OPENVG_ARG@g" \
    1057             ${worksrcpath}/configure
    1058 
    1059     }
    1060 
    10611047    pre-configure {
    10621048
  • trunk/dports/aqua/qt4-mac/files/patch-config.tests_unix_compile.test.diff

    r102010 r107841  
    1 --- config.tests/unix/compile.test.orig 2012-11-23 05:11:21.000000000 -0500
    2 +++ config.tests/unix/compile.test      2012-11-29 12:02:46.000000000 -0500
    3 @@ -69,7 +69,7 @@
     1--- config.tests/unix/compile.test.orig 2013-07-06 14:39:26.000000000 -0400
     2+++ config.tests/unix/compile.test      2013-07-06 14:39:44.000000000 -0400
     3@@ -73,7 +73,7 @@
    44 rm -f "$EXE" "${EXE}.exe"
    55 
  • trunk/dports/aqua/qt4-mac/files/patch-configure.diff

    r102936 r107841  
    1 --- configure.orig      2013-02-10 21:03:10.000000000 -0500
    2 +++ configure   2013-02-10 21:22:49.000000000 -0500
    3 @@ -918,12 +918,14 @@
     1--- configure.orig      2013-07-06 19:48:02.000000000 -0400
     2+++ configure   2013-07-06 19:51:14.000000000 -0400
     3@@ -924,12 +924,14 @@
    44 CFG_ICU=auto
    55 CFG_SYSTEM_PROXIES=no
     
    1616 QT_INSTALL_PLUGINS=
    1717 QT_INSTALL_IMPORTS=
    18 @@ -1137,7 +1139,7 @@
     18@@ -1143,7 +1145,7 @@
    1919         VAL=no
    2020         ;;
     
    2525         VAL=yes
    2626         ;;
    27 @@ -1392,6 +1394,9 @@
     27@@ -1398,6 +1400,9 @@
    2828     libdir)
    2929         QT_INSTALL_LIBS="$VAL"
     
    3535         QT_NAMESPACE="$VAL"
    3636         ;;
    37 @@ -2509,6 +2514,13 @@
     37@@ -2515,6 +2520,13 @@
    3838             UNKNOWN_OPT=yes
    3939         fi
     
    4949         if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
    5050             CFG_SYSTEM_PROXIES="$VAL"
    51 @@ -3451,6 +3463,53 @@
     51@@ -3450,6 +3462,53 @@
    5252     CFG_MAC_XARCH=no
    5353 fi
     
    102102 #auto-detect DWARF2 on the mac
    103103 if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" = "auto" ]; then
    104      if "$mactests/dwarf2.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" ; then
    105 @@ -3460,15 +3519,6 @@
     104     if "$mactests/dwarf2.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" $MAC_CONFIG_TEST_COMMANDLINE; then
     105@@ -3459,15 +3518,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 @@ -3685,6 +3735,19 @@
     121@@ -3694,6 +3744,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 @@ -4752,6 +4815,7 @@
     141@@ -4761,6 +4824,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 @@ -4777,6 +4841,7 @@
     149@@ -4786,6 +4850,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 @@ -4794,6 +4859,7 @@
     157@@ -4803,6 +4868,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 @@ -4812,6 +4878,7 @@
     165@@ -4821,6 +4887,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 @@ -4837,6 +4904,7 @@
     173@@ -4846,6 +4913,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 @@ -4996,20 +5064,11 @@
     181@@ -5005,20 +5073,11 @@
    182182             EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(CARBON_CFLAGS)"
    183183             EXTRA_OBJS="qsettings_mac.o qcore_mac.o"
     
    205205                echo "SDK_LFLAGS =-Wl,-syslibroot,$CFG_SDK" >>"$mkfile"
    206206                echo "SDK_CFLAGS =-isysroot $CFG_SDK" >>"$mkfile"
    207 @@ -7161,16 +7220,8 @@
     207@@ -6957,7 +7016,7 @@
     208 
     209 # detect OpenVG support
     210 if [ "$CFG_OPENVG" != "no" ] && [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then
     211-    if compileTest "unix/openvg" "OpenVG"; then
     212+    if compileTest "unix/openvg" "OpenVG" $QMAKE_OPENVG_ARG; then
     213         if [ "$CFG_OPENVG" = "auto" ]; then
     214             CFG_OPENVG=yes
     215         fi
     216@@ -6988,7 +7047,7 @@
     217             CFG_OPENVG=no
     218         fi
     219     fi
     220-    if [ "$CFG_OPENVG" = "yes" ] && compileTest "unix/shivavg" "ShivaVG" $CONFIG_ARG; then
     221+    if [ "$CFG_OPENVG" = "yes" ] && compileTest "unix/shivavg" "ShivaVG" $QMAKE_OPENVG_ARG; then
     222         CFG_OPENVG_SHIVA=yes
     223     fi
     224 fi
     225@@ -7179,16 +7238,8 @@
    208226 
    209227 # set the global Mac deployment target. This is overridden on an arch-by-arch basis
     
    224242 # disable Qt 3 support on VxWorks, Symbian and INTEGRITY
    225243 case "$XPLATFORM" in
    226 @@ -7447,6 +7498,10 @@
     244@@ -7467,6 +7518,10 @@
    227245     QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GUI"
    228246 fi
     
    235253 if [ "x$PLATFORM_MAC" = "xyes" ] && [ "$XPLATFORM_MINGW" != "yes" ] && [ "$XPLATFORM_SYMBIAN" != "yes" ]; then
    236254     #On Mac we implicitly link against libz, so we
    237 @@ -7910,28 +7965,32 @@
     255@@ -7930,28 +7985,32 @@
    238256 # env. variable.
    239257 if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" != "no" ] ; then
     
    284302 fi
    285303 
    286 @@ -8689,6 +8748,7 @@
     304@@ -8709,6 +8768,7 @@
    287305 QMAKE_RCC        = \$\$QT_BUILD_TREE/bin/rcc
    288306 QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
     
    292310 
    293311 EOF
    294 @@ -8727,6 +8787,11 @@
     312@@ -8747,6 +8807,11 @@
    295313     echo "DEFINES *= QT_EDITION=QT_EDITION_DESKTOP" >> "$CACHEFILE.tmp"
    296314 fi
     
    304322 if [ '!' -z "$OPENSSL_LIBS" ]; then
    305323     echo "OPENSSL_LIBS = $OPENSSL_LIBS" >> "$CACHEFILE.tmp"
    306 @@ -8886,6 +8951,7 @@
     324@@ -8906,6 +8971,7 @@
    307325 else
    308326    echo "Debug .................. $CFG_DEBUG"
  • trunk/dports/aqua/qt4-mac/files/patch-mkspecs_features_qt.prf.diff

    r94241 r107841  
    1 --- mkspecs/features/qt.prf.orig        2012-05-11 10:33:42.000000000 -0400
    2 +++ mkspecs/features/qt.prf     2012-05-23 15:31:06.000000000 -0400
    3 @@ -137,7 +137,15 @@
     1--- mkspecs/features/qt.prf.orig        2013-07-06 14:28:19.000000000 -0400
     2+++ mkspecs/features/qt.prf     2013-07-06 14:28:33.000000000 -0400
     3@@ -145,7 +145,15 @@
    44 #specific module settings
    55 !isEmpty(QT_BUILD_TREE):QMAKE_LIBDIR = $$QT_BUILD_TREE/lib $$QMAKE_LIBDIR #as above, prepending prevents us from picking up "stale" libs
     
    1717    !qt_debug:!qt_release {
    1818       CONFIG(debug, debug|release):qlib_style = debug
    19 @@ -197,8 +205,43 @@
     19@@ -206,8 +214,43 @@
    2020      qtAddLibrary($$qlib)
    2121       }
Note: See TracChangeset for help on using the changeset viewer.