Ticket #38477: qt4-creator-mac-2.7.0.patch

Portfile

@@ -5 +5 @@
 PortGroup           qt4 1.0
 
 name                qt4-creator-mac
-version             2.6.1
+version             2.7.0
 categories          devel aqua
 platforms           darwin
 license             LGPL-2.1
@@ -17 +17 @@
 distname            qt-creator-${version}-src
 master_sites        http://origin.releases.qt-project.org/qtcreator/${version}/
 
-checksums           rmd160  d0d19dad00c5d7dfcf24babfab87e3c92acc874e \
-                    sha256  8031e81e5e81e398575dd90245defcd29eeaf60d5907861707d85f4325d3d215
+checksums           rmd160  d39bde35e81c43acc655ddaa4a42f9bb8c7373b6 \
+                    sha256  c8d05b65661639809df7815837e8c7d42980028dff1e21dc518049d837b3d6fa
+
+depends_build       port:pkgconfig
+depends_lib         port:botan
 
 # fix up QMake build files to remove debug and release building;
 # specify that here instead.
@@ -46 +49 @@
 }
 
 configure.cmd       ${qt_qmake_cmd}
-configure.args      "-o Makefile qtcreator.pro"
+configure.args      "-o Makefile qtcreator.pro USE_SYSTEM_BOTAN=1"
 configure.post_args
 configure.universal_args
 
@@ -64 +67 @@
 
 universal_variant   yes
 
 livecheck.type      regex
-livecheck.url       http://get.qt.nokia.com/qtcreator/
-# Qt Creator 2.* requires Qt 4.7
+livecheck.url       http://qt-project.org/downloads
+# Qt Creator >=2.6 requires Qt 4.8
 livecheck.regex     "qt-creator-(2.\[0-9.-\]+)-src.zip"

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
-@@ -110,6 +110,7 @@
- #endif
+@@ -112,6 +112,7 @@
+                 m_values.insert(s.left(i), s.mid(i+1));
          }
      }
-+    prependOrSetPath("@@PREFIX@@/bin");
++    prependOrSetPath(QLatin1String("@@PREFIX@@/bin"));
  }
  
  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
-@@ -696,10 +696,14 @@
+@@ -757,10 +757,14 @@
      default:
          Q_ASSERT(false);
      }

files/patch-remove_build_types.diff

@@ -1 @@
---- tests/manual/proparser/testreader.pro.orig  2011-02-11 11:29:12.000000000 +0100
-+++ tests/manual/proparser/testreader.pro       2011-04-03 22:07:37.000000000 +0200
-@@ -10,11 +10,6 @@
- CONFIG          += qt warn_on console
- CONFIG          -= app_bundle
- 
--build_all:!build_pass {
--    CONFIG -= build_all
--    CONFIG += release
--}
--
- 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
 +++ src/tools/qtcreatorwidgets/qtcreatorwidgets.pro     2010-11-12 10:06:46.000000000 -0500
 @@ -1,4 +1,4 @@
@@ -49 +34 @@
 --- share/qtcreator/templates/qt4project/customwidgetwizard/tpl_plugin.pro.orig 2010-11-12 10:05:03.000000000 -0500
 +++ share/qtcreator/templates/qt4project/customwidgetwizard/tpl_plugin.pro      2010-11-12 10:05:52.000000000 -0500
 @@ -1,4 +1,4 @@
--CONFIG      += designer plugin debug_and_release
-+CONFIG      += designer plugin
+-CONFIG      += plugin debug_and_release
++CONFIG      += plugin
  TARGET      = $$qtLibraryTarget(@PLUGIN_NAME@)
  TEMPLATE    = lib
  
@@ -68 +53 @@
  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 @@
+@@ -4,11 +4,6 @@
  
  DESTDIR = $$[QT_INSTALL_BINS]
  
@@ -77 +62 @@
 -    CONFIG += release
 -}
 -
- include(../../../../../share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri)
-\ No newline at end of file
+ greaterThan(QT_MAJOR_VERSION, 4) {
+     DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x040900
+ }
 --- 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 @@
@@ -115 +101 @@
 -
  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
+--- share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pro.orig        2013-03-26 14:31:48.000000000 +0100
++++ share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pro     2013-03-26 14:41:09.000000000 +0100
+@@ -4,9 +4,4 @@
+ 
+ DESTDIR = $$[QT_INSTALL_BINS]
+ 
+-build_all:!build_pass {
+-    CONFIG -= build_all
+-    CONFIG += release
+-}
+-
+ include(qml2puppet.pri)