Date: Thu, 4 Sep 2014 21:16:31 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r367310 - in head/devel/qtcreator: . files Message-ID: <201409042116.s84LGV5u057449@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Thu Sep 4 21:16:31 2014 New Revision: 367310 URL: http://svnweb.freebsd.org/changeset/ports/367310 QAT: https://qat.redports.org/buildarchive/r367310/ Log: Add upstream patch to fix CMake detection. At least since 2.8.12 `cmake --help' stopped outputting its version number, which was being used by Qt Creator in its CMake detection process. PR: 193283 Added: head/devel/qtcreator/files/patch-git_ac627bb77 (contents, props changed) Modified: head/devel/qtcreator/Makefile Modified: head/devel/qtcreator/Makefile ============================================================================== --- head/devel/qtcreator/Makefile Thu Sep 4 20:53:31 2014 (r367309) +++ head/devel/qtcreator/Makefile Thu Sep 4 21:16:31 2014 (r367310) @@ -3,7 +3,7 @@ PORTNAME= qtcreator DISTVERSION= 2.8.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_QT:S/$/:qtcreator/} \ ${MASTER_SITE_QT} Added: head/devel/qtcreator/files/patch-git_ac627bb77 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/qtcreator/files/patch-git_ac627bb77 Thu Sep 4 21:16:31 2014 (r367310) @@ -0,0 +1,42 @@ +commit ac627bb77001fa6d182a8a247646a810a94a06ee +Author: Daniel Teske <daniel.teske@digia.com> +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 <tobias.hunger@digia.com> + +--- 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<QString, QStringList> m_functionArgs;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409042116.s84LGV5u057449>