diff -r -u -N /opt/local/var/macports/sources/rsync.macports.org/release/tarballs/ports/devel/qt4-creator-mac/Portfile ./Portfile
old
|
new
|
|
5 | 5 | PortGroup qt4 1.0 |
6 | 6 | |
7 | 7 | name qt4-creator-mac |
8 | | version 2.6.1 |
| 8 | version 2.7.1 |
9 | 9 | categories devel aqua |
10 | 10 | platforms darwin |
11 | 11 | license LGPL-2.1 |
… |
… |
|
15 | 15 | |
16 | 16 | homepage http://qt.digia.com/Product/developer-tools |
17 | 17 | distname qt-creator-${version}-src |
18 | | master_sites http://origin.releases.qt-project.org/qtcreator/${version}/ |
| 18 | master_sites https://download.qt-project.org/official_releases/qtcreator/[join [lrange [split ${version} .] 0 1] .]/${version}/ |
19 | 19 | |
20 | | checksums rmd160 d0d19dad00c5d7dfcf24babfab87e3c92acc874e \ |
21 | | sha256 8031e81e5e81e398575dd90245defcd29eeaf60d5907861707d85f4325d3d215 |
| 20 | checksums rmd160 4ead068ad4c57888bf96266973fe69e8ee762ed2 \ |
| 21 | sha256 5b428b49579ab62ab0575010848b4d50b05d4ff1abebaa73883bcdd9863f7613 |
| 22 | |
| 23 | depends_build port:pkgconfig |
| 24 | depends_lib port:botan |
22 | 25 | |
23 | 26 | # fix up QMake build files to remove debug and release building; |
24 | 27 | # specify that here instead. |
… |
… |
|
46 | 49 | } |
47 | 50 | |
48 | 51 | configure.cmd ${qt_qmake_cmd} |
49 | | configure.args "-o Makefile qtcreator.pro" |
| 52 | configure.args "-o Makefile qtcreator.pro USE_SYSTEM_BOTAN=1" |
50 | 53 | configure.post_args |
51 | 54 | configure.universal_args |
52 | 55 | |
… |
… |
|
64 | 67 | |
65 | 68 | universal_variant yes |
66 | 69 | |
67 | 70 | livecheck.type regex |
68 | | livecheck.url http://get.qt.nokia.com/qtcreator/ |
69 | | # Qt Creator 2.* requires Qt 4.7 |
| 71 | livecheck.url https://qt-project.org/downloads/ |
| 72 | # Qt Creator >=2.6 requires Qt 4.8 |
70 | 73 | livecheck.regex "qt-creator-(2.\[0-9.-\]+)-src.zip" |
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
|
|
1 | 1 | --- src/libs/utils/environment.cpp.orig 2012-08-08 15:47:06.000000000 +0200 |
2 | 2 | +++ src/libs/utils/environment.cpp 2012-09-22 16:10:03.000000000 +0200 |
3 | | @@ -110,6 +110,7 @@ |
4 | | #endif |
| 3 | @@ -112,6 +112,7 @@ |
| 4 | m_values.insert(s.left(i), s.mid(i+1)); |
5 | 5 | } |
6 | 6 | } |
7 | | + prependOrSetPath("@@PREFIX@@/bin"); |
| 7 | + prependOrSetPath(QLatin1String("@@PREFIX@@/bin")); |
8 | 8 | } |
9 | 9 | |
10 | 10 | QStringList Environment::toStringList() const |
11 | 11 | --- src/plugins/qtsupport/baseqtversion.cpp.orig 2012-08-08 15:47:06.000000000 +0200 |
12 | 12 | +++ src/plugins/qtsupport/baseqtversion.cpp 2012-09-22 13:42:33.000000000 +0200 |
13 | | @@ -696,10 +696,14 @@ |
| 13 | @@ -759,10 +759,14 @@ |
14 | 14 | default: |
15 | 15 | Q_ASSERT(false); |
16 | 16 | } |
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
|
|
1 | | --- tests/manual/proparser/testreader.pro.orig 2011-02-11 11:29:12.000000000 +0100 |
2 | | +++ tests/manual/proparser/testreader.pro 2011-04-03 22:07:37.000000000 +0200 |
3 | | @@ -10,11 +10,6 @@ |
4 | | CONFIG += qt warn_on console |
5 | | CONFIG -= app_bundle |
6 | | |
7 | | -build_all:!build_pass { |
8 | | - CONFIG -= build_all |
9 | | - CONFIG += release |
10 | | -} |
11 | | - |
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 |
14 | | |
15 | | |
16 | 1 | --- src/tools/qtcreatorwidgets/qtcreatorwidgets.pro.orig 2010-11-12 10:05:03.000000000 -0500 |
17 | 2 | +++ src/tools/qtcreatorwidgets/qtcreatorwidgets.pro 2010-11-12 10:06:46.000000000 -0500 |
18 | 3 | @@ -1,4 +1,4 @@ |
… |
… |
|
49 | 34 | --- share/qtcreator/templates/qt4project/customwidgetwizard/tpl_plugin.pro.orig 2010-11-12 10:05:03.000000000 -0500 |
50 | 35 | +++ share/qtcreator/templates/qt4project/customwidgetwizard/tpl_plugin.pro 2010-11-12 10:05:52.000000000 -0500 |
51 | 36 | @@ -1,4 +1,4 @@ |
52 | | -CONFIG += designer plugin debug_and_release |
53 | | +CONFIG += designer plugin |
| 37 | -CONFIG += plugin debug_and_release |
| 38 | +CONFIG += plugin |
54 | 39 | TARGET = $$qtLibraryTarget(@PLUGIN_NAME@) |
55 | 40 | TEMPLATE = lib |
56 | 41 | |
… |
… |
|
68 | 53 | SOURCES = dumper.cpp |
69 | 54 | --- share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pro.orig 2012-11-06 14:01:48.000000000 +0100 |
70 | 55 | +++ share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pro 2012-11-17 00:58:33.000000000 +0100 |
71 | | @@ -4,9 +4,4 @@ |
| 56 | @@ -4,11 +4,6 @@ |
72 | 57 | |
73 | 58 | DESTDIR = $$[QT_INSTALL_BINS] |
74 | 59 | |
… |
… |
|
77 | 62 | - CONFIG += release |
78 | 63 | -} |
79 | 64 | - |
80 | | include(../../../../../share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri) |
81 | | \ No newline at end of file |
| 65 | greaterThan(QT_MAJOR_VERSION, 4) { |
| 66 | DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x040900 |
| 67 | } |
82 | 68 | --- src/libs/utils/process_ctrlc_stub.pro.orig 2012-11-06 14:01:48.000000000 +0100 |
83 | 69 | +++ src/libs/utils/process_ctrlc_stub.pro 2012-11-17 00:59:11.000000000 +0100 |
84 | 70 | @@ -12,10 +12,5 @@ |
… |
… |
|
115 | 101 | - |
116 | 102 | target.path = $$QTC_PREFIX/bin # FIXME: libexec, more or less |
117 | 103 | 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 |
| 104 | --- share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pro.orig 2013-03-26 14:31:48.000000000 +0100 |
| 105 | +++ share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pro 2013-03-26 14:41:09.000000000 +0100 |
| 106 | @@ -4,9 +4,4 @@ |
| 107 | |
| 108 | DESTDIR = $$[QT_INSTALL_BINS] |
| 109 | |
| 110 | -build_all:!build_pass { |
| 111 | - CONFIG -= build_all |
| 112 | - CONFIG += release |
| 113 | -} |
| 114 | - |
| 115 | include(qml2puppet.pri) |