Ticket #37018: qt4-creator-mac-2.6.0.patch

Portfile

@@ -5 +5 @@
 PortGroup           qt4 1.0
 
 name                qt4-creator-mac
-version             2.5.2
-revision            1
+version             2.6.0
 categories          devel aqua
 platforms           darwin
 maintainers         mcalhoun openmaintainer
 description         Cross-platform integrated development environment (IDE) tailored to the needs of Qt developers.
 long_description    Qt Creator is a cross-platform integrated development environment (IDE) tailored to the needs of Qt developers.
 
-homepage            http://qt.nokia.com/products/developer-tools
+homepage            http://qt.digia.com/Product/developer-tools
 distname            qt-creator-${version}-src
-master_sites        http://get.qt.nokia.com/qtcreator/
+master_sites        http://origin.releases.qt-project.org/qtcreator/${version}/
 
-# remove this with next release to use smaller .tar.gz
-use_zip yes
-
-checksums           rmd160  0f628d3e4dfb5c49775b6d651761288ed0b0d02b \
-                    sha256  4bc8439e4cd967ce8076138e88bb79525666f56409adca755111a48b1704dcb9
+checksums           rmd160  3f4b88956e77359bbcd733f3c29cc847adaf9427 \
+                    sha256  80eee368b4dbd6fb8b647fa770f1105314272a2e096ceef365a7508329de33ed
 
 # fix up QMake build files to remove debug and release building;
 # specify that here instead.
 patchfiles          patch-remove_build_types.diff \
-                    patch-servicebrowser_p.h.diff \
                     patch-macports-paths.diff
 
 post-patch {

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-macports-paths.diff

@@ -1 +1 @@
 --- src/libs/utils/environment.cpp.orig 2012-08-08 15:47:06.000000000 +0200
 +++ src/libs/utils/environment.cpp      2012-09-22 16:10:03.000000000 +0200
-@@ -89,6 +89,7 @@
+@@ -110,6 +110,7 @@
  #endif
          }
      }
@@ -10 +10 @@
  QStringList Environment::toStringList() const
 --- src/plugins/qtsupport/baseqtversion.cpp.orig        2012-08-08 15:47:06.000000000 +0200
 +++ src/plugins/qtsupport/baseqtversion.cpp     2012-09-22 13:42:33.000000000 +0200
-@@ -620,10 +620,14 @@
+@@ -695,10 +695,14 @@
      default:
          Q_ASSERT(false);
      }

files/patch-remove_build_types.diff

@@ -9 +9 @@
 -    CONFIG += release
 -}
 -
- SOURCES = main.cpp profileparser.cpp profileevaluator.cpp proitems.cpp ioutils.cpp
- HEADERS = profileparser.h profileevaluator.h proitems.h ioutils.h
+ SOURCES = main.cpp qmakeglobals.cpp qmakeparser.cpp qmakeevaluator.cpp profileevaluator.cpp qmakebuiltins.cpp proitems.cpp ioutils.cpp
+ HEADERS = qmakeglobals.h qmakeparser.h profileevaluator.h qmakeevaluator.h qmakeevaluator_p.h proitems.h ioutils.h
  
  
 --- src/tools/qtcreatorwidgets/qtcreatorwidgets.pro.orig        2010-11-12 10:05:03.000000000 -0500
@@ -66 +66 @@
  
  HEADERS += dumper.h
  SOURCES = dumper.cpp
+--- share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pro.orig  2012-11-06 14:01:48.000000000 +0100
++++ share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pro       2012-11-17 00:58:33.000000000 +0100
+@@ -4,9 +4,4 @@
+ 
+ DESTDIR = $$[QT_INSTALL_BINS]
+ 
+-build_all:!build_pass {
+-    CONFIG -= build_all
+-    CONFIG += release
+-}
+-
+ include(../../../../../share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri)
+\ No newline at end of file
+--- src/libs/utils/process_ctrlc_stub.pro.orig  2012-11-06 14:01:48.000000000 +0100
++++ src/libs/utils/process_ctrlc_stub.pro       2012-11-17 00:59:11.000000000 +0100
+@@ -12,10 +12,5 @@
+ SOURCES   += process_ctrlc_stub.cpp
+ LIBS      += -luser32 -lshell32
+ 
+-build_all:!build_pass {
+-    CONFIG -= build_all
+-    CONFIG += release
+-}
+-
+ target.path  = $$QTC_PREFIX/bin # FIXME: libexec, more or less
+ INSTALLS    += target
+--- src/plugins/debugger/lldb/guest/qtcreator-lldb.pro.orig     2012-11-06 14:01:48.000000000 +0100
++++ src/plugins/debugger/lldb/guest/qtcreator-lldb.pro  2012-11-17 01:00:28.000000000 +0100
+@@ -8,7 +8,6 @@
+ include(../../../../../qtcreator.pri)
+ TEMPLATE = app
+ CONFIG  -= app_bundle
+-CONFIG += debug
+ TARGET = qtcreator-lldb
+ DEPENDPATH += . .. ../.. ../../..  ../../../../libs
+ INCLUDEPATH += . .. ../.. ../../.. ../../../../libs
+--- src/tools/win64interrupt/win64interrupt.pro.orig    2012-11-06 14:01:48.000000000 +0100
++++ src/tools/win64interrupt/win64interrupt.pro 2012-11-17 01:01:10.000000000 +0100
+@@ -21,10 +21,5 @@
+ TEMPLATE        = app
+ DESTDIR         = $$IDE_LIBEXEC_PATH
+ 
+-build_all:!build_pass {
+-    CONFIG -= build_all
+-    CONFIG += release
+-}
+-
+ target.path  = $$QTC_PREFIX/bin # FIXME: libexec, more or less
+ INSTALLS    += target
+--- tests/manual/debugger/multi/multi.pro.orig  2012-11-06 14:01:48.000000000 +0100
++++ tests/manual/debugger/multi/multi.pro       2012-11-17 01:01:30.000000000 +0100
+@@ -4,6 +4,6 @@
+ INCLUDEPATH += .
+ 
+ SOURCES += main.cpp
+-CONFIG += qt warn_on debug
++CONFIG += qt warn_on
+ OBJECTS_DIR = .obj/debug-shared
+ MOC_DIR = .moc/debug-shared

files/patch-servicebrowser_p.h.diff

@@ -1 @@
---- src/libs/zeroconf/servicebrowser_p.h.orig   2012-08-08 15:47:06.000000000 +1000
-+++ src/libs/zeroconf/servicebrowser_p.h        2012-10-12 11:02:22.000000000 +1100
-@@ -264,7 +264,7 @@ private:
- };
- 
- class ServiceBrowserPrivate {
--    friend class ServiceBrowser;
-+    friend class ZeroConf::ServiceBrowser;
- public:
-     ServiceBrowser *q;
-     QString         serviceType;