From 8c5344287640751bb4533d8d4fd77c2c6a3cd0a6 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Sun, 20 Nov 2011 16:52:11 +0000 Subject: [PATCH] Fix compilation failure for rss useflag Package-Manager: portage-2.2.0_alpha71/cvs/Linux x86_64 --- dev-util/qt-creator/ChangeLog | 5 +++- dev-util/qt-creator/Manifest | 30 +++++++++---------- .../qt-creator/qt-creator-2.4.0_rc.ebuild | 12 +++----- 3 files changed, 23 insertions(+), 24 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 qt-creator-2.4.0_rc.ebuild: + Fix compilation failure for rss useflag 19 Nov 2011; Markos Chandras -qt-creator-2.2.0-r1.ebuild, -qt-creator-2.3.0-r2.ebuild, diff --git a/dev-util/qt-creator/Manifest b/dev-util/qt-creator/Manifest index e36ca8f33874..79a09f535acc 100644 --- a/dev-util/qt-creator/Manifest +++ b/dev-util/qt-creator/Manifest @@ -11,23 +11,23 @@ DIST qt-creator-2.4.0-rc-src.tar.gz 26289503 RMD160 e9317abd0460175d79ef6fb92081 EBUILD qt-creator-2.1.0.ebuild 4366 RMD160 7bb6643a50343ba236fff12a4c43a44ab109a317 SHA1 bfe69de1ae21e45ec2144a8ea75a558aa34fbe26 SHA256 9e07242bfddf41eb585118cefb41650c8b18d34378c7be263e775acfa50cf70f EBUILD qt-creator-2.2.1.ebuild 3927 RMD160 08e20c15e7a9b5f7858f63034392cf45b4c269ce SHA1 d2ca1e76a4410dd61d3ccc2e89d8a72b189aa08c SHA256 ffd9d9e2a05b4f25419848ab76b25d264fb08bc018b5c61b95cdea0cd329b9da EBUILD qt-creator-2.3.1.ebuild 5416 RMD160 4bc9b2046f226b183cdea34e7d5ee0eee0ca2323 SHA1 6c9d7f33b7fab3b8374bd43533c21b786ffcd603 SHA256 86bce36ac98bba54f1427661beb45e8085639b364836557eecfe99e530b1baf7 -EBUILD qt-creator-2.4.0_rc.ebuild 5503 RMD160 a8cb84bb992569d7bb28ef62bda413e756fff9a6 SHA1 b6a37dd68d315d18704a461bac0af8e7dc29f2ca SHA256 35d02037c7149d8e5243ef3c5fec98279e81fddda49771996539661b6107906c -MISC ChangeLog 15305 RMD160 6cf741ec0c66baa547dca3d7412bda55048619cb SHA1 125118e3fabfa2f1824c8ae4072a38165ad2cebe SHA256 4e9a47edda48e6c1f1eb0f815869d909d27539f0bf667085e379b0a18feb01a7 +EBUILD qt-creator-2.4.0_rc.ebuild 5354 RMD160 8ecdc5c9050f1ae0d6a982d6be1a7532956d8da1 SHA1 03a4bc7fbb5373065da292d99a39e3ed4e93fb45 SHA256 02d15068912a9a7a0422745f1c605c3656fed731a59022175136782c3529245f +MISC ChangeLog 15429 RMD160 0f38ee3b8bdf2aad16ff2a33c02c542b410b4787 SHA1 1fd557fcbcb8028665356c03f85a0fabe30b448c SHA256 f5622922b8cfd61f61f3046eec4dacf9bde2047f8cd0f464a2c6bf4958262515 MISC metadata.xml 1182 RMD160 a3d34a17f3bc9f9e78828e001b5039ce0b513914 SHA1 d5e53ca653574a332a644abe72021372ef10cf0a SHA256 151feaa82fdd12a111412f4223cc29312d76fa35f8a039df46d764f090b7b2ab -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBCgAGBQJOyDkKAAoJEPqDWhW0r/LCv/0P/3coz9/jsccoIschQGrekpS2 -8cfMUe6sCbyOIL4U84v6wTMqeTqhHPm8k+SfKdVTygFvgtODxaAZ3go2DJjyeYaY -Myy+8uJiJ3GIwVmUPVZwhTqxt7RETroh2eC3naTKbmqb6FCBPBaVln5DPxYFNeX0 -wONLoJQVBOH88w+uhGvkcZ7cndYHaRXgi2SwWnZzO7iB8uVt/2f+gAU/+gHn9xs3 -+7hoQCbn4kjRUfYYFX2PCeG9qg+sKHBY8ERPLPjrEbegPolVor/V4wlLV/8h4UBs -db3til7kKRP+b8cnxRmkdd64v36RGblDR8m9FxSJ5zYFJqRB6iydmkn93nR1MpAx -jo73px3Fw7yrds2ArnR9K81VJnIAJgeH20u8nTd6UUa8CA+rjGJHIrFKk39hAww2 -BW+R1/Bqclsf+fv0yLOyMHv1Y5as1PC9fmRu9V7q3jWT/8UPRsXgYizH5ZXjxdXi -fEAYmCQsZra1lw2rfgQqMXxB2r+1+eQ6PjTI155ZSUilHHMwVhNHrt6VCi0B049u -Pm1b0HDaGXr/uT94Jk6CSZOCMErku/YkfS2deB/KU+oy8TLSN9MrVKds5r9mUG5s -kGwPaQmPECx6mtxxN9qqBlHu0MkmW+qF6GnisWQk5ovxC67UTlZsho5MAWFHd07p -iNtMFDGCcwW8nxaGJiJ8 -=LlaO +iQIcBAEBCgAGBQJOyTA7AAoJEPqDWhW0r/LCuTMQAICrLp8nGyExIa7cMBBWT03F +66cMOZooU54NIb3S9V5GP3H3YshagtDQkyAKpFRGmXxWquef+jHVI/KuL5caUVeZ +2UC7BnnrR8w/q7VIgVPH+H+De1F6sIMPv13Onv8/f3ImqpGBUoOqyaP71H+pilxb +ZoSNJnrKgCp/ToLNEwXsIIrLKfU+B5ALbLHAY5lUcABE1PUoSvfkBndBzXYtJNww +fgMcYW5gZMNqmzqsrJ991TiAVKlF4AVh6AN3FtsQKhI4+p7+g1GngpE1KUEVddz8 +dd9qh7Q2DACKbTkg/jsXV8SbwCbsPCsP3ENzknhC0mT3t1u7TnVA5uvb/cZP4mga +vhqeZEE9QjtzwAI+kdQPR/VwcDjiTaWu/QO2UFa7/+R+HTDIS/m+pdPJmkNfvXNb +gxR5SUzqQ3utSq7s/4YHJ9EV6vQhHTzazauOmZ8e/NnWOV2AqI98+IUhNum1j4X1 +p0icrZ7/uPUYgD8nZiJ1ZfHAQ8LW3oBQ8D97G9RIJHEHodjWOZGu2/AiZioPvwuC +fPDFH4S9FpogMrYfl4I/KVLZoiAQmGAhewCE+VBXdqnWZwNPmxRptKe/8aACeT8V +IrBzL9A/kTVav/5ddrOy5E/MjXIq3LyiExkf/lRDQCOcMU1jwMUgeRPGICMOx01b +j9ysbDaWc9P3SDhCIuPQ +=fpXI -----END PGP SIGNATURE----- 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}:" \ -- 2.26.2