Apply patch to fix missing qml components. Bug #347987. Thanks to Bas Nedermeijer <bas@lijer.nl>

(Portage version: 2.2.0_alpha19/cvs/Linux x86_64)

3 files changed, 161 insertions, 2 deletions

diff --git a/dev-util/qt-creator/ChangeLog b/dev-util/qt-creator/ChangeLog
index 0ad985687c73..414d1424b527 100644
--- a/dev-util/qt-creator/ChangeLog
+++ b/dev-util/qt-creator/ChangeLog
@@ -1,6 +1,14 @@
 # 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.66 2010/11/25 19:32:59 hwoarang Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.67 2011/02/11 09:50:08 hwoarang Exp $
+
+*qt-creator-2.1.0_rc1-r1 (11 Feb 2011)
+
+  11 Feb 2011; Markos Chandras <hwoarang@gentoo.org>
+  +qt-creator-2.1.0_rc1-r1.ebuild,
+  +files/qt-creator-2.1.0_rc1-qml-plugin.patch:
+  Apply patch to fix missing qml components. Bug #347987. Thanks to Bas
+  Nedermeijer <bas@lijer.nl>
 
 *qt-creator-2.1.0_rc1 (25 Nov 2010)
 
diff --git a/dev-util/qt-creator/files/qt-creator-2.1.0_rc1-qml-plugin.patch b/dev-util/qt-creator/files/qt-creator-2.1.0_rc1-qml-plugin.patch
new file mode 100644
index 000000000000..03977c913d51
--- /dev/null
+++ b/dev-util/qt-creator/files/qt-creator-2.1.0_rc1-qml-plugin.patch
@@ -0,0 +1,12 @@
+diff -up qt-creator-2.1.0-rc1-src/src/plugins/qmldesigner/qtquickplugin/plugindestdir.pri.qtquickplugin-lib-fix qt-creator-2.1.0-rc1-src/src/plugins/qmldesigner/qtquickplugin/plugindestdir.pri
+--- qt-creator-2.1.0-rc1-src/src/plugins/qmldesigner/qtquickplugin/plugindestdir.pri.qtquickplugin-lib-fix	2010-11-24 17:28:38.000000000 +0200
++++ qt-creator-2.1.0-rc1-src/src/plugins/qmldesigner/qtquickplugin/plugindestdir.pri	2010-11-30 14:13:19.065191548 +0200
+@@ -1,5 +1,7 @@
+ macx {
+   DESTDIR = $$IDE_LIBRARY_PATH/QmlDesigner
+ } else {
+-  DESTDIR = $$IDE_BUILD_TREE/lib/qmldesigner
++  DESTDIR = $$IDE_BUILD_TREE/$$IDE_LIBRARY_BASENAME/qmldesigner
++  target.path = /$$IDE_LIBRARY_BASENAME/qmldesigner
++  INSTALLS += target
+ }
diff --git a/dev-util/qt-creator/qt-creator-2.1.0_rc1-r1.ebuild b/dev-util/qt-creator/qt-creator-2.1.0_rc1-r1.ebuild
new file mode 100644
index 000000000000..731ac66c6c8e
--- /dev/null
+++ b/dev-util/qt-creator/qt-creator-2.1.0_rc1-r1.ebuild
@@ -0,0 +1,139 @@
+# 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.1.0_rc1-r1.ebuild,v 1.1 2011/02/11 09:50:08 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
+
+PATCHES=(
+	"${FILESDIR}"/${P}-qml-plugin.patch
+)
+
+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
+}