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

File qt4-creator-mac-2.6.0.patch, 7.5 KB (added by macports@…, 12 years ago)
  • Portfile

    diff -r -u -N /opt/local/var/macports/sources/rsync.macports.org/release/tarballs/ports/devel/qt4-creator-mac/Portfile ./Portfile
    old new  
    55PortGroup           qt4 1.0
    66
    77name                qt4-creator-mac
    8 version             2.5.2
    9 revision            1
     8version             2.6.0
    109categories          devel aqua
    1110platforms           darwin
    1211maintainers         mcalhoun openmaintainer
    1312description         Cross-platform integrated development environment (IDE) tailored to the needs of Qt developers.
    1413long_description    Qt Creator is a cross-platform integrated development environment (IDE) tailored to the needs of Qt developers.
    1514
    16 homepage            http://qt.nokia.com/products/developer-tools
     15homepage            http://qt.digia.com/Product/developer-tools
    1716distname            qt-creator-${version}-src
    18 master_sites        http://get.qt.nokia.com/qtcreator/
     17master_sites        http://origin.releases.qt-project.org/qtcreator/${version}/
    1918
    20 # remove this with next release to use smaller .tar.gz
    21 use_zip yes
    22 
    23 checksums           rmd160  0f628d3e4dfb5c49775b6d651761288ed0b0d02b \
    24                     sha256  4bc8439e4cd967ce8076138e88bb79525666f56409adca755111a48b1704dcb9
     19checksums           rmd160  3f4b88956e77359bbcd733f3c29cc847adaf9427 \
     20                    sha256  80eee368b4dbd6fb8b647fa770f1105314272a2e096ceef365a7508329de33ed
    2521
    2622# fix up QMake build files to remove debug and release building;
    2723# specify that here instead.
    2824patchfiles          patch-remove_build_types.diff \
    29                     patch-servicebrowser_p.h.diff \
    3025                    patch-macports-paths.diff
    3126
    3227post-patch {
  • files/patch-environment.cpp.diff

    diff -r -u -N /opt/local/var/macports/sources/rsync.macports.org/release/tarballs/ports/devel/qt4-creator-mac/files/patch-environment.cpp.diff ./files/patch-environment.cpp.diff
    old new  
    1 --- src/libs/utils/environment.cpp.orig 2011-06-24 14:31:54.000000000 -0500
    2 +++ src/libs/utils/environment.cpp      2011-06-24 14:32:05.000000000 -0500
    3 @@ -204,7 +204,7 @@
    4                                    const QStringList &additionalDirs) const
    5  {
    6      foreach (const QString &executable, executables) {
    7 -        QString exec = expandVariables(executable);
    8 +        QString exec = expandVariables(executable.trimmed());
    9  
    10          if (exec.isEmpty())
    11              continue;
  • files/patch-macports-paths.diff

    diff -r -u -N /opt/local/var/macports/sources/rsync.macports.org/release/tarballs/ports/devel/qt4-creator-mac/files/patch-macports-paths.diff ./files/patch-macports-paths.diff
    old new  
    11--- src/libs/utils/environment.cpp.orig 2012-08-08 15:47:06.000000000 +0200
    22+++ src/libs/utils/environment.cpp      2012-09-22 16:10:03.000000000 +0200
    3 @@ -89,6 +89,7 @@
     3@@ -110,6 +110,7 @@
    44 #endif
    55         }
    66     }
     
    1010 QStringList Environment::toStringList() const
    1111--- src/plugins/qtsupport/baseqtversion.cpp.orig        2012-08-08 15:47:06.000000000 +0200
    1212+++ src/plugins/qtsupport/baseqtversion.cpp     2012-09-22 13:42:33.000000000 +0200
    13 @@ -620,10 +620,14 @@
     13@@ -695,10 +695,14 @@
    1414     default:
    1515         Q_ASSERT(false);
    1616     }
  • files/patch-remove_build_types.diff

    diff -r -u -N /opt/local/var/macports/sources/rsync.macports.org/release/tarballs/ports/devel/qt4-creator-mac/files/patch-remove_build_types.diff ./files/patch-remove_build_types.diff
    old new  
    99-    CONFIG += release
    1010-}
    1111-
    12  SOURCES = main.cpp profileparser.cpp profileevaluator.cpp proitems.cpp ioutils.cpp
    13  HEADERS = profileparser.h profileevaluator.h proitems.h ioutils.h
     12 SOURCES = main.cpp qmakeglobals.cpp qmakeparser.cpp qmakeevaluator.cpp profileevaluator.cpp qmakebuiltins.cpp proitems.cpp ioutils.cpp
     13 HEADERS = qmakeglobals.h qmakeparser.h profileevaluator.h qmakeevaluator.h qmakeevaluator_p.h proitems.h ioutils.h
    1414 
    1515 
    1616--- src/tools/qtcreatorwidgets/qtcreatorwidgets.pro.orig        2010-11-12 10:05:03.000000000 -0500
     
    6666 
    6767 HEADERS += dumper.h
    6868 SOURCES = dumper.cpp
     69--- share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pro.orig  2012-11-06 14:01:48.000000000 +0100
     70+++ share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pro       2012-11-17 00:58:33.000000000 +0100
     71@@ -4,9 +4,4 @@
     72 
     73 DESTDIR = $$[QT_INSTALL_BINS]
     74 
     75-build_all:!build_pass {
     76-    CONFIG -= build_all
     77-    CONFIG += release
     78-}
     79-
     80 include(../../../../../share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri)
     81\ No newline at end of file
     82--- src/libs/utils/process_ctrlc_stub.pro.orig  2012-11-06 14:01:48.000000000 +0100
     83+++ src/libs/utils/process_ctrlc_stub.pro       2012-11-17 00:59:11.000000000 +0100
     84@@ -12,10 +12,5 @@
     85 SOURCES   += process_ctrlc_stub.cpp
     86 LIBS      += -luser32 -lshell32
     87 
     88-build_all:!build_pass {
     89-    CONFIG -= build_all
     90-    CONFIG += release
     91-}
     92-
     93 target.path  = $$QTC_PREFIX/bin # FIXME: libexec, more or less
     94 INSTALLS    += target
     95--- src/plugins/debugger/lldb/guest/qtcreator-lldb.pro.orig     2012-11-06 14:01:48.000000000 +0100
     96+++ src/plugins/debugger/lldb/guest/qtcreator-lldb.pro  2012-11-17 01:00:28.000000000 +0100
     97@@ -8,7 +8,6 @@
     98 include(../../../../../qtcreator.pri)
     99 TEMPLATE = app
     100 CONFIG  -= app_bundle
     101-CONFIG += debug
     102 TARGET = qtcreator-lldb
     103 DEPENDPATH += . .. ../.. ../../..  ../../../../libs
     104 INCLUDEPATH += . .. ../.. ../../.. ../../../../libs
     105--- src/tools/win64interrupt/win64interrupt.pro.orig    2012-11-06 14:01:48.000000000 +0100
     106+++ src/tools/win64interrupt/win64interrupt.pro 2012-11-17 01:01:10.000000000 +0100
     107@@ -21,10 +21,5 @@
     108 TEMPLATE        = app
     109 DESTDIR         = $$IDE_LIBEXEC_PATH
     110 
     111-build_all:!build_pass {
     112-    CONFIG -= build_all
     113-    CONFIG += release
     114-}
     115-
     116 target.path  = $$QTC_PREFIX/bin # FIXME: libexec, more or less
     117 INSTALLS    += target
     118--- tests/manual/debugger/multi/multi.pro.orig  2012-11-06 14:01:48.000000000 +0100
     119+++ tests/manual/debugger/multi/multi.pro       2012-11-17 01:01:30.000000000 +0100
     120@@ -4,6 +4,6 @@
     121 INCLUDEPATH += .
     122 
     123 SOURCES += main.cpp
     124-CONFIG += qt warn_on debug
     125+CONFIG += qt warn_on
     126 OBJECTS_DIR = .obj/debug-shared
     127 MOC_DIR = .moc/debug-shared
  • files/patch-servicebrowser_p.h.diff

    diff -r -u -N /opt/local/var/macports/sources/rsync.macports.org/release/tarballs/ports/devel/qt4-creator-mac/files/patch-servicebrowser_p.h.diff ./files/patch-servicebrowser_p.h.diff
    old new  
    1 --- src/libs/zeroconf/servicebrowser_p.h.orig   2012-08-08 15:47:06.000000000 +1000
    2 +++ src/libs/zeroconf/servicebrowser_p.h        2012-10-12 11:02:22.000000000 +1100
    3 @@ -264,7 +264,7 @@ private:
    4  };
    5  
    6  class ServiceBrowserPrivate {
    7 -    friend class ServiceBrowser;
    8 +    friend class ZeroConf::ServiceBrowser;
    9  public:
    10      ServiceBrowser *q;
    11      QString         serviceType;