* [gentoo-commits] gentoo-x86 commit in dev-util/qt-creator: ChangeLog qt-creator-2.1.0_beta2-r1.ebuild qt-creator-2.1.0_beta2.ebuild
@ 2010-11-17 9:31 Markos Chandras (hwoarang)
0 siblings, 0 replies; only message in thread
From: Markos Chandras (hwoarang) @ 2010-11-17 9:31 UTC (permalink / raw
To: gentoo-commits
hwoarang 10/11/17 09:31:57
Modified: ChangeLog
Added: qt-creator-2.1.0_beta2-r1.ebuild
Removed: qt-creator-2.1.0_beta2.ebuild
Log:
Revbump to fix building when qml is disabled. Bug #345757
(Portage version: 2.1.9.24/cvs/Linux x86_64)
Revision Changes Path
1.65 dev-util/qt-creator/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/qt-creator/ChangeLog?rev=1.65&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/qt-creator/ChangeLog?rev=1.65&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/qt-creator/ChangeLog?r1=1.64&r2=1.65
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- ChangeLog 15 Nov 2010 21:35:18 -0000 1.64
+++ ChangeLog 17 Nov 2010 09:31:57 -0000 1.65
@@ -1,6 +1,15 @@
# ChangeLog for dev-util/qt-creator
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.64 2010/11/15 21:35:18 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.65 2010/11/17 09:31:57 hwoarang Exp $
+
+*qt-creator-2.1.0_beta2-r1 (17 Nov 2010)
+
+ 17 Nov 2010; Markos Chandras <hwoarang@gentoo.org>
+ -qt-creator-2.1.0_beta2.ebuild, +qt-creator-2.1.0_beta2-r1.ebuild:
+ Revbump to fix broken package when building with -qml. At this point, qml
+ is by far the safest choice in order to have a fully working qt-creator.
+ Building with -qml is ideal for pure C++ development yet many qt-creator
+ plugins will be missing because of this. Bug #345757
15 Nov 2010; Markos Chandras <hwoarang@gentoo.org>
qt-creator-2.0.1.ebuild, qt-creator-2.1.0_beta2.ebuild, metadata.xml:
1.1 dev-util/qt-creator/qt-creator-2.1.0_beta2-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/qt-creator/qt-creator-2.1.0_beta2-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/qt-creator/qt-creator-2.1.0_beta2-r1.ebuild?rev=1.1&content-type=text/plain
Index: qt-creator-2.1.0_beta2-r1.ebuild
===================================================================
# Copyright 1999-2010 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.1.0_beta2-r1.ebuild,v 1.1 2010/11/17 09:31:57 hwoarang Exp $
EAPI="2"
LANGS="de es fr it ja pl ru sl"
inherit qt4-r2 multilib
MY_PN="${PN/-/}"
MY_PV="${PV/_/-}"
MY_P="${PN}-${MY_PV}"
DESCRIPTION="Lightweight IDE for C++ development centering around Qt"
HOMEPAGE="http://qt.nokia.com/products/developer-tools"
SRC_URI="http://get.qt.nokia.com/${MY_PN}/${MY_P}-src.zip"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE="bineditor bookmarks +cmake cvs debug +designer doc examples fakevim git
mercurial perforce +qml qtscript rss subversion"
QTVER="4.7.1:4"
DEPEND=">=x11-libs/qt-assistant-${QTVER}[doc?]
>=x11-libs/qt-sql-${QTVER}
>=x11-libs/qt-svg-${QTVER}
!qml? ( >=x11-libs/qt-gui-${QTVER} )
qml? (
>=x11-libs/qt-declarative-${QTVER}[private-headers]
>=x11-libs/qt-core-${QTVER}[private-headers]
>=x11-libs/qt-gui-${QTVER}[private-headers]
>=x11-libs/qt-script-${QTVER}[private-headers]
)
qtscript? ( >=x11-libs/qt-script-${QTVER} )"
RDEPEND="${DEPEND}
cmake? ( dev-util/cmake )
cvs? ( dev-vcs/cvs )
sys-devel/gdb
examples? ( >=x11-libs/qt-demo-${QTVER} )
git? ( dev-vcs/git )
mercurial? ( dev-vcs/mercurial )
subversion? ( dev-vcs/subversion )"
PLUGINS="bookmarks bineditor cmake cvs designer fakevim git mercurial perforce qml qtscript subversion"
S="${WORKDIR}"/"${MY_P}"-src
src_prepare() {
qt4-r2_src_prepare
# bug 263087
for plugin in ${PLUGINS}; do
if ! use ${plugin}; then
einfo "Disabling ${plugin} support"
if [[ ${plugin} == "cmake" ]]; then
plugin="cmakeprojectmanager"
elif [[ ${plugin} == "qtscript" ]]; then
plugin="qtscripteditor"
# Make sure that qt4project manager does NOT depend
# on designer
elif [[ ${plugin} == "designer" ]];then
plugin="designer"
sed -i -e "/designer/d" \
src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri \
|| die "failed to disable qml plugin"
fi
# Now disable the plugins
sed -i "/plugin_${plugin}/s:^:#:" src/plugins/plugins.pro \
|| die "Failed to disable ${plugin} plugin"
# qml needs special treatment
if [[ ${plugin} == "qml" ]]; then
# remove qml support from debugger and qt4project manager
sed -i -e "/^include(qml\/qml.pri)/d" \
src/plugins/debugger/debugger.pro \
-e "/qmljseditor/d" \
src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri
# drop all the qml plugins
for x in qmlprojectmanager qmljsinspector qmljseditor qmldesigner; do
sed -i "/plugin_${x}/s:^:#:" src/plugins/plugins.pro \
|| die "Failed to disable ${x} plugin"
done
fi
fi
done
if use perforce; then
ewarn
ewarn "You have enabled perforce plugin."
ewarn "In order to use it, you need to manually"
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
fi
# add rpath to make qtcreator actual find its *own* plugins
sed -i "/^LIBS/s:+=:& -Wl,-rpath,/usr/$(get_libdir)/${MY_PN} :" qtcreator.pri || die
}
src_configure() {
#the path must NOT be empty
local qtheaders="False"
use qml && qtheaders="/usr/include/qt4/"
eqmake4 \
${MY_PN}.pro \
IDE_LIBRARY_BASENAME="$(get_libdir)" \
QT_PRIVATE_HEADERS=${qtheaders}
}
src_install() {
#install wrapper
dobin bin/${MY_PN} || die "Failed to install launcher"
emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install_subtargets || die
if use doc;then
emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install_qch_docs || die
fi
make_desktop_entry ${MY_PN} QtCreator qtcreator_logo_48 \
'Qt;Development;IDE' || die
# install additional translations
insinto /usr/share/${MY_PN}/translations/
for x in ${LINGUAS}; do
for lang in ${LANGS}; do
if [[ ${x} == ${lang} ]]; then
cd "${S}"/share/${MY_PN}/translations
lrelease ${MY_PN}_${x}.ts -qm ${MY_PN}_${x}.qm || die
doins ${MY_PN}_${x}.qm || die
fi
done
done
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-11-17 9:32 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-11-17 9:31 [gentoo-commits] gentoo-x86 commit in dev-util/qt-creator: ChangeLog qt-creator-2.1.0_beta2-r1.ebuild qt-creator-2.1.0_beta2.ebuild Markos Chandras (hwoarang)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox