Add patch to make qt-creator-1.3.1 compile against Qt-4.7. Thanks to David Flogeras <dflogeras2@gmail.com>. Bug #361813

Package-Manager: portage-2.1.9.44/cvs/Linux x86_64

6 files changed, 153 insertions, 122 deletions

diff --git a/dev-util/qt-creator/ChangeLog b/dev-util/qt-creator/ChangeLog
index ada3d329fe3e..d1fe202bb6f8 100644
--- a/dev-util/qt-creator/ChangeLog
+++ b/dev-util/qt-creator/ChangeLog
@@ -1,6 +1,13 @@
 # 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.72 2011/04/02 14:07:53 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.73 2011/04/04 07:59:40 hwoarang Exp $
+
+*qt-creator-1.3.1-r2 (04 Apr 2011)
+
+  04 Apr 2011; Markos Chandras <hwoarang@gentoo.org> -qt-creator-1.2.1.ebuild,
+  +qt-creator-1.3.1-r2.ebuild, +files/qt-creator-1.3.1-qt47.patch:
+  Add patch to make qt-creator-1.3.1 compile against Qt-4.7. Thanks to David
+  Flogeras <dflogeras2@gmail.com>. Bug #361813
 
   02 Apr 2011; Markos Chandras <hwoarang@gentoo.org>
   qt-creator-2.2.0_beta.ebuild, metadata.xml:
diff --git a/dev-util/qt-creator/Manifest b/dev-util/qt-creator/Manifest
index a8740e489e41..030db362e89b 100644
--- a/dev-util/qt-creator/Manifest
+++ b/dev-util/qt-creator/Manifest
@@ -2,31 +2,31 @@
 Hash: SHA512
 
 AUX docs_gen.patch 603 RMD160 9711ddb1c59e8ddd1ad17ba34f89c8e4c89b4504 SHA1 83cd745baabd1545a1079c59edef6279b254074a SHA256 7428155e6f09201d60f308c3934153aa5fa5b25296a96d86dad80354dc8e3b93
+AUX qt-creator-1.3.1-qt47.patch 415 RMD160 c1006214dd399baf8c996e4d51801c8a8c544ccb SHA1 3434e72a399808c77e34722ad5c69e2cbc9f6a62 SHA256 9dc1ec786ed9d329d81228f031e94b867165947b8af9ed16082e1c69a830343f
 AUX qt-creator-2.1.0_rc1-qml-plugin.patch 724 RMD160 f9eff709b1585ad0264b5855b477f2a703c3e232 SHA1 2f84e0f3d32e4efb4328fdef484bc0a7af552ed3 SHA256 78c9f628b6f167cc80317d328a327c106e2dbcc2b3141c7beace9ffc4b30d0af
-DIST qt-creator-1.2.1-src.zip 8631249 RMD160 6aea12a39bd5827422afa6e02cfcad2174dc6582 SHA1 41d10717a83d3b7de7bc5218a35a38f25408a8d6 SHA256 9b955421050c1a9dacefa1ed888a971bffa86258a18598a1a1b297e5d8d23cbf
 DIST qt-creator-1.3.1-src.tar.gz 10623442 RMD160 37bebc4566cfef85d5a7901c1efd8b917b3a0584 SHA1 49b61c3e8010d94d6d595fef38d3da737b26cd80 SHA256 b738a327b64276c5d8c0a01cbb840e316a657635514bc8e41c6cfa1c77e691ed
 DIST qt-creator-2.1.0-src.zip 28181645 RMD160 16fdf6f03ab8ea6a567f4cd1cb58580772a9627b SHA1 f1d7abf92df7a9ba53eb9006ca189ac7203c0e9f SHA256 a68d80f158b5e0a0faffd1a9fe7ef8afda545a970557572f5a192ecd9db0b85a
 DIST qt-creator-2.2.0-beta-src.zip 29691688 RMD160 cc1586e095dcf54902a595f3544bb037e7ee881c SHA1 cbd793c7cc990ded45241e4a7415446ba55e146e SHA256 eb3c2d3937cd43184502a44ac740cc760c2f8f41416832a88a7cfd5cf5bb863f
