commit: 6de6c65b71105cdc04595d55acf7271340a771f0 Author: Asgeir Bjarni Ingvarsson <asgeir <AT> fundinn <DOT> org> AuthorDate: Fri May 4 16:48:04 2018 +0000 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> CommitDate: Mon May 21 05:11:12 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6de6c65b
dev-qt/qt-creator: version bump to 4.6.1 Closes: https://bugs.gentoo.org/651960 Closes: https://github.com/gentoo/gentoo/pull/8257 Package-Manager: Portage-2.3.38, Repoman-2.3.9 dev-qt/qt-creator/Manifest | 1 + .../qt-creator/{qt-creator-9999.ebuild => qt-creator-4.6.1.ebuild} | 6 +++--- dev-qt/qt-creator/qt-creator-9999.ebuild | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest index 2e69608aea8..fd77dd7b3a1 100644 --- a/dev-qt/qt-creator/Manifest +++ b/dev-qt/qt-creator/Manifest @@ -1,2 +1,3 @@ DIST qt-creator-opensource-src-4.5.2.tar.xz 21745192 BLAKE2B 4860c6041542758647d27ae3aaac15dbbc72bbecbcf335e3bceab378c720979a3e89777762936a4b68eacec02a7b285dec08a19003ac3260de1e2e4ee12706c0 SHA512 cc3f20c109e810e8958495fd0d84461bc9ead7b4172600229969a6a331341f0b76069a71893f1ba279550293b131f6cca5b79c112d67f3aebb6244415489c223 DIST qt-creator-opensource-src-4.6.0-rc1.tar.xz 23389240 BLAKE2B 2fbfe5a6a3b09d439439846dbcbad87d1f5032a35c36fa713e8949d1c3f2c44cf1912fd465f9c97f29204803843cff4c4ecdf7083e8963f3512c0dbfa1594a1f SHA512 eb794935bdbe26362a8dc5a7e62dc8004e808d1485039739af06c92b6e98a6b9d4870f68e5912990acd9970bd8ec518aacd759ece60fe6f0eafc7cd1af981d7d +DIST qt-creator-opensource-src-4.6.1.tar.xz 23403488 BLAKE2B 32fc6d655616302721cccedc82e54a2f3c6e61a5736f0e0f08d56e53dba7ba130ac601c4b3ca9034f9d90cc6f97b3b152a4a985c71f996cd3860124159b9f0e1 SHA512 c5cf1eac02390ce0a52799b90664faf6ba5c5106aa1f5f2ecf4397b45bfb6dcd11480a29dc94600b6e99a911949f71f3f844b34201623edb35fbd5364ce53236 diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-4.6.1.ebuild similarity index 98% copy from dev-qt/qt-creator/qt-creator-9999.ebuild copy to dev-qt/qt-creator/qt-creator-4.6.1.ebuild index 29fd39334fc..f18340089d1 100644 --- a/dev-qt/qt-creator/qt-creator-9999.ebuild +++ b/dev-qt/qt-creator/qt-creator-4.6.1.ebuild @@ -33,7 +33,7 @@ QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectman IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}" # minimum Qt version required -QT_PV="5.9.0:5" +QT_PV="5.6.2:5" CDEPEND=" =dev-libs/botan-1.10*[-bindist,threads] @@ -53,7 +53,7 @@ CDEPEND=" >=dev-qt/qtxml-${QT_PV} clangcodemodel? ( >=sys-devel/clang-5:= ) designer? ( >=dev-qt/designer-${QT_PV} ) - qbs? ( >=dev-util/qbs-1.10.1 ) + qbs? ( >=dev-util/qbs-1.11.1 ) systemd? ( sys-apps/systemd:= ) webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] ) " @@ -123,7 +123,7 @@ src_prepare() { sed -i -e '/sdktool/ d' tests/auto/auto.pro || die sed -i -e '/\(dumpers\|offsets\)\.pro/ d' tests/auto/debugger/debugger.pro || die sed -i -e '/CONFIG -=/ s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die - sed -i -e '/timeline\(items\|notes\|selection\)renderpass/ d' tests/auto/tracing/tracing.pro || die + sed -i -e '/timeline\(items\|notes\|selection\)renderpass/ d' tests/auto/timeline/timeline.pro || die sed -i -e 's/\<memcheck\>//' tests/auto/valgrind/valgrind.pro || die # fix path to some clang headers diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild index 29fd39334fc..9a301fa2fae 100644 --- a/dev-qt/qt-creator/qt-creator-9999.ebuild +++ b/dev-qt/qt-creator/qt-creator-9999.ebuild @@ -53,7 +53,7 @@ CDEPEND=" >=dev-qt/qtxml-${QT_PV} clangcodemodel? ( >=sys-devel/clang-5:= ) designer? ( >=dev-qt/designer-${QT_PV} ) - qbs? ( >=dev-util/qbs-1.10.1 ) + qbs? ( >=dev-util/qbs-1.11.1 ) systemd? ( sys-apps/systemd:= ) webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] ) "
