Changeset 97950

Timestamp:

Sep 20, 2012, 7:39:52 PM (12 years ago)

Author:

michaelld@…

Message:

qt4-mac :

• bump to 4.8.3_0;

• hopefully addresses tickets #27959 and #36225;

• 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).

Location:

trunk/dports/aqua/qt4-mac

Files:

• Portfile (modified) (8 diffs)
• files/patch-EXPERIMENTAL-ML-fixes.diff (deleted)
• files/patch-config.tests_unix_precomp.test.diff (modified) (1 diff)
• files/patch-configure.diff (modified) (13 diffs)
• files/patch-mkspecs_features_qt_functions.prf.diff (modified) (5 diffs)
• files/patch-qmake_qmake.pri.diff (modified) (1 diff)
• files/patch-src_3rdparty_webkit_Source_WebKit_qt_QtWebKit.pro.diff (modified) (2 diffs)
• files/patch-src_corelib_corelib.pro.diff (added)
• files/patch-src_tools_bootstrap_bootstrap.pro.diff (modified) (1 diff)

trunk/dports/aqua/qt4-mac/Portfile

@@ -12 +12 @@
 name                qt4-mac
 conflicts           qt3 qt3-mac qt4-mac-devel
-version             4.8.2
-revision            3
+version             4.8.3
 categories          aqua
 platforms           macosx
@@ -28 +27 @@
 distname            qt-everywhere-opensource-src-${version}
 
-checksums           sha1    e1e2edef1d63ed677d6534d32800c2e1f7ad0e73 \
-                    rmd160  6a15077aee1e84076380787127b80c7bb97ebe86
+checksums           sha1    bc352a283610e0cd2fe0dbedbc45613844090fcb \
+                    rmd160  fe56e5da874503a79d6f84a1e15460eba5a6feae
 
 minimum_xcodeversions   {8 2.5}
@@ -206 +205 @@
     patch-src_3rdparty_webkit_Source_WebCore_WebCore.pro.diff
 
-# Temporary patch to get ML working; some of this is already upstream 
-# https://codereview.qt-project.org/#change,31759
-# See also https://trac.macports.org/ticket/35430
+# (23) Under 10.8 only: Patch to fix corelib linking
+
 platform darwin 12 {
-    patchfiles-append patch-EXPERIMENTAL-ML-fixes.diff
-}
-
-# (23) fix Framework directory in MacDeployQt tool
+    patchfiles-append patch-src_corelib_corelib.pro.diff
+}
+
+# (24) fix Framework directory in MacDeployQt tool
 
 patchfiles-append   \
@@ -390 +388 @@
 # -openssl-linked ensures that the MacPorts openssl is used.
 #
-# -no-framework ensures that this port is installed as separate
-#     libraries and headers, with guaranteed locations and names.
+# -framework ensures that this port is installed as frameworks
+#     (collections of {library, headers, resources}); in
+#     post-destroot, link headers and libraries from the frameworks
+#     into non-framework locations as if "-no-framework" were
+#     specified.  Some dependent projects will not work properly if Qt
+#     is installed as libraries by default, thus make it so #1.
 #
 # -no-phonon ensures that Qt does not install the 3rd-parth Phonon
@@ -419 +421 @@
     -fast                                                 \
     -optimized-qmake                                      \
-    -no-framework                                         \
+    -framework                                            \
     -no-phonon                                            \
     -no-phonon-backend
@@ -572 +574 @@
     }
 
