+++ /dev/null
-From d30eeb9c9866161a16fc38fcca7ad3772d30fcc8 Mon Sep 17 00:00:00 2001
-From: Davide Pesavento <pesa@gentoo.org>
-Date: Sun, 18 Oct 2015 02:43:59 +0200
-Subject: Tests: add missing column to tst_fileutils::parentDir testcase
-
-The third column was accidentally removed from one data row in
-commit 271794fbc9cbeaa3393808691742893602de6cf5
-
-Fixes the following fatal error:
-QFETCH: Requested testdata 'expectFailMessage' not available, check your _data function.
-
-Change-Id: I4a09df2e044b4dcee1ed2ffc589082a3e2601232
----
- tests/auto/utils/fileutils/tst_fileutils.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/auto/utils/fileutils/tst_fileutils.cpp b/tests/auto/utils/fileutils/tst_fileutils.cpp
-index dd02f57..0b1e502 100644
---- a/tests/auto/utils/fileutils/tst_fileutils.cpp
-+++ b/tests/auto/utils/fileutils/tst_fileutils.cpp
-@@ -62,7 +62,7 @@ void tst_fileutils::parentDir_data()
- QTest::newRow("//") << "//" << "" << "";
- QTest::newRow("/tmp/dir") << "/tmp/dir" << "/tmp" << "";
- QTest::newRow("relative/path") << "relative/path" << "relative" << "";
-- QTest::newRow("relativepath") << "relativepath" << ".";
-+ QTest::newRow("relativepath") << "relativepath" << "." << "";
-
- // Windows stuff:
- #ifdef Q_OS_WIN
---
-2.6.2
-
+++ /dev/null
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
-inherit eutils l10n multilib qmake-utils virtualx
-
-DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="http://doc.qt.io/qtcreator/"
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI=(
- "git://code.qt.io/${PN}/${PN}.git"
- "https://code.qt.io/git/${PN}/${PN}.git"
- )
-else
- MY_PV=${PV/_/-}
- MY_P=${PN}-opensource-src-${MY_PV}
- [[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
- SRC_URI="http://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~x86"
- S=${WORKDIR}/${MY_P}
-fi
-
-QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal
- bazaar clang:clangcodemodel clearcase cmake:cmakeprojectmanager cvs git ios mercurial
- perforce python:pythoneditor qbs:qbsprojectmanager qnx subversion valgrind winrt)
-IUSE="doc systemd test webkit ${QTC_PLUGINS[@]%:*}"
-
-# minimum Qt version required
-QT_PV="5.4.0:5"
-
-RDEPEND="
- =dev-libs/botan-1.10*[-bindist,threads]
- >=dev-qt/designer-${QT_PV}
- >=dev-qt/qtconcurrent-${QT_PV}
- >=dev-qt/qtcore-${QT_PV}
- >=dev-qt/qtdeclarative-${QT_PV}[widgets]
- >=dev-qt/qtgui-${QT_PV}
- >=dev-qt/qthelp-${QT_PV}
- >=dev-qt/qtnetwork-${QT_PV}[ssl]
- >=dev-qt/qtprintsupport-${QT_PV}
- >=dev-qt/qtquickcontrols-${QT_PV}
- >=dev-qt/qtscript-${QT_PV}
- >=dev-qt/qtsql-${QT_PV}[sqlite]
- >=dev-qt/qtsvg-${QT_PV}
- >=dev-qt/qtwidgets-${QT_PV}
- >=dev-qt/qtx11extras-${QT_PV}
- >=dev-qt/qtxml-${QT_PV}
- >=sys-devel/gdb-7.5[client,python]
- clang? ( =sys-devel/clang-3.6*:= )
- qbs? ( >=dev-util/qbs-1.4.2 )
- systemd? ( sys-apps/systemd:= )
- webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
-"
-DEPEND="${RDEPEND}
- >=dev-qt/linguist-tools-${QT_PV}
- virtual/pkgconfig
- doc? ( >=dev-qt/qdoc-${QT_PV} )
- test? ( >=dev-qt/qttest-${QT_PV} )
-"
-for x in ${PLOCALES}; do
- # qt translations must be installed for qt-creator translations to work
- RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
-done
-unset x
-
-PDEPEND="
- autotools? ( sys-devel/autoconf )
- bazaar? ( dev-vcs/bzr )
- cmake? ( dev-util/cmake )
- cvs? ( dev-vcs/cvs )
- git? ( dev-vcs/git )
- mercurial? ( dev-vcs/mercurial )
- subversion? ( dev-vcs/subversion )
- valgrind? ( dev-util/valgrind )
-"
-
-PATCHES=(
- "${FILESDIR}/3.5.1-tst_fileutils-parentDir.patch"
-)
-
-src_unpack() {
- if [[ $(gcc-major-version) -lt 4 ]] || [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; then
- eerror "GCC version 4.7 or later is required to build Qt Creator"
- die "GCC >= 4.7 required"
- fi
-
- if [[ ${PV} == *9999 ]]; then
- git-r3_src_unpack
- else
- default
- fi
-}
-
-src_prepare() {
- # apply patches
- [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
- epatch_user
-
- # disable unwanted plugins
- for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
- if ! use ${plugin%:*}; then
- einfo "Disabling ${plugin%:*} plugin"
- sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
- src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
- fi
- done
-
- # automagic dep on qtwebkit (bug 538236)
- if ! use webkit; then
- sed -i -e 's/isEmpty(QT\.webkitwidgets\.name)/true/' \
- src/plugins/help/help.pro || die "failed to disable webkit"
- fi
-
- # disable broken or unreliable tests
- sed -i -e '/SUBDIRS/ s/\<dumpers\>//' tests/auto/debugger/debugger.pro || die
- sed -i -e '/CONFIG -=/ s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die
- sed -i -e '/SUBDIRS/ s/\<memcheck\>//' tests/auto/valgrind/valgrind.pro || die
-
- # fix translations
- sed -i -e "/^LANGUAGES =/ s:=.*:= $(l10n_get_locales):" \
- share/qtcreator/translations/translations.pro || die
-
- # remove bundled qbs
- rm -rf src/shared/qbs || die
-}
-
-src_configure() {
- eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
- IDE_PACKAGE_MODE=1 \
- $(use clang && echo LLVM_INSTALL_DIR="${EPREFIX}/usr") \
- $(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
- CONFIG+=qbs_disable_rpath \
- CONFIG+=qbs_enable_project_file_updates \
- $(use systemd && echo CONFIG+=journald) \
- $(use test && echo BUILD_TESTS=1) \
- USE_SYSTEM_BOTAN=1
-}
-
-src_test() {
- cd tests/auto || die
- VIRTUALX_COMMAND=default virtualmake
-}
-
-src_install() {
- emake INSTALL_ROOT="${ED}usr" install
-
- dodoc dist/{changes-*,known-issues}
-
- # install documentation
- if use doc; then
- emake docs
- # don't use ${PF} or the doc will not be found
- insinto /usr/share/doc/qtcreator
- doins share/doc/qtcreator/qtcreator{,-dev}.qch
- docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch
- fi
-
- # install desktop file
- make_desktop_entry qtcreator 'Qt Creator' QtProject-qtcreator 'Qt;Development;IDE'
-}
projects / gentoo.git / commitdiff