aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2011-11-20 16:59:19 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2011-11-20 16:59:19 +0000
commit36071c6ff33bca3d3b29867ffcf90eeae5c39980 (patch)
treef8cc91d3d2e7a18742f6b64b154b95798e3a3c13 /dev-util
parent[x11-libs/qt-core] Drop redundant dep on pkgconfig, now added by qt4-build.ec... (diff)
downloadqt-36071c6ff33bca3d3b29867ffcf90eeae5c39980.tar.gz
qt-36071c6ff33bca3d3b29867ffcf90eeae5c39980.tar.bz2
qt-36071c6ff33bca3d3b29867ffcf90eeae5c39980.zip
qt-creator: Backport fix for rss useflag
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/qt-creator/Manifest4
-rw-r--r--dev-util/qt-creator/qt-creator-2.9999.ebuild11
-rw-r--r--dev-util/qt-creator/qt-creator-9999.ebuild11
3 files changed, 8 insertions, 18 deletions
diff --git a/dev-util/qt-creator/Manifest b/dev-util/qt-creator/Manifest
index 27b6a856..184496b4 100644
--- a/dev-util/qt-creator/Manifest
+++ b/dev-util/qt-creator/Manifest
@@ -1,4 +1,4 @@
AUX qtcreator_logo_48.png 2230 RMD160 23b90749fca6519a1ad9ac5995d371bf31f7516b SHA1 8f392295d6986d73e8782d5af9fb890aedcc2a88 SHA256 aab4c2771865d24a535eb48d08fdd623503248b9b82812d6cbf7f4ec0134326a
-EBUILD qt-creator-2.9999.ebuild 5331 RMD160 380db8c1a3bc293883770521eea6cc3dd366e909 SHA1 8915e24dae39ba3265cc2a47e72d05eee628fe1c SHA256 0a0bcbb4e1e62859e43faad357e6a174ff6d198672804ed34968c51e4cca9eb5
-EBUILD qt-creator-9999.ebuild 5331 RMD160 380db8c1a3bc293883770521eea6cc3dd366e909 SHA1 8915e24dae39ba3265cc2a47e72d05eee628fe1c SHA256 0a0bcbb4e1e62859e43faad357e6a174ff6d198672804ed34968c51e4cca9eb5
+EBUILD qt-creator-2.9999.ebuild 5153 RMD160 6f9da49742677071ca959009ee0eeb9ff299b35a SHA1 cf6cdaa215b87f0e6312507ab03023dd7c8236c0 SHA256 d4124eb828a7ff742c7b7b8f14c62a6295e2be32cda00da3201d9bd172dcc5b6
+EBUILD qt-creator-9999.ebuild 5153 RMD160 6f9da49742677071ca959009ee0eeb9ff299b35a SHA1 cf6cdaa215b87f0e6312507ab03023dd7c8236c0 SHA256 d4124eb828a7ff742c7b7b8f14c62a6295e2be32cda00da3201d9bd172dcc5b6
MISC metadata.xml 1076 RMD160 0d8770a9dcd896c5e798f4c5a3b1c8e1e2be40be SHA1 59af1cbf3071902003417b7bc9c93c18a09419dc SHA256 712d202fa5df37a6695da30e5e30d48a4285e01e64fc01c060c82fad7d4a774b
diff --git a/dev-util/qt-creator/qt-creator-2.9999.ebuild b/dev-util/qt-creator/qt-creator-2.9999.ebuild
index 853d25a8..a60b3b9f 100644
--- a/dev-util/qt-creator/qt-creator-2.9999.ebuild
+++ b/dev-util/qt-creator/qt-creator-2.9999.ebuild
@@ -49,7 +49,7 @@ RDEPEND="${CDEPEND}
subversion? ( dev-vcs/subversion )"
PLUGINS="bookmarks bineditor cmake cvs fakevim git mercurial perforce
- qml qtscript subversion"
+ qml qtscript rss subversion"
src_prepare() {
qt4-edge_src_prepare
@@ -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,13 +89,6 @@ src_prepare() {
ewarn "download 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 "failed to disable rss"
- fi
# fix translations
sed -i "/^LANGUAGES/s:=.*:= ${LANGS}:" \
diff --git a/dev-util/qt-creator/qt-creator-9999.ebuild b/dev-util/qt-creator/qt-creator-9999.ebuild
index 853d25a8..a60b3b9f 100644
--- a/dev-util/qt-creator/qt-creator-9999.ebuild
+++ b/dev-util/qt-creator/qt-creator-9999.ebuild
@@ -49,7 +49,7 @@ RDEPEND="${CDEPEND}
subversion? ( dev-vcs/subversion )"
PLUGINS="bookmarks bineditor cmake cvs fakevim git mercurial perforce
- qml qtscript subversion"
+ qml qtscript rss subversion"
src_prepare() {
qt4-edge_src_prepare
@@ -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,13 +89,6 @@ src_prepare() {
ewarn "download 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 "failed to disable rss"
- fi
# fix translations
sed -i "/^LANGUAGES/s:=.*:= ${LANGS}:" \