-    if {![variant_isset framework]} {
-
-        # if not doing framework install: install qt_menu.nib, used by
-        # any applications making use of Qt's application class
-
-        xinstall -m 755 -d ${destroot_qt}/lib/Resources
-        copy ${worksrcpath}/src/gui/mac/qt_menu.nib \
-            ${destroot_qt}/lib/Resources
-
-    } else {
-
-        # remove -L entries from .prl, and .la files; this is a
-        # framework install, not a library install
-
-        foreach fixfile [exec find ${destroot_qt} -name "*.prl"] {
-            reinplace "/QMAKE_PRL_LIBS/s|-L\[^ \]*||g" ${fixfile}
-        }
-        foreach fixfile [exec find ${destroot_qt} -name "*.la"] {
-            reinplace "/dependency_libs/s|-L\[^ \]*||g" ${fixfile}
-        }
-
-        # remove redundant -F${prefix}/Library/Frameworks entries
-
-        foreach fixfile [exec find ${destroot_qt} -name "*.prl"] {
-            reinplace "/QMAKE_PRL_LIBS/s|-F\[^ \]*|FREPLACEME|1" \
-                ${fixfile}
-            reinplace "/QMAKE_PRL_LIBS/s|-F\[^ \]*||g" ${fixfile}
-            reinplace "s|FREPLACEME|-F${prefix}/Library/Frameworks|1" \
-                ${fixfile}
-        }
-        foreach fixfile [exec find ${destroot_qt} -name "*.la"] {
-            reinplace "/dependency_libs/s|-F\[^ \]*|FREPLACEME|1" \
-                ${fixfile}
-            reinplace "/dependency_libs/s|-F\[^ \]*||g" ${fixfile}
-            reinplace "s|FREPLACEME|-F${prefix}/Library/Frameworks|1" \
-                ${fixfile}
-        }
-
-        # move .pc files from ${qt_frameworks_dir}/pkgconfig to
-        # ${qt_pkg_config_dir}
-
-        file delete -force ${destroot}${qt_pkg_config_dir}
-        xinstall -m 755 -d ${destroot}${qt_libs_dir}
-        move ${destroot}${qt_frameworks_dir}/pkgconfig \
-            ${destroot}${qt_libs_dir}
+    # remove -L entries from .prl, and .la files; this is a
+    # framework install, not a library install
+
+    foreach fixfile [exec find ${destroot_qt} -name "*.prl"] {
+        reinplace "/QMAKE_PRL_LIBS/s|-L\[^ \]*||g" ${fixfile}
+    }
+    foreach fixfile [exec find ${destroot_qt} -name "*.la"] {
+        reinplace "/dependency_libs/s|-L\[^ \]*||g" ${fixfile}
+    }
+
+    # remove redundant -F${prefix}/Library/Frameworks entries
+
+    foreach fixfile [exec find ${destroot_qt} -name "*.prl"] {
+        reinplace "/QMAKE_PRL_LIBS/s|-F\[^ \]*|FREPLACEME|1" \
+            ${fixfile}
+        reinplace "/QMAKE_PRL_LIBS/s|-F\[^ \]*||g" ${fixfile}
+        reinplace "s|FREPLACEME|-F${prefix}/Library/Frameworks|1" \
+            ${fixfile}
+    }
+    foreach fixfile [exec find ${destroot_qt} -name "*.la"] {
+        reinplace "/dependency_libs/s|-F\[^ \]*|FREPLACEME|1" \
+            ${fixfile}
+        reinplace "/dependency_libs/s|-F\[^ \]*||g" ${fixfile}
+        reinplace "s|FREPLACEME|-F${prefix}/Library/Frameworks|1" \
+            ${fixfile}
+    }
+
+    # move .pc files from ${qt_frameworks_dir}/pkgconfig to
+    # ${qt_pkg_config_dir}
+
+    file delete -force ${destroot}${qt_pkg_config_dir}
+    xinstall -m 755 -d ${destroot}${qt_libs_dir}
+    move ${destroot}${qt_frameworks_dir}/pkgconfig \
+        ${destroot}${qt_libs_dir}
+
+    # get Qt's version numbers
+
+    set qt_vers [split ${version} "."]
+    set qt_major [lindex ${qt_vers} 0]
+    set qt_minor [lindex ${qt_vers} 1]
+    set qt_patch [lindex ${qt_vers} 2]
+
+    # link includes and libraries for each actual installed framework
+
+    foreach fixfile [exec find ${destroot}${qt_frameworks_dir} \
+                         -name "*.framework" | \
+                         sed -e "s@${destroot}@@g"] {
+
+        set tf_full [strsed ${fixfile} {s@\\.framework@@}]
+        set tf [strsed ${tf_full} {g@.*\/@@}]
 
         # link headers into ${qt_includes_dir}, removing directories
         # if they are already there first
 
-        foreach fixfile [exec find ${destroot}${qt_frameworks_dir} \
-                             -name "*.framework" | \
-                             sed -e "s@${destroot}@@g"] {
-            set tf_full [strsed ${fixfile} {s@\\.framework@@}]
-            set tf [strsed ${tf_full} {g@.*\/@@}]
-            set inc_file ${destroot}${qt_includes_dir}/${tf}
-            if {[file exists ${inc_file}]} {
-                file delete -force ${inc_file}
-            }
-            ln -s ${tf_full}.framework/Headers ${inc_file}
+        set inc_file ${destroot}${qt_includes_dir}/${tf}
+        if {[file exists ${inc_file}]} {
+            file delete -force ${inc_file}
         }
+        ln -s ${tf_full}.framework/Headers ${inc_file}
+
+        # link libraries into ${qt_libs_dir}, all 4 number variants as
+        # well as the .prl and .la files
+
+        set libs_dir ${destroot}${qt_libs_dir}
+
+        ln -s ${tf_full}.framework/${tf}.prl ${libs_dir}/lib${tf}.prl
+        ln -s ${tf_full}.la ${libs_dir}/lib${tf}.la
+        ln -s ${tf_full}.framework/${tf} ${libs_dir}/lib${tf}.dylib
+        ln -s ${tf_full}.framework/${tf} ${libs_dir}/lib${tf}.${qt_major}.dylib
+        ln -s ${tf_full}.framework/${tf} ${libs_dir}/lib${tf}.${qt_major}.${qt_minor}.dylib
+        ln -s ${tf_full}.framework/${tf} ${libs_dir}/lib${tf}.${qt_major}.${qt_minor}.${qt_patch}.dylib
+
     }
 
     # Install documentation.
+
     xinstall -m 755 -d ${worksrcpath}/${qt_docs_dir}
     xinstall -m 644 -W ${worksrcpath} \
@@ -641 +656 @@
         ${destroot}${qt_docs_dir}
 
+    # Install private headers needed by QtCreator 
+
+    foreach {src_dir include_dir} \
+    {corelib QtCore gui QtGui script QtScript declarative QtDeclarative} {
+        set dest_dir ${destroot}${qt_frameworks_dir}/${include_dir}.framework/Headers/private
+        xinstall -m 755 -d ${dest_dir}
+        set files [exec find ${worksrcpath}/src/${src_dir} -type f -name "*_p.h"]
+        eval xinstall -m 644 [split ${files}] ${dest_dir}
+    }
+
     # Move .apps into the applications_dir
+
     xinstall -m 755 -d ${destroot}${qt_apps_dir}
     foreach app [glob ${destroot}/${qt_bins_dir}/*.app] {
@@ -663 +689 @@
 }
 
-variant framework description {Build as Frameworks} {
-    configure.args-delete -no-framework
-    configure.args-append -framework
+variant framework description {Framework Legacy Compatibility Variant} {
+    ui_error "${name} variant +framework has been disabled because ${name} now installs as both libraries and frameworks.  Please install ${name} without +framework."
+    return -code error "Variant disabled"
 }
 

trunk/dports/aqua/qt4-mac/files/patch-config.tests_unix_precomp.test.diff

@@ -14 +14 @@
      ;;
  
--*g++*|c++)
+-*g++*|c++|*qcc*)
 -    case `"$COMPILER" -dumpversion 2>/dev/null` in
-+*g++*|c++|*gcc*|cc)
++*g++*|c++|*qcc*|*gcc*|cc)
 +    case `$COMPILER -dumpversion 2>/dev/null` in
      3.*)

trunk/dports/aqua/qt4-mac/files/patch-configure.diff

@@ -1 @@
---- configure.orig      2012-08-08 16:12:36.000000000 -0400
-+++ configure   2012-08-08 16:39:19.000000000 -0400
-@@ -901,6 +901,7 @@
+--- configure.orig      2012-09-17 11:00:59.000000000 -0400
++++ configure   2012-09-17 11:01:07.000000000 -0400
+@@ -920,6 +920,7 @@
  QT_INSTALL_DOCS=
  QT_INSTALL_HEADERS=
@@ -9 +9 @@
  QT_INSTALL_PLUGINS=
  QT_INSTALL_IMPORTS=
-@@ -1358,6 +1359,9 @@
+@@ -1380,6 +1381,9 @@
      libdir)
          QT_INSTALL_LIBS="$VAL"
@@ -19 +19 @@
          QT_NAMESPACE="$VAL"
          ;;
-@@ -3649,6 +3653,19 @@
+@@ -3697,6 +3701,19 @@
      fi
      QT_INSTALL_LIBS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_LIBS"`
@@ -39 +39 @@
      if [ -z "$QT_INSTALL_BINS" ]; then #default
          if [ "$CFG_PREFIX_INSTALL" = "no" ]; then
-@@ -4700,6 +4717,7 @@
+@@ -4752,6 +4769,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"`
@@ -47 +47 @@
  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"`
-@@ -4725,6 +4743,7 @@
+@@ -4777,6 +4795,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"`
@@ -55 +55 @@
      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"`
-@@ -4742,6 +4761,7 @@
+@@ -4794,6 +4813,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";
@@ -63 +63 @@
  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";
-@@ -4760,6 +4780,7 @@
+@@ -4812,6 +4832,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";
@@ -71 +71 @@
  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";
-@@ -4785,6 +4806,7 @@
+@@ -4837,6 +4858,7 @@
  #define QT_CONFIGURE_DOCUMENTATION_PATH qt_configure_documentation_path_str + 12;
  #define QT_CONFIGURE_HEADERS_PATH qt_configure_headers_path_str + 12;
@@ -79 +79 @@
  #define QT_CONFIGURE_PLUGINS_PATH qt_configure_plugins_path_str + 12;
  #define QT_CONFIGURE_IMPORTS_PATH qt_configure_imports_path_str + 12;
-@@ -4944,20 +4966,11 @@
+@@ -4996,20 +5018,11 @@
              EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(CARBON_CFLAGS)"
              EXTRA_OBJS="qsettings_mac.o qcore_mac.o"
@@ -105 +105 @@
                 echo "SDK_LFLAGS =-Wl,-syslibroot,$CFG_SDK" >>"$mkfile"
                 echo "SDK_CFLAGS =-isysroot $CFG_SDK" >>"$mkfile"
-@@ -5389,9 +5402,9 @@
+@@ -5441,9 +5454,9 @@
          psql)
              if [ "$CFG_SQL_psql" != "no" ]; then
@@ -118 +118 @@
                  [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
                  [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"
-@@ -7042,16 +7055,8 @@
+@@ -7097,16 +7110,8 @@
  
  # set the global Mac deployment target. This is overridden on an arch-by-arch basis
@@ -137 +137 @@
  # disable Qt 3 support on VxWorks, Symbian and INTEGRITY
  case "$XPLATFORM" in
-@@ -7782,28 +7787,28 @@
+@@ -7844,28 +7849,28 @@
  # env. variable. 
  if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" != "no" ] ; then
@@ -182 +182 @@
  fi
  
-@@ -8550,6 +8555,7 @@
+@@ -8618,6 +8623,7 @@
  QMAKE_RCC        = \$\$QT_BUILD_TREE/bin/rcc
  QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp

trunk/dports/aqua/qt4-mac/files/patch-mkspecs_features_qt_functions.prf.diff

@@ -1 @@
---- mkspecs/features/qt_functions.prf.orig      2012-05-11 10:33:49.000000000 -0400
-+++ mkspecs/features/qt_functions.prf   2012-05-25 13:15:09.000000000 -0400
-@@ -16,24 +16,54 @@
+--- mkspecs/features/qt_functions.prf.orig      2012-09-20 10:57:59.000000000 -0400
++++ mkspecs/features/qt_functions.prf   2012-09-20 15:31:19.000000000 -0400
+@@ -16,24 +16,75 @@
  }
  
@@ -63 +63 @@
 -                     exists($${frmwrk_dir}/$${LIB_NAME}.framework) {
 -                QMAKE_FRAMEWORKPATH *= $${frmwrk_dir}
++
++    # see if the framework, and exists in the current known paths
++
++    # add LIBS entries QMAKE_FRAMEWORKPATH, as appropriate
++
++    all_frmwrks = $$find(LIBS, -F.*) $$find(QMAKE_LFLAGS, -F.*)
++#    message(qtAddLibrary: all frameworks is $$all_frmwrks)
++
++    for(frmwrk_dir, all_frmwrks) {
++
++#      message(qtAddLibrary: this frmwrk_dir is $$frmwrk_dir)
++      tfp = $$frmwrk_dir
++      tfp ~= s,-F,,
++      QMAKE_FRAMEWORKPATH *= $$tfp
++#      message(qtAddLibrary: this frmwrk_path is $$tfp)
++
++    }
++
 +    mac:!qt_no_framework {
-+       for(frmwrk_dir, $$list($$QMAKE_FRAMEWORKDIR_QT $$QMAKE_LIBDIR_QT $$QMAKE_LIBDIR $$(DYLD_FRAMEWORK_PATH))) {
++       for(frmwrk_dir, $$list($$QMAKE_FRAMEWORKPATH $$QMAKE_FRAMEWORKDIR_QT $$QMAKE_LIBDIR_QT $$QMAKE_LIBDIR $$(DYLD_FRAMEWORK_PATH))) {
++
++#           message(qtAddLibrary: looking for framework $$LIB_NAME in directory $$frmwrk_dir)
 +           exists($${frmwrk_dir}/$${LIB_NAME}.framework) {
-+               QMAKE_FRAMEWORKPATH *= $${frmwrk_dir}
++
++                message(qtAddLibrary: found framework $$LIB_NAME in directory $$frmwrk_dir)
                 FRAMEWORK_INCLUDE = $$frmwrk_dir/$${LIB_NAME}.framework/Headers
                 !qt_no_framework_direct_includes:exists($$FRAMEWORK_INCLUDE) {
                   INCLUDEPATH -= $$FRAMEWORK_INCLUDE
-@@ -42,8 +72,7 @@
+@@ -41,10 +92,13 @@
+                 }
                 LINKAGE = -framework $${LIB_NAME}
                         break()
++
                }
 -           }
@@ -78 +101 @@
 +         }
      }
++
++    # special for symbian
++
      symbian {
          isEqual(LIB_NAME, QtCore) {
-@@ -73,7 +102,16 @@
+             #workaround for dependency from f32file.h on e32svr.h which has moved location in symbian3
+@@ -70,10 +124,56 @@
+         export(TARGET.EPOCHEAPSIZE)
+         export(TARGET.CAPABILITY)
+     }
++
++    isEmpty(LINKAGE) {
++
++      # not a framework or symbian
++      # see if the library exists in the current known paths
++
++      # add LIBS entries QMAKE_LIBPATH, as appropriate
++
++      all_libs = $$find(LIBS, -L.*) $$find(QMAKE_LFLAGS, -L.*)
++#      message(qtAddLibrary: all library paths is $$all_libs)
++
++      for(lib_dir, all_libs) {
++
++#        message(qtAddLibrary: this lib_dir is $$lib_dir)
++        tlp = $$lib_dir
++        tlp ~= s,-L,,
++        QMAKE_LIBPATH *= $$tlp
++#        message(qtAddLibrary: this lib_path is $$tlp)
++
++      }
++
++      for(lib_dir, $$list($$QMAKE_LIBPATH $$QMAKE_LIBDIR_QT $$QMAKE_LIBDIR)) {
++
++#           message(qtAddLibrary: looking for library $${LIB_NAME}$${QT_LIBINFIX} in directory $$lib_dir)
++           exists($${lib_dir}/lib$${LIB_NAME}$${QT_LIBINFIX}.*) {
++
++                message(qtAddLibrary: found library $${LIB_NAME}$${QT_LIBINFIX} in directory $$lib_dir)
++               LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}
++                       break()
++
++              }
++         }
++    }
++
      isEmpty(LINKAGE) {
++
++       message(WARNING: Could not find library or framework $$LIB_NAME in the current known search directories; assuming a default library.)
++
         if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
             win32:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}d
@@ -98 +165 @@
         isEmpty(LINKAGE):LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}
      }
-@@ -83,6 +121,9 @@
+@@ -83,9 +183,13 @@
          QMAKE_LFLAGS *= --lsb-shared-libs=$${LIB_NAME}$${QT_LIBINFIX}
      }
@@ -108 +175 @@
      export(INCLUDEPATH)
      export(QMAKE_FRAMEWORKPATH)
-@@ -119,4 +160,3 @@
++    export(QMAKE_LIBPATH)
+     export(QMAKE_LFLAGS)
+     return(true)
+ }
+@@ -119,4 +223,3 @@
  
      return(true)

trunk/dports/aqua/qt4-mac/files/patch-qmake_qmake.pri.diff

@@ -1 +1 @@
 --- qmake/qmake.pri.orig        2012-04-23 14:49:04.000000000 -0400
 +++ qmake/qmake.pri     2012-04-17 14:38:16.000000000 -0400
-@@ -138,7 +138,7 @@
+@@ -136,7 +136,7 @@
          mac {
            SOURCES += qfilesystemengine_mac.cpp

trunk/dports/aqua/qt4-mac/files/patch-src_3rdparty_webkit_Source_WebKit_qt_QtWebKit.pro.diff

@@ -10 +10 @@
          }
  
-@@ -295,7 +295,7 @@
+@@ -297,7 +297,7 @@
  
  !symbian-abld:!symbian-sbsv2 {
@@ -19 +19 @@
      INSTALLS += modfile
  } else {
-@@ -303,7 +303,7 @@
+@@ -305,7 +305,7 @@
  
      inst_modfile.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} ${QMAKE_FILE_OUT}

trunk/dports/aqua/qt4-mac/files/patch-src_tools_bootstrap_bootstrap.pro.diff

@@ -1 +1 @@
 --- src/tools/bootstrap/bootstrap.pro.orig      2012-04-23 14:49:04.000000000 -0400
 +++ src/tools/bootstrap/bootstrap.pro   2012-04-17 14:38:16.000000000 -0400
-@@ -104,7 +104,7 @@
+@@ -103,7 +103,7 @@
  else:win32:SOURCES += ../../corelib/tools/qlocale_win.cpp