-EBUILD qt-creator-1.2.1.ebuild 2877 RMD160 e4aca527c425aa75859147efc28e68c3af6fdfe7 SHA1 d46d077c817b9e9b537f1263d0db872f5bf03fee SHA256 1522017d43e70515ffacb0c949e87a266d175375359c1b7dc490ce9b2f7513e0
 EBUILD qt-creator-1.3.1-r1.ebuild 3510 RMD160 4305d19303541ff19107339c9c65caaa866982b6 SHA1 c77014296ffdf25f3c8d69043cbdc156dd905933 SHA256 a1544734b070b5978f50cfaf33b9c7fc4fc85f318c18f78aad46eb3aaf256dd0
+EBUILD qt-creator-1.3.1-r2.ebuild 3594 RMD160 63b25710515682763b05f81e9136898b72fad4e4 SHA1 7e73959bbc13460107206ca1dde15f18a528ee64 SHA256 e2f87774acd1b206cb8cf50138a61e8f4a993604bbffe3bae781b53e533fd5cb
 EBUILD qt-creator-2.1.0.ebuild 4306 RMD160 a8f6d5eec5cc0376e1e297f3a76a823ac34f8652 SHA1 06e6d2f3bdf8c511ff34fdb430e75ba5bc1bc9c4 SHA256 601bb79945cb7dd281281fd5d22d375d555aaf04cf1013490d8441bb59326337
 EBUILD qt-creator-2.2.0_beta.ebuild 3726 RMD160 30905e6a2e3765f33a01d371b07cc659d5ae9be9 SHA1 e1068057f6d996fd2c397e38883957e9684b4ef3 SHA256 df28d056a0e796353fcf2183b032e8338afe41e09cc514005e60c755a6b14eb8
