Ticket #32776: qt4-creator-mac-2.5.1.patch

Portfile

@@ -5 +5 @@
 PortGroup           qt4 1.0
 
 name                qt4-creator-mac
-version             2.2.1
+version             2.5.1
 categories          devel aqua
 platforms           darwin
 maintainers         mcalhoun openmaintainer
@@ -18 +18 @@
 
 use_zip yes
 
-checksums           md5     8a3165f7f68d4932c9a902452993099d \
-                    sha1    6a369dffa7ee52ae068d9ebb3616e29d185a5009 \
-                    rmd160  dc4b6d6306c770b0bcab3dbaf08cab19bc7c0100
+checksums           md5     59468c9c7563dfb2eb867ccd468c7531 \
+                    sha1    d7fda8e5f2dd7ca1bc297a9d37f43ffd1730bcef \
+                    rmd160  2c069da0377fc8fb10a0cb950ae0a7a10b33ad51
 
 # fix up QMake build files to remove debug and release building;
 # specify that here instead.
 patchfiles          patch-remove_build_types.diff
 
-# If QT specifies just the name of the compiler, Creator can find it.
-# qt4-mac, however,  specifiles the full path of g++ in the form "QMAKE_CXX= /usr/bin/g++-*.*"
-# Creator thinks there is a space before the program name and can't find it.
-# See http://bugreports.qt.nokia.com/browse/QTCREATORBUG-4370
-patchfiles-append   patch-environment.cpp.diff
-
 post-patch {
     # remove arch from QMake build scripts
     reinplace "/ppc/d" ${worksrcpath}/qtcreator.pri
@@ -67 +61 @@
 
 livecheck.type      regex
 livecheck.url       http://get.qt.nokia.com/qtcreator/
-# Qt Creator 2.0.* requires Qt 4.7
+# Qt Creator 2.* requires Qt 4.7
 livecheck.regex     "qt-creator-(2.\[0-9.-\]+)-src.zip"
-#livecheck.regex     "qt-creator-(1.\[0-9.-\]+)-src.zip"

files/patch-environment.cpp.diff

@@ -1 @@
---- src/libs/utils/environment.cpp.orig 2011-06-24 14:31:54.000000000 -0500
-+++ src/libs/utils/environment.cpp      2011-06-24 14:32:05.000000000 -0500
-@@ -204,7 +204,7 @@
-                                   const QStringList &additionalDirs) const
- {
-     foreach (const QString &executable, executables) {
--        QString exec = expandVariables(executable);
-+        QString exec = expandVariables(executable.trimmed());
- 
-         if (exec.isEmpty())
-             continue;

files/patch-remove_build_types.diff

@@ -21 +21 @@
  TARGET      = $$qtLibraryTarget(qtcreatorwidgets)
  TEMPLATE    = lib
  
---- src/tools/qpatch/bootstrap.pri.orig 2010-11-12 10:05:03.000000000 -0500
-+++ src/tools/qpatch/bootstrap.pri      2010-11-12 10:06:31.000000000 -0500
-@@ -1,9 +1,5 @@
- CONFIG                += console qtinc
- CONFIG         -= qt
--build_all:!build_pass {
--    CONFIG -= build_all
--    CONFIG += release
--}
- CONFIG     -= app_bundle
- 
- DEFINES               += \
 --- src/plugins/debugger/dumper.pro.orig        2010-11-12 10:05:03.000000000 -0500
 +++ src/plugins/debugger/dumper.pro     2010-11-12 10:06:22.000000000 -0500
-@@ -8,8 +8,6 @@
+@@ -7,8 +7,6 @@
  DESTDIR = $$IDE_LIBRARY_PATH # /tmp would be better in some respect ...
  
  linux-* {
@@ -47 +35 @@
 --- src/libs/utils/process_stub.pro.orig        2010-11-12 10:05:03.000000000 -0500
 +++ src/libs/utils/process_stub.pro     2010-11-12 10:06:04.000000000 -0500
 @@ -7,11 +7,6 @@
- CONFIG          += warn_on console use_c_linker
- CONFIG          -= qt app_bundle
+ TARGET          = qtcreator_process_stub
+ DESTDIR         = $$IDE_LIBEXEC_PATH
  
 -build_all:!build_pass {
 -    CONFIG -= build_all
@@ -66 +54 @@
  TARGET      = $$qtLibraryTarget(@PLUGIN_NAME@)
  TEMPLATE    = lib
  
---- share/qtcreator/gdbmacros/gdbmacros.pro.orig        2010-11-12 10:05:03.000000000 -0500
-+++ share/qtcreator/gdbmacros/gdbmacros.pro     2010-11-12 10:05:43.000000000 -0500
+--- share/qtcreator/dumper/dumper.pro.orig      2012-08-07 18:32:31.000000000 +0200
++++ share/qtcreator/dumper/dumper.pro   2012-08-07 18:33:11.000000000 +0200
 @@ -1,9 +1,5 @@
  TEMPLATE = lib
  CONFIG += shared
@@ -75 +63 @@
 -    CONFIG -= release
 -    CONFIG += debug
 -}
- SOURCES = gdbmacros.cpp
- false {
-     DEFINES += USE_QT_GUI=0
+ 
+ HEADERS += dumper.h
+ SOURCES = dumper.cpp