Ignore:
Timestamp:
Sep 20, 2012, 7:39:52 PM (7 years ago)
Author:
michaelld@…
Message:

qt4-mac :

  • bump to 4.8.3_0;
  • disable +framework variant; always install as framework, and use symlinks to populate libraries and headers into ${prefix}/lib and ${prefix}/include;
  • correct patches to work with new version;
  • remove old 10.8 patchfile, and replace with the single remaining patch needed for linking corelib;
  • install private headers for some Qt modules to allow other ports to work fully (e.g., qt4-creator-mac).
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/aqua/qt4-mac/files/patch-configure.diff

    r96486 r97950  
    1 --- configure.orig      2012-08-08 16:12:36.000000000 -0400
    2 +++ configure   2012-08-08 16:39:19.000000000 -0400
    3 @@ -901,6 +901,7 @@
     1--- configure.orig      2012-09-17 11:00:59.000000000 -0400
     2+++ configure   2012-09-17 11:01:07.000000000 -0400
     3@@ -920,6 +920,7 @@
    44 QT_INSTALL_DOCS=
    55 QT_INSTALL_HEADERS=
     
    99 QT_INSTALL_PLUGINS=
    1010 QT_INSTALL_IMPORTS=
    11 @@ -1358,6 +1359,9 @@
     11@@ -1380,6 +1381,9 @@
    1212     libdir)
    1313         QT_INSTALL_LIBS="$VAL"
     
    1919         QT_NAMESPACE="$VAL"
    2020         ;;
    21 @@ -3649,6 +3653,19 @@
     21@@ -3697,6 +3701,19 @@
    2222     fi
    2323     QT_INSTALL_LIBS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_LIBS"`
     
    3939     if [ -z "$QT_INSTALL_BINS" ]; then #default
    4040         if [ "$CFG_PREFIX_INSTALL" = "no" ]; then
    41 @@ -4700,6 +4717,7 @@
     41@@ -4752,6 +4769,7 @@
    4242 DOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_INSTALL_DOCS"`
    4343 HEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_INSTALL_HEADERS"`
     
    4747 PLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_INSTALL_PLUGINS"`
    4848 IMPORTS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_impspath=$QT_INSTALL_IMPORTS"`
    49 @@ -4725,6 +4743,7 @@
     49@@ -4777,6 +4795,7 @@
    5050     HOSTDOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_HOST_PREFIX/doc"`
    5151     HOSTHEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_HOST_PREFIX/include"`
     
    5555     HOSTPLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_HOST_PREFIX/plugins"`
    5656     HOSTIMPORTS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_impspath=$QT_HOST_PREFIX/IMPORTS"`
    57 @@ -4742,6 +4761,7 @@
     57@@ -4794,6 +4813,7 @@
    5858 static const char qt_configure_documentation_path_str[256 + 12] = "$HOSTDOCUMENTATION_PATH_STR";
    5959 static const char qt_configure_headers_path_str      [256 + 12] = "$HOSTHEADERS_PATH_STR";
     
    6363 static const char qt_configure_plugins_path_str      [256 + 12] = "$HOSTPLUGINS_PATH_STR";
    6464 static const char qt_configure_imports_path_str      [256 + 12] = "$HOSTIMPORTS_PATH_STR";
    65 @@ -4760,6 +4780,7 @@
     65@@ -4812,6 +4832,7 @@
    6666 static const char qt_configure_documentation_path_str[256 + 12] = "$DOCUMENTATION_PATH_STR";
    6767 static const char qt_configure_headers_path_str      [256 + 12] = "$HEADERS_PATH_STR";
     
    7171 static const char qt_configure_plugins_path_str      [256 + 12] = "$PLUGINS_PATH_STR";
    7272 static const char qt_configure_imports_path_str      [256 + 12] = "$IMPORTS_PATH_STR";
    73 @@ -4785,6 +4806,7 @@
     73@@ -4837,6 +4858,7 @@
    7474 #define QT_CONFIGURE_DOCUMENTATION_PATH qt_configure_documentation_path_str + 12;
    7575 #define QT_CONFIGURE_HEADERS_PATH qt_configure_headers_path_str + 12;
     
    7979 #define QT_CONFIGURE_PLUGINS_PATH qt_configure_plugins_path_str + 12;
    8080 #define QT_CONFIGURE_IMPORTS_PATH qt_configure_imports_path_str + 12;
    81 @@ -4944,20 +4966,11 @@
     81@@ -4996,20 +5018,11 @@
    8282             EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(CARBON_CFLAGS)"
    8383             EXTRA_OBJS="qsettings_mac.o qcore_mac.o"
     
    105105                echo "SDK_LFLAGS =-Wl,-syslibroot,$CFG_SDK" >>"$mkfile"
    106106                echo "SDK_CFLAGS =-isysroot $CFG_SDK" >>"$mkfile"
    107 @@ -5389,9 +5402,9 @@
     107@@ -5441,9 +5454,9 @@
    108108         psql)
    109109             if [ "$CFG_SQL_psql" != "no" ]; then
     
    118118                 [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
    119119                 [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"
    120 @@ -7042,16 +7055,8 @@
     120@@ -7097,16 +7110,8 @@
    121121 
    122122 # set the global Mac deployment target. This is overridden on an arch-by-arch basis
     
    137137 # disable Qt 3 support on VxWorks, Symbian and INTEGRITY
    138138 case "$XPLATFORM" in
    139 @@ -7782,28 +7787,28 @@
     139@@ -7844,28 +7849,28 @@
    140140 # env. variable.
    141141 if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" != "no" ] ; then
     
    182182 fi
    183183 
    184 @@ -8550,6 +8555,7 @@
     184@@ -8618,6 +8623,7 @@
    185185 QMAKE_RCC        = \$\$QT_BUILD_TREE/bin/rcc
    186186 QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
Note: See TracChangeset for help on using the changeset viewer.