-MISC ChangeLog 11146 RMD160 a2a3d1b1bf7a7f1041a2a25695bd1b9d32f5d0ff SHA1 7b7dcdbed6ebae836e6543a501b7b77352401dce SHA256 014cf2d08cea76f814594bca2e95dbd1ad6c9776a55223308b1e6ad639162620
-MISC metadata.xml 1108 RMD160 a9e9f00da1b9504a0fdf3605b6a05ddf1befa66d SHA1 d4541a5cc3c29ee2b8dd35b5b94d387b34765c35 SHA256 8fb6608ad281a48a7e1e606c891effbf484bdc5f97330aea46d271ae083103f2
+MISC ChangeLog 11453 RMD160 858b8243dd38f8f22a6c2d4a3917eb48da65ab9b SHA1 e2fbdd4425196561aa2fbc8f776f58ab91628cae SHA256 a677c289db3089f27ed06cb3462e7012be86c3e27af018144fb023de5ec783be
+MISC metadata.xml 1055 RMD160 2558de2f781c71d62f3bab0b834061b387c53268 SHA1 910e7b7e9dd15d58466ed8b03df9a3517ebd29fe SHA256 3f5113d61793395503ae99bc78f22da14f012471bda3f99ac9c3d56c33a6800b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNly4MAAoJEPqDWhW0r/LCIFsQAKTCjpU36ORsTAfNuHUkPXae
-2e40j4WiZlzTKJ0fxF65R8Lcl+edbIkBXV6LBePD/cVdKPaulzWlWRA1SGEWM1QQ
-fJEZRzaEIU65axMzs1QUZtpjfNG7EgOLpJqVcg1HSPVI+SBaeG/3EyJngjHQ65v3
-AvlYu+GY4yrf/DmId66rFBgVYHo18x8sh0dKWLSbehzyD8bqGu9CRCZAuCTfFSYt
-EH3P8YEgV1LHCFhMAlBf5qUCnIEgAC2DQTTwl2eGGlrxEfY8Wm+Sw9hnqgmd19Jd
-8E85hT4OcrtZB7TT1CL03/SZXDrYedNkzxTcHjgxnZ5pNJSpFxhZDnPWMWlg34p3
-TB4Z1PQ9ZgVKe4tBMpS8vOJ3ii6pCFyPQydTwf4PsjQV2iej4mw0L1mPSn3/jZ6n
-Sqpf3yUev/mK7jYvmv+RnbyENObpmecdPG0qLi4tVOwFTgJwhP74RkgRq7D5sDEs
-kax61Fg5PvJBXDsAnmyll+tlYDoedwzXOzwWW8M82GL9iekOynGZbpIks4OBEfn/
-wbR1MthulYJXAzfZig165Wq4qFzcCwumbD77gO0SaC89xTYaLc5erdKpvv0rmawK
-YWk3eqR7+XofO/LetxiKPDCUQAlORO6u1vpYe6vKZMusZknbeaoJUENlTUz3i2Vt
-b8QTbi8PbuiNoelD9Kzh
-=eGyy
+iQIcBAEBCgAGBQJNmXrMAAoJEPqDWhW0r/LCRNYQALVbfIK2MxFPZ6vQIlo+2Dy3
+ZqKT38QsToXWo5R2q6UoixA6pDaJnKI8HTpa2UPBmLAXhiLJ/PRDxDili3+JG3c8
+Y9HkWp3D7tSaqedaMvHWYqz2+DIsyygjSXXNBFOuwEoyaAgekneKUUVnWj/G95Kh
+GE5UYriAXWSc2cyQwJqt84HPMvfGKpj5Gu2C+c1xRuHgFIf2G1TsDjN4GOrx8S9d
+fy6dsrbRQnBlgU5Z9gnvqSZfQhS/4LjImBrBPg0qBMwxbx1psClMZPaF7qVUgmIn
+inT/h6m8ICmXPc7kUWjNj7jBm4H67x18MeEq0L0WIS6yPCQLjwEkXIjFAaIq5x0b
+IdktRf4dT2U8UPTOlU7RHLR0dGu8QTMLVeLuLgrFvd2aCqn7Q2e6KLVkpwZZND3e
+KTXg5rfk+PMUsAwU5yr2aVnMGkphcG/zsUgQmw+notvqruUtvmol57BL4orKO/Ib
+xkC73wjensV9kVspKD8VgMOBjNQk4+LMsqAmn5tZL2dmCB4jP2ke90JCKQmJA6/c
+ucLmR2XOwQhgV1cvALOvtFkawN8lduTSVnQ+BIdMn50smzT7IKKJdtDPaduXzTjv
+x5Z3pSy7LSXiu1jJH38rMmGQWAmpT+2fiM9YfkYcnSNHQDDXAd48DWwn2REYdPlU
+oiMOImB8UaOe0L9Bf+YS
+=e4Ns
 -----END PGP SIGNATURE-----
diff --git a/dev-util/qt-creator/files/qt-creator-1.3.1-qt47.patch b/dev-util/qt-creator/files/qt-creator-1.3.1-qt47.patch
new file mode 100644
index 000000000000..1b50fb96d54c
--- /dev/null
+++ b/dev-util/qt-creator/files/qt-creator-1.3.1-qt47.patch
@@ -0,0 +1,12 @@
+--- qt-creator-1.3.1-src/src/libs/cplusplus/TypePrettyPrinter.cpp.orig	2011-04-03 14:31:36.000000000 -0300
++++ qt-creator-1.3.1-src/src/libs/cplusplus/TypePrettyPrinter.cpp	2011-04-03 14:22:39.000000000 -0300
+@@ -69,8 +69,7 @@
+ }
+ 
+ TypePrettyPrinter::TypePrettyPrinter(const Overview *overview)
+-    : _overview(overview),
+-      _name(0)
++    : _overview(overview)
+ { }
+ 
+ TypePrettyPrinter::~TypePrettyPrinter()
diff --git a/dev-util/qt-creator/metadata.xml b/dev-util/qt-creator/metadata.xml
index 2e3ceb9c8c73..f3654acca173 100644
--- a/dev-util/qt-creator/metadata.xml
+++ b/dev-util/qt-creator/metadata.xml
@@ -11,7 +11,6 @@
 	<flag name="bineditor">enable bineditor plugin</flag>
 	<flag name="bookmarks">enable bookmarks plugin</flag>
 	<flag name="cmake">enable cmake project manager plugin</flag>
