| 1 |
hwoarang 11/04/02 14:07:53 |
| 2 |
|
| 3 |
Modified: metadata.xml ChangeLog qt-creator-2.2.0_beta.ebuild |
| 4 |
Log: |
| 5 |
Fix qml plugin support. Remove designer plugin. Bug #360451 |
| 6 |
|
| 7 |
(Portage version: 2.1.9.44/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.10 dev-util/qt-creator/metadata.xml |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/qt-creator/metadata.xml?rev=1.10&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/qt-creator/metadata.xml?rev=1.10&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/qt-creator/metadata.xml?r1=1.9&r2=1.10 |
| 15 |
|
| 16 |
Index: metadata.xml |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/qt-creator/metadata.xml,v |
| 19 |
retrieving revision 1.9 |
| 20 |
retrieving revision 1.10 |
| 21 |
diff -u -r1.9 -r1.10 |
| 22 |
--- metadata.xml 15 Nov 2010 21:35:18 -0000 1.9 |
| 23 |
+++ metadata.xml 2 Apr 2011 14:07:53 -0000 1.10 |
| 24 |
@@ -7,6 +7,7 @@ |
| 25 |
<name>Markos Chandras</name> |
| 26 |
</maintainer> |
| 27 |
<use> |
| 28 |
+ <flag name="bazaar">Add support for bazaar version control system</flag> |
| 29 |
<flag name="bineditor">enable bineditor plugin</flag> |
| 30 |
<flag name="bookmarks">enable bookmarks plugin</flag> |
| 31 |
<flag name="cmake">enable cmake project manager plugin</flag> |
| 32 |
|
| 33 |
|
| 34 |
|
| 35 |
1.72 dev-util/qt-creator/ChangeLog |
| 36 |
|
| 37 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/qt-creator/ChangeLog?rev=1.72&view=markup |
| 38 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/qt-creator/ChangeLog?rev=1.72&content-type=text/plain |
| 39 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/qt-creator/ChangeLog?r1=1.71&r2=1.72 |
| 40 |
|
| 41 |
Index: ChangeLog |
| 42 |
=================================================================== |
| 43 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v |
| 44 |
retrieving revision 1.71 |
| 45 |
retrieving revision 1.72 |
| 46 |
diff -u -r1.71 -r1.72 |
| 47 |
--- ChangeLog 26 Mar 2011 16:17:39 -0000 1.71 |
| 48 |
+++ ChangeLog 2 Apr 2011 14:07:53 -0000 1.72 |
| 49 |
@@ -1,6 +1,10 @@ |
| 50 |
# ChangeLog for dev-util/qt-creator |
| 51 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 52 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.71 2011/03/26 16:17:39 dilfridge Exp $ |
| 53 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.72 2011/04/02 14:07:53 hwoarang Exp $ |
| 54 |
+ |
| 55 |
+ 02 Apr 2011; Markos Chandras <hwoarang@g.o> |
| 56 |
+ qt-creator-2.2.0_beta.ebuild, metadata.xml: |
| 57 |
+ Fix qml plugin support. Remove designer plugin. Bug #360451 |
| 58 |
|
| 59 |
26 Mar 2011; Andreas K. Huettel <dilfridge@g.o> |
| 60 |
qt-creator-1.2.1.ebuild, qt-creator-1.3.1-r1.ebuild: |
| 61 |
|
| 62 |
|
| 63 |
|
| 64 |
1.2 dev-util/qt-creator/qt-creator-2.2.0_beta.ebuild |
| 65 |
|
| 66 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/qt-creator/qt-creator-2.2.0_beta.ebuild?rev=1.2&view=markup |
| 67 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/qt-creator/qt-creator-2.2.0_beta.ebuild?rev=1.2&content-type=text/plain |
| 68 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/qt-creator/qt-creator-2.2.0_beta.ebuild?r1=1.1&r2=1.2 |
| 69 |
|
| 70 |
Index: qt-creator-2.2.0_beta.ebuild |
| 71 |
=================================================================== |
| 72 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/qt-creator/qt-creator-2.2.0_beta.ebuild,v |
| 73 |
retrieving revision 1.1 |
| 74 |
retrieving revision 1.2 |
| 75 |
diff -u -r1.1 -r1.2 |
| 76 |
--- qt-creator-2.2.0_beta.ebuild 25 Mar 2011 13:49:25 -0000 1.1 |
| 77 |
+++ qt-creator-2.2.0_beta.ebuild 2 Apr 2011 14:07:53 -0000 1.2 |
| 78 |
@@ -1,8 +1,8 @@ |
| 79 |
# Copyright 1999-2011 Gentoo Foundation |
| 80 |
# Distributed under the terms of the GNU General Public License v2 |
| 81 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/qt-creator-2.2.0_beta.ebuild,v 1.1 2011/03/25 13:49:25 hwoarang Exp $ |
| 82 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/qt-creator-2.2.0_beta.ebuild,v 1.2 2011/04/02 14:07:53 hwoarang Exp $ |
| 83 |
|
| 84 |
-EAPI="2" |
| 85 |
+EAPI="4" |
| 86 |
LANGS="de es fr it ja pl ru sl" |
| 87 |
|
| 88 |
inherit qt4-r2 multilib |
| 89 |
@@ -17,7 +17,7 @@ |
| 90 |
LICENSE="LGPL-2.1" |
| 91 |
SLOT="0" |
| 92 |
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" |
| 93 |
-IUSE="bineditor bookmarks +cmake cvs debug +designer doc examples fakevim git |
| 94 |
+IUSE="bazaar bineditor bookmarks +cmake cvs debug doc examples fakevim git |
| 95 |
mercurial perforce +qml qtscript rss subversion" |
| 96 |
QTVER="4.7.1:4" |
| 97 |
DEPEND=">=x11-libs/qt-assistant-${QTVER}[doc?] |
| 98 |
@@ -33,6 +33,7 @@ |
| 99 |
qtscript? ( >=x11-libs/qt-script-${QTVER} )" |
| 100 |
|
| 101 |
RDEPEND="${DEPEND} |
| 102 |
+ bazaar? ( dev-vcs/bzr ) |
| 103 |
cmake? ( dev-util/cmake ) |
| 104 |
cvs? ( dev-vcs/cvs ) |
| 105 |
sys-devel/gdb |
| 106 |
@@ -41,7 +42,8 @@ |
| 107 |
mercurial? ( dev-vcs/mercurial ) |
| 108 |
subversion? ( dev-vcs/subversion )" |
| 109 |
|
| 110 |
-PLUGINS="bookmarks bineditor cmake cvs designer fakevim git mercurial perforce qml qtscript subversion" |
| 111 |
+PLUGINS="bookmarks bineditor cmake cvs fakevim git mercurial |
| 112 |
+perforce qml qtscript subversion" |
| 113 |
|
| 114 |
S="${WORKDIR}"/"${MY_P}"-src |
| 115 |
|
| 116 |
@@ -60,30 +62,15 @@ |
| 117 |
plugin="cmakeprojectmanager" |
| 118 |
elif [[ ${plugin} == "qtscript" ]]; then |
| 119 |
plugin="qtscripteditor" |
| 120 |
- # Make sure that qt4project manager does NOT depend |
| 121 |
- # on designer |
| 122 |
- elif [[ ${plugin} == "designer" ]];then |
| 123 |
- plugin="designer" |
| 124 |
- sed -i -e "/designer/d" \ |
| 125 |
- src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri \ |
| 126 |
- || die "failed to disable qml plugin" |
| 127 |
- fi |
| 128 |
- # Now disable the plugins |
| 129 |
- sed -i "/plugin_${plugin}/s:^:#:" src/plugins/plugins.pro \ |
| 130 |
- || die "Failed to disable ${plugin} plugin" |
| 131 |
- # qml needs special treatment |
| 132 |
- if [[ ${plugin} == "qml" ]]; then |
| 133 |
- # remove qml support from debugger and qt4project manager |
| 134 |
- sed -i -e "/^include(qml\/qml.pri)/d" \ |
| 135 |
- src/plugins/debugger/debugger.pro \ |
| 136 |
- -e "/qmljseditor/d" \ |
| 137 |
- src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri |
| 138 |
- # drop all the qml plugins |
| 139 |
- for x in qmlprojectmanager qmljsinspector qmljseditor qmldesigner; do |
| 140 |
- sed -i "/plugin_${x}/s:^:#:" src/plugins/plugins.pro \ |
| 141 |
- || die "Failed to disable ${x} plugin" |
| 142 |
+ elif [[ ${plugin} == "qml" ]]; then |
| 143 |
+ for x in qmlprojectmanager qmljsinspector qmljseditor qmljstools qmldesigner; do |
| 144 |
+ einfo "Disabling ${x} support" |
| 145 |
+ sed -i "/plugin_${x}/s:^:#:" src/plugins/plugins.pro \ |
| 146 |
+ || die "Failed to disable ${x} plugin" |
| 147 |
done |
| 148 |
fi |
| 149 |
+ # Now disable the plugins |
| 150 |
+ sed -i "/plugin_${plugin}/s:^:#:" src/plugins/plugins.pro |
| 151 |
fi |
| 152 |
done |
| 153 |
|
| 154 |
@@ -91,7 +78,7 @@ |
| 155 |
ewarn |
| 156 |
ewarn "You have enabled perforce plugin." |
| 157 |
ewarn "In order to use it, you need to manually" |
| 158 |
- ewarn "download perforce client from http://www.perforce.com/perforce/downloads/index.html" |
| 159 |
+ ewarn "download the perforce client from http://www.perforce.com/perforce/downloads/index.html" |
| 160 |
ewarn |
| 161 |
fi |
| 162 |
# disable rss news on startup ( bug #302978 ) |
Archives