Revision bump adds upstream patch to fix crash when building project if qt is built with USE=debug spotted by Matěj Laitl <matej@laitl.cz> wrt bug #414721.

Package-Manager: portage-2.2.0_alpha101/cvs/Linux i686

4 files changed, 99 insertions, 7 deletions

diff --git a/dev-util/kdevelop/ChangeLog b/dev-util/kdevelop/ChangeLog
index 83e4a3ed45ea..91de4fe9111d 100644
--- a/dev-util/kdevelop/ChangeLog
+++ b/dev-util/kdevelop/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/kdevelop
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.230 2012/04/22 12:08:22 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.231 2012/05/07 11:41:27 johu Exp $
+
+*kdevelop-4.3.1-r1 (07 May 2012)
+
+  07 May 2012; Johannes Huber <johu@gentoo.org>
+  +files/kdevelop-4.3.1-fix-assert.patch, +kdevelop-4.3.1-r1.ebuild:
+  Revision bump adds upstream patch to fix crash when building project if qt is
+  built with USE=debug spotted by Matěj Laitl <matej@laitl.cz> wrt bug #414721.
 
   22 Apr 2012; Markus Meier <maekke@gentoo.org> kdevelop-4.2.3.ebuild:
   x86 stable, bug #368739
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 86a1a1535115..a819c5ffe3e8 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
+AUX kdevelop-4.3.1-fix-assert.patch 1181 RMD160 524b2af1ac2c9cf37e52467d15793da525d3167c SHA1 991d9333d849fce8abe5badd1b37e1adea34231e SHA256 373b9540746b7b2de6efca62068608620437ead99e27a58c9748707d29a6c342
 DIST kdevelop-4.2.2.tar.bz2 4984161 RMD160 cb6d09e05d182d32f90fe92768a8839e2ca69838 SHA1 943f86edd0f353bfa4c614972af222a1c7075755 SHA256 e713567fc1b4faa3f7a1077d9b48005c41f623bdab78c831e3f7efc5a90268e7
 DIST kdevelop-4.2.3.tar.bz2 4991238 RMD160 9e403f9457ff33adf0afdf107eb0255a560c9014 SHA1 e87ae29b343df3fea9bda7d8d85ec696e57b68e4 SHA256 cab3863f7dc009949c4b9a2e881141064e83d2faced3d475db571052b468c32b
 DIST kdevelop-4.3.0.tar.bz2 6038270 RMD160 8c935d19e4626a770d7377b7a2d610bee56858b4 SHA1 06a91f9ae0fc15bcec12a92bd9c30a7517b3b8e0 SHA256 d96e1556522879662749e5397b1e7ec2d11085c5a26ba436512d64215271626d
@@ -8,13 +9,18 @@ DIST kdevelop-4.3.1.tar.bz2 6189139 RMD160 918622218a88a6efe749d3cbf75cbcf01d836
 EBUILD kdevelop-4.2.2.ebuild 1692 RMD160 cfe6cefda7cd0f4533115e426634c539e164ef52 SHA1 bfed9f547fb7fc6c89bb1f548f896e2c5067d6f6 SHA256 eed2c516e46140529c1449f3a43005d1d07e77045daef951e6d7c81ec05828ce
 EBUILD kdevelop-4.2.3.ebuild 1368 RMD160 c1b88f93c510a8f7cceb13872c07a57c50888068 SHA1 9641472eb1dd9659644a11f7c0ae05b13bc84d35 SHA256 b73e5084831372e8b9476a8850b21bd2346cd34ac8402930efe712d2764ad7a2
 EBUILD kdevelop-4.3.0.ebuild 1289 RMD160 71ee89364b88c93f62c76e0078b5765ba208790f SHA1 ccf0d5d33b47dbcaa0ced5402cd8598d0b5bde29 SHA256 8129ad8a8e4c48194a4bcc79335ab9ab88c092c854aca4a74afe480aed51167c
+EBUILD kdevelop-4.3.1-r1.ebuild 1341 RMD160 6c235e90480996138b27a24d03feb4b726572ba2 SHA1 527856674a2008aca435765567ff42d7274a72fb SHA256 881b92d0abc55be146f765e571b99b881dbf5d1db36651a6ae84835138beb01f
 EBUILD kdevelop-4.3.1.ebuild 1289 RMD160 36172b94b238c39edea1277dbf51c8ca0e529484 SHA1 729bde882180718126aecfe40bdd750e4c867d6a SHA256 c93e600d9091b6f5e2ea0c1b75ca9c2829f08f5d5c10088819cb6c38b6da3108
-MISC ChangeLog 34161 RMD160 82b81d621f06aef9a23d3d97ff2e3c75573aa1d2 SHA1 7a23ac89174d6afe190144d83849f426621cd11d SHA256 7261fe662012054812c6d21ac5ed67c351a083c29dc26d7a962e620309679cd0
+MISC ChangeLog 34472 RMD160 05b6622ad00b79bb7781f612081a36bc99842088 SHA1 aac39fd9ed754290c2819d9c01ff40fb029c5b5a SHA256 215a38d29ed2c5fde5a2e9d37d500df6389e451c0dfc6794f6a1344bf2b52034
 MISC metadata.xml 429 RMD160 19300c79fd5f01e46ccdb57c48e9092f84a99df4 SHA1 c0fa5ba9271542c990a65094391985285fdc17af SHA256 57c402369aa48da3ae4102f7d649da1e3c0bc1ddb38672ae51759cd8490b29f5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk+T9WwACgkQkKaRLQcq0GIkpQCfUH0IXrisfYDnvgJf3mfd0HU1