-	<flag name="debugger">enable debugger plugin</flag>
 	<flag name="designer">enable designer plugin</flag>
 	<flag name="fakevim">enable vim-like key bindings plugin</flag>
 	<flag name="git">enable git plugin</flag>
diff --git a/dev-util/qt-creator/qt-creator-1.2.1.ebuild b/dev-util/qt-creator/qt-creator-1.2.1.ebuild
deleted file mode 100644
index 8ed5f7ab58b8..000000000000
--- a/dev-util/qt-creator/qt-creator-1.2.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# 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-1.2.1.ebuild,v 1.10 2011/03/26 16:17:39 dilfridge Exp $
-
-EAPI="2"
-
-inherit qt4 multilib
-
-MY_PN="${PN/-/}"
-MY_P="${P}-src"
-
-DESCRIPTION="Lightweight IDE for C++ development centering around Qt"
-HOMEPAGE="http://qt.nokia.com/products/developer-tools"
-SRC_URI="http://download.qtsoftware.com/${MY_PN}/${MY_P}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="bineditor bookmarks +cmake debug +debugger +designer doc examples fakevim git kde perforce qtscript subversion"
-
-DEPEND="app-arch/unzip
-	>=x11-libs/qt-assistant-4.5.0_rc1
-	>=x11-libs/qt-gui-4.5.0_rc1[qt3support]"
-
-RDEPEND="${DEPEND}
-	>=x11-libs/qt-sql-4.5.0_rc1
-	>=x11-libs/qt-svg-4.5.0_rc1
-	>=x11-libs/qt-test-4.5.0_rc1
-	>=x11-libs/qt-webkit-4.5.0_rc1
-	!kde? ( || ( >=x11-libs/qt-phonon-4.5.0_rc1 media-libs/phonon ) )
-	kde? ( media-libs/phonon )
-	cmake? ( dev-util/cmake )
-	debugger? ( sys-devel/gdb )
-	examples? ( >=x11-libs/qt-demo-4.5.0_rc1 )
-	git? ( dev-vcs/git )
-	qtscript? ( >=x11-libs/qt-script-4.5.0_rc1 )
-	subversion? ( dev-vcs/subversion )"
-
-PLUGINS="bookmarks bineditor cmake debugger designer fakevim git perforce qtscript subversion"
-
-PATCHES=(
-	"${FILESDIR}/docs_gen.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-LANGS="de es it ja ru"
-
-for x in ${LANGS}; do
-	IUSE="${IUSE} linguas_${x}"
-done
-
-src_prepare() {
-	qt4_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"
-			fi
-			sed -i "/plugin_${plugin}/s:^:#:" src/plugins/plugins.pro \
-				|| die "Failed to disabled ${plugin} plugin"
-		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
-		ebeep 5
-	fi
-}
-
-src_configure() {
-	eqmake4 ${MY_PN}.pro IDE_LIBRARY_BASENAME="$(get_libdir)"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}/usr" install_subtargets || die "emake install failed"
-	# because qtcreator.bin executable make nosense
-	mv "${D}"/usr/bin/${MY_PN}.bin "${D}"/usr/bin/${MY_PN} || die "failed to rename executable"
-	if use doc;then
-		emake INSTALL_ROOT="${D}/usr" install_qch_docs || die "emake install qch_docs failed"
-	fi
-	make_desktop_entry ${MY_PN} QtCreator qtcreator_logo_48 \
-		'Qt;Development;IDE' || die "make_desktop_entry failed"
-
-	# install translations
-	insinto /usr/share/${MY_PN}/translations/
-	for x in ${LINGUAS};do
-		for lang in ${LANGS};do
-			if [[ ${x} == ${lang} ]];then
-				doins share/${MY_PN}/translations/${MY_PN}_${x}.qm
-			fi
-		done
-	done
-}
diff --git a/dev-util/qt-creator/qt-creator-1.3.1-r2.ebuild b/dev-util/qt-creator/qt-creator-1.3.1-r2.ebuild
new file mode 100644
index 000000000000..516435053d7c
--- /dev/null
+++ b/dev-util/qt-creator/qt-creator-1.3.1-r2.ebuild
@@ -0,0 +1,116 @@
+# 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-1.3.1-r2.ebuild,v 1.1 2011/04/04 07:59:40 hwoarang Exp $
+
+EAPI="2"
+LANGS="de es fr it ja pl ru sl"
+
+inherit qt4-r2 multilib
+MY_PN="${PN/-/}"
+
+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}/${P}-src.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="bineditor bookmarks +cmake cvs debug +designer doc examples fakevim git
+kde mercurial perforce qml qtscript rss subversion"
+
+DEPEND=">=x11-libs/qt-assistant-4.6.0:4
+	>=x11-libs/qt-gui-4.6.0:4[qt3support]"
+
+RDEPEND="${DEPEND}
+	>=x11-libs/qt-sql-4.6.1:4
+	>=x11-libs/qt-svg-4.6.1:4
+	>=x11-libs/qt-test-4.6.1:4
+	>=x11-libs/qt-webkit-4.6.1:4
+	!kde? ( || ( >=x11-libs/qt-phonon-4.6.1:4 media-libs/phonon ) )
+	kde? ( media-libs/phonon )
+	cmake? ( dev-util/cmake )
+	cvs? ( dev-vcs/cvs )
+	sys-devel/gdb
+	examples? ( >=x11-libs/qt-demo-4.6.1:4 )
+	git? ( dev-vcs/git )
+	mercurial? ( dev-vcs/mercurial )
+	qtscript? ( >=x11-libs/qt-script-4.6.1:4 )
+	subversion? ( dev-vcs/subversion )"
+
+PLUGINS="bookmarks bineditor cmake cvs designer fakevim git mercurial perforce qml qtscript subversion"
+
+S="${WORKDIR}"/"${P}"-src
+
+PATCHES=(
+	# build against Qt-4.7. Bug #361813
+	"${FILESDIR}"/${P}-qt47.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"
+			fi
+			if [[ ${plugin} == "qml" ]]; then
+				plugin="qmleditor"
+				einfo "Disabling qmlprojectmanager support"
+				sed -i "/plugin_qmlprojectmanager/s:^:#:" src/plugins/plugins.pro \
+					|| die "Failed to disable qmlprojectmanager plugin"
+			fi
+			if [[ ${plugin} == "designer" ]]; then
+				sed -i "/plugin_qt4projectmanager/s:^:#:" \
+					src/plugins/plugins.pro \
+					|| die "Failed to disable qt4projectmanager plugin"
+			fi
+			sed -i "/plugin_${plugin}/s:^:#:" src/plugins/plugins.pro \
+				|| die "Failed to disable ${plugin} plugin"
+		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
+		ebeep 5
+	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
+}
+
+src_configure() {
+	eqmake4 ${MY_PN}.pro IDE_LIBRARY_BASENAME="$(get_libdir)"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install_subtargets || die "emake install failed"
+	# fix binary name bug 275859
+	mv "${D%/}${EPREFIX}"/usr/bin/${MY_PN}.bin \
+		"${D%/}${EPREFIX}"/usr/bin/${MY_PN} || die "failed to rename executable"
+	if use doc;then
+		emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install_qch_docs || die "emake install qch_docs failed"
+	fi
+	make_desktop_entry ${MY_PN} QtCreator qtcreator_logo_48 \
+		'Qt;Development;IDE' || die "make_desktop_entry failed"
+
+	# install translations
+	for lang in ${LANGS};do
+		if ! hasq ${lang} ${LINGUAS}; then
+			rm "${D}"/usr/share/${MY_PN}/translations/${MY_PN}_${lang}.qm \
+					|| die "failed to remove ${lang} translation"
+		fi
+	done
+}