diff options
| author |   Markos Chandras <hwoarang@gentoo.org> | 2011-11-20 16:52:11 +0000 |
|---|---|---|
| committer | Markos Chandras <hwoarang@gentoo.org> | 2011-11-20 16:52:11 +0000 |
| commit | 299a701b3115933be3c350ffb47b89f62b82d680 (patch) | |
| tree | 3248c465554afe7b9f1eb2a6e443dcb7a05e5a9d /dev-util/qt-creator | |
| parent | Version bump. Fixed examples installation, some automagic dependencies, adapt... (diff) | |
| download | gentoo-2-299a701b3115933be3c350ffb47b89f62b82d680.tar.gz gentoo-2-299a701b3115933be3c350ffb47b89f62b82d680.tar.bz2 gentoo-2-299a701b3115933be3c350ffb47b89f62b82d680.zip | |
Fix compilation failure for rss useflag
(Portage version: 2.2.0_alpha71/cvs/Linux x86_64)
Diffstat (limited to 'dev-util/qt-creator')
| -rw-r--r-- | dev-util/qt-creator/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-util/qt-creator/qt-creator-2.4.0_rc.ebuild | 12 |
2 files changed, 8 insertions, 9 deletions
diff --git a/dev-util/qt-creator/ChangeLog b/dev-util/qt-creator/ChangeLog index a7d575ca1be5..a453737d6f91 100644 --- a/dev-util/qt-creator/ChangeLog +++ b/dev-util/qt-creator/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-util/qt-creator # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.97 2011/11/19 23:19:12 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.98 2011/11/20 16:52:11 hwoarang Exp $ + + 20 Nov 2011; Markos Chandras <hwoarang@gentoo.org> qt-creator-2.4.0_rc.ebuild: + Fix compilation failure for rss useflag 19 Nov 2011; Markos Chandras <hwoarang@gentoo.org> -qt-creator-2.2.0-r1.ebuild, -qt-creator-2.3.0-r2.ebuild, diff --git a/dev-util/qt-creator/qt-creator-2.4.0_rc.ebuild b/dev-util/qt-creator/qt-creator-2.4.0_rc.ebuild index a53902c0d198..5deb00fa83ca 100644 --- a/dev-util/qt-creator/qt-creator-2.4.0_rc.ebuild +++ b/dev-util/qt-creator/qt-creator-2.4.0_rc.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/qt-creator-2.4.0_rc.ebuild,v 1.1 2011/11/19 20:14:38 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/qt-creator-2.4.0_rc.ebuild,v 1.2 2011/11/20 16:52:11 hwoarang Exp $ EAPI="4" LANGS="cs de es fr hu it ja pl ru sl uk zh_CN" @@ -48,7 +48,7 @@ RDEPEND="${CDEPEND} subversion? ( dev-vcs/subversion )" PLUGINS="bookmarks bineditor cmake cvs fakevim git mercurial -perforce qml qtscript subversion" +perforce qml qtscript rss subversion" S="${WORKDIR}"/"${MY_P}"-src @@ -68,6 +68,8 @@ src_prepare() { plugin="cmakeprojectmanager" elif [[ ${plugin} == "qtscript" ]]; then plugin="qtscripteditor" + elif [[ ${plugin} == "rss" ]]; then + plugin="welcome" elif [[ ${plugin} == "qml" ]]; then for x in qmlprojectmanager qmljsinspector qmljseditor qmljstools qmldesigner; do einfo "Disabling ${x} support" @@ -87,12 +89,6 @@ src_prepare() { ewarn "download the perforce client from http://www.perforce.com/perforce/downloads/index.html" ewarn fi - # disable rss news on startup ( bug #302978 ) - if ! use rss; then - einfo "Disabling RSS welcome news" - sed -i "/m_rssFetcher->fetch/s:^:\/\/:" \ - src/plugins/welcome/communitywelcomepagewidget.cpp || die - fi # fix translations sed -i "/^LANGUAGES/s:=.*:= ${LANGS}:" \ |