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

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

    diff -N -u -r /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.2.1
     8version             2.5.1
    99categories          devel aqua
    1010platforms           darwin
    1111maintainers         mcalhoun openmaintainer
     
    1818
    1919use_zip yes
    2020
    21 checksums           md5     8a3165f7f68d4932c9a902452993099d \
    22                     sha1    6a369dffa7ee52ae068d9ebb3616e29d185a5009 \
    23                     rmd160  dc4b6d6306c770b0bcab3dbaf08cab19bc7c0100
     21checksums           md5     59468c9c7563dfb2eb867ccd468c7531 \
     22                    sha1    d7fda8e5f2dd7ca1bc297a9d37f43ffd1730bcef \
     23                    rmd160  2c069da0377fc8fb10a0cb950ae0a7a10b33ad51
    2424
    2525# fix up QMake build files to remove debug and release building;
    2626# specify that here instead.
    2727patchfiles          patch-remove_build_types.diff
    2828
    29 # If QT specifies just the name of the compiler, Creator can find it.
    30 # qt4-mac, however,  specifiles the full path of g++ in the form "QMAKE_CXX= /usr/bin/g++-*.*"
    31 # Creator thinks there is a space before the program name and can't find it.
    32 # See http://bugreports.qt.nokia.com/browse/QTCREATORBUG-4370
    33 patchfiles-append   patch-environment.cpp.diff
    34 
    3529post-patch {
    3630    # remove arch from QMake build scripts
    3731    reinplace "/ppc/d" ${worksrcpath}/qtcreator.pri
     
    6761
    6862livecheck.type      regex
    6963livecheck.url       http://get.qt.nokia.com/qtcreator/
    70 # Qt Creator 2.0.* requires Qt 4.7
     64# Qt Creator 2.* requires Qt 4.7
    7165livecheck.regex     "qt-creator-(2.\[0-9.-\]+)-src.zip"
    72 #livecheck.regex     "qt-creator-(1.\[0-9.-\]+)-src.zip"
  • files/patch-environment.cpp.diff

    diff -N -u -r /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-remove_build_types.diff

    diff -N -u -r /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  
    2121 TARGET      = $$qtLibraryTarget(qtcreatorwidgets)
    2222 TEMPLATE    = lib
    2323 
    24 --- src/tools/qpatch/bootstrap.pri.orig 2010-11-12 10:05:03.000000000 -0500
    25 +++ src/tools/qpatch/bootstrap.pri      2010-11-12 10:06:31.000000000 -0500
    26 @@ -1,9 +1,5 @@
    27  CONFIG                += console qtinc
    28  CONFIG         -= qt
    29 -build_all:!build_pass {
    30 -    CONFIG -= build_all
    31 -    CONFIG += release
    32 -}
    33  CONFIG     -= app_bundle
    34  
    35  DEFINES               += \
    3624--- src/plugins/debugger/dumper.pro.orig        2010-11-12 10:05:03.000000000 -0500
    3725+++ src/plugins/debugger/dumper.pro     2010-11-12 10:06:22.000000000 -0500
    38 @@ -8,8 +8,6 @@
     26@@ -7,8 +7,6 @@
    3927 DESTDIR = $$IDE_LIBRARY_PATH # /tmp would be better in some respect ...
    4028 
    4129 linux-* {
     
    4735--- src/libs/utils/process_stub.pro.orig        2010-11-12 10:05:03.000000000 -0500
    4836+++ src/libs/utils/process_stub.pro     2010-11-12 10:06:04.000000000 -0500
    4937@@ -7,11 +7,6 @@
    50  CONFIG          += warn_on console use_c_linker
    51  CONFIG          -= qt app_bundle
     38 TARGET          = qtcreator_process_stub
     39 DESTDIR         = $$IDE_LIBEXEC_PATH
    5240 
    5341-build_all:!build_pass {
    5442-    CONFIG -= build_all
     
    6654 TARGET      = $$qtLibraryTarget(@PLUGIN_NAME@)
    6755 TEMPLATE    = lib
    6856 
    69 --- share/qtcreator/gdbmacros/gdbmacros.pro.orig        2010-11-12 10:05:03.000000000 -0500
    70 +++ share/qtcreator/gdbmacros/gdbmacros.pro     2010-11-12 10:05:43.000000000 -0500
     57--- share/qtcreator/dumper/dumper.pro.orig      2012-08-07 18:32:31.000000000 +0200
     58+++ share/qtcreator/dumper/dumper.pro   2012-08-07 18:33:11.000000000 +0200
    7159@@ -1,9 +1,5 @@
    7260 TEMPLATE = lib
    7361 CONFIG += shared
     
    7563-    CONFIG -= release
    7664-    CONFIG += debug
    7765-}
    78  SOURCES = gdbmacros.cpp
    79  false {
    80      DEFINES += USE_QT_GUI=0
     66 
     67 HEADERS += dumper.h
     68 SOURCES = dumper.cpp