-3tIAnj+YtkHlW5OS0luSPEnoX+gH0pds
-=OfA8
+iQEcBAEBCgAGBQJPp7U7AAoJEO+t9ga+3I3aXsUIAILBireFVxwhQ2XfH/kX8wJ/
+hbYCYnucYpHq6hTbziUjDA7oBVsFo6+tPLCVi0voAE1RYICpXEgtggICOHTAASJ0
+LuCpkqaAncAKQno0M1kCurfak1l74GeBzzSyIXy1AZxbXfKZtlAjzlg+4ibnbPn+
+odAhRk1qaly22z6VNCoecDpFEVbF52DuqAE8uSbsSYHiJ1AvSzzKM04+rHlNuXRw
+fdqgNDgfI8czl9rEEjDU8ePBqmkGWJjZ7Zig7iYcw1Bf6Bep4Zz/Txwny7EZxNKw
+sIHFLshq0e7LWjOc/ybd+pbEqJmYhm+lE4VJwZqXcpYh0cVzBenANt7YElmxFdo=
+=HOTb
 -----END PGP SIGNATURE-----
diff --git a/dev-util/kdevelop/files/kdevelop-4.3.1-fix-assert.patch b/dev-util/kdevelop/files/kdevelop-4.3.1-fix-assert.patch
new file mode 100644
index 000000000000..52ba5fadff4b
--- /dev/null
+++ b/dev-util/kdevelop/files/kdevelop-4.3.1-fix-assert.patch
@@ -0,0 +1,28 @@
+From: Michael Jansen <kde@michael-jansen.biz>
+Date: Sun, 08 Apr 2012 15:46:01 +0000
+Subject: addLineBatch(): Fix a crash if linesInBatch == 0
+X-Git-Url: http://quickgit.kde.org/?p=kdevelop.git&amp;a=commitdiff&amp;h=8a0b638c58dcfe261ce789963be2413300a65fc6
+---
+addLineBatch(): Fix a crash if linesInBatch == 0
+
+[...]
+#6  0x00007fa986970708 in QAbstractItemModel::beginInsertRows (this=0x3699fb0, parent=..., first=11, last=10) at /home/mjansen/ws/src/qt/qt/src/corelib/kernel/qabstractitemmodel.cpp:2413
+#7  0x00007fa959b46571 in MakeOutputModel::addLineBatch (this=0x3699fb0) at /home/mjansen/ws/src/kdevelop/kdevelop/projectbuilders/makebuilder/makeoutputmodel.cpp:217
+[...]
+---
+
+
+--- a/projectbuilders/makebuilder/makeoutputmodel.cpp
++++ b/projectbuilders/makebuilder/makeoutputmodel.cpp
+@@ -214,6 +214,10 @@ void MakeOutputModel::addLineBatch()
+     const int maxLines = 50;
+     const int linesInBatch = qMin(lineBuffer.count(), maxLines);
+ 
++    // If there is nothing to insert we are done.
++    if ( linesInBatch == 0 )
++            return;
++
+     beginInsertRows( QModelIndex(), rowCount(), rowCount() + linesInBatch -  1);
+ 
+     for(int i = 0; i < linesInBatch; ++i) {
+
diff --git a/dev-util/kdevelop/kdevelop-4.3.1-r1.ebuild b/dev-util/kdevelop/kdevelop-4.3.1-r1.ebuild
new file mode 100644
index 000000000000..7a6a90ace23c
--- /dev/null
+++ b/dev-util/kdevelop/kdevelop-4.3.1-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-4.3.1-r1.ebuild,v 1.1 2012/05/07 11:41:27 johu Exp $
+
+EAPI=4
+
+KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl it nb nds nl pl pt
+pt_BR ru sl sv th uk zh_CN zh_TW"
+VIRTUALX_REQUIRED=test
+KDE_SCM="git"
+
+inherit kde4-base
+
+DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages."
+LICENSE="GPL-2 LGPL-2"
+IUSE="+cmake +cxx debug okteta qthelp"
+
+if [[ $PV == *9999* ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+
+DEPEND="
+	$(add_kdebase_dep ksysguard)
+	$(add_kdebase_dep libkworkspace)
+	okteta? ( $(add_kdebase_dep okteta) )
+	qthelp? ( >=x11-libs/qt-assistant-4.4:4 )
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep kapptemplate)
+	cxx? ( >=sys-devel/gdb-7.0[python] )
+"
+RESTRICT="test"
+# see bug 366471
+
+PATCHES=( "${FILESDIR}/${P}-fix-assert.patch" )
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_build cmake)
+		$(cmake-utils_use_build cmake cmakebuilder)
+		$(cmake-utils_use_build cxx cpp)
+		$(cmake-utils_use_with okteta LibKasten)
+		$(cmake-utils_use_with okteta LibOkteta)
+		$(cmake-utils_use_with okteta LibOktetaKasten)
+		$(cmake-utils_use_build qthelp)
+	)
+
+	kde4-base_src_configure
+}