diff --git a/devel/qtcreator/Makefile b/devel/qtcreator/Makefile index d7396d04530e..c7109d4d4402 100644 --- a/devel/qtcreator/Makefile +++ b/devel/qtcreator/Makefile @@ -1,61 +1,61 @@ # Created by: Kris Moore # $FreeBSD$ PORTNAME= qtcreator DISTVERSION= 2.8.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_QT:S/$/:qtcreator/} \ ${MASTER_SITE_QT} MASTER_SITE_SUBDIR= official_releases/qtcreator/${DISTVERSION:R}/${DISTVERSION}/:qtcreator \ official_releases/qt/${QT4_VERSION:R}/${QT4_VERSION} DISTNAME= qt-creator-${DISTVERSION}-src DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:qtcreator \ ${QT_DISTNAME}.tar.gz DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= C++ and QML IDE for Qt development LIB_DEPENDS= libImath.so:${PORTSDIR}/graphics/ilmbase \ libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \ libjasper.so:${PORTSDIR}/graphics/jasper \ libjpeg.so:${PORTSDIR}/graphics/jpeg USE_QT4= moc_build rcc_build uic_build \ linguist_build assistant_run qt3support \ dbus designer gui help-tools_build network script \ corelib sql svg testlib xml webkit qdoc3_build USES= qmake:outsource MAKE_JOBS_UNSAFE= yes ALL_TARGET= all docs INSTALL_TARGET= install install_docs MAKE_ENV= XDG_CONFIG_HOME=/dev/null USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} QMAKE_ARGS= CONFIG+="configure" QTC_PREFIX=${PREFIX} # Build Qt Quick Designer (requires update on every Qt update). QT_DISTNAME= qt-everywhere-opensource-src-${QT4_VERSION} DO_NOT_EXTRACT= config.profiles config.tests demos doc examples lib \ mkspecs tools translations .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${QT_DISTNAME}/${dne}' .endfor QMAKE_ARGS+= QT_PRIVATE_HEADERS="${WRKDIR}/${QT_DISTNAME}/include" DESKTOP_ENTRIES="Qt Creator" "" "QtProject-qtcreator" \ "${PREFIX}/bin/${PORTNAME}" "Development;Qt;" true post-patch: ${REINPLACE_CMD} -e 's|lrelease|lrelease-qt4|' \ ${WRKSRC}/share/qtcreator/translations/translations.pro ${REINPLACE_CMD} -e 's|lupdate|lupdate-qt4|' \ ${WRKSRC}/share/qtcreator/translations/translations.pro ${REINPLACE_CMD} -e 's|/usr/bin/gnuplot|${LOCALBASE}/gnuplot|' \ ${WRKSRC}/share/qtcreator/dumper/gbridge.py ${REINPLACE_CMD} -e 's|/usr/bin/ant|${LOCALBASE}/ant|' \ ${WRKSRC}/src/plugins/android/androidsettingswidget.cpp ${RM} ${WRKSRC}/share/qtcreator/dumper/gbridge.py.bak .include diff --git a/devel/qtcreator/files/patch-git_ac627bb77 b/devel/qtcreator/files/patch-git_ac627bb77 new file mode 100644 index 000000000000..e7659109d65c --- /dev/null +++ b/devel/qtcreator/files/patch-git_ac627bb77 @@ -0,0 +1,42 @@ +commit ac627bb77001fa6d182a8a247646a810a94a06ee +Author: Daniel Teske +Date: Tue Oct 22 15:51:21 2013 +0200 + + CMake: Don't expect the version in --help output + + Since we don't actually need it anymore, just remove the code. + + Task-number: QTCREATORBUG-10452 + Change-Id: I59f55f3a319240826569de308491cac697c4f045 + Reviewed-by: Tobias Hunger + +--- src/plugins/cmakeprojectmanager/cmakevalidator.cpp ++++ src/plugins/cmakeprojectmanager/cmakevalidator.cpp +@@ -86,16 +86,11 @@ void CMakeValidator::finished(int exitCode) + } + if (m_state == CMakeValidator::RunningBasic) { + QByteArray response = m_process->readAll(); +- QRegExp versionRegexp(QLatin1String("^cmake version ([\\d\\.]*)")); +- versionRegexp.indexIn(QString::fromLocal8Bit(response)); + + m_hasCodeBlocksMsvcGenerator = response.contains("CodeBlocks - NMake Makefiles"); + m_hasCodeBlocksNinjaGenerator = response.contains("CodeBlocks - Ninja"); +- m_version = versionRegexp.cap(1); +- if (versionRegexp.capturedTexts().size() > 3) +- m_version += QLatin1Char('.') + versionRegexp.cap(3); + +- if (m_version.isEmpty()) { ++ if (response.isEmpty()) { + m_state = CMakeValidator::Invalid; + } else { + m_state = CMakeValidator::RunningFunctionList; +--- src/plugins/cmakeprojectmanager/cmakevalidator.h ++++ src/plugins/cmakeprojectmanager/cmakevalidator.h +@@ -74,7 +74,6 @@ private: + QProcess *m_process; + bool m_hasCodeBlocksMsvcGenerator; + bool m_hasCodeBlocksNinjaGenerator; +- QString m_version; + QString m_executable; + + QMap m_functionArgs;