diff options
| -rw-r--r-- | dev-util/kdevelop/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-util/kdevelop/files/kdevelop-4.7.1-gdb.patch | 30 | ||||
| -rw-r--r-- | dev-util/kdevelop/kdevelop-4.7.1-r1.ebuild | 54 |
3 files changed, 91 insertions, 1 deletions
diff --git a/dev-util/kdevelop/ChangeLog b/dev-util/kdevelop/ChangeLog index b30479bdaa4d..56cdaae197d8 100644 --- a/dev-util/kdevelop/ChangeLog +++ b/dev-util/kdevelop/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-util/kdevelop # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.263 2015/06/04 19:02:21 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.264 2015/08/03 13:09:33 kensington Exp $ + +*kdevelop-4.7.1-r1 (03 Aug 2015) + + 03 Aug 2015; Michael Palimaka <kensington@gentoo.org> + +files/kdevelop-4.7.1-gdb.patch, +kdevelop-4.7.1-r1.ebuild: + Backport patch from upstream to solve remote debugging error wrt bug #544410. 04 Jun 2015; Michael Palimaka <kensington@gentoo.org> kdevelop-4.5.2.ebuild, kdevelop-4.6.0.ebuild, kdevelop-4.7.1.ebuild: diff --git a/dev-util/kdevelop/files/kdevelop-4.7.1-gdb.patch b/dev-util/kdevelop/files/kdevelop-4.7.1-gdb.patch new file mode 100644 index 000000000000..4643310bfffc --- /dev/null +++ b/dev-util/kdevelop/files/kdevelop-4.7.1-gdb.patch @@ -0,0 +1,30 @@ +From 633b49c4bd7e434185c69a3dea1841755b75dcba Mon Sep 17 00:00:00 2001 +From: Fernando Rodriguez <frodriguez.developer@outlook.com> +Date: Sun, 2 Aug 2015 16:20:37 +0200 +Subject: [PATCH] Set the replyReceived flag only if the current command is + exec-run. + +Fixes various MI errors in remote debugging scenarios. + +BUG: 346827 +--- + debuggers/gdb/gdb.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/debuggers/gdb/gdb.cpp b/debuggers/gdb/gdb.cpp +index 4642087..df9f3b0 100644 +--- a/debuggers/gdb/gdb.cpp ++++ b/debuggers/gdb/gdb.cpp +@@ -255,7 +255,8 @@ void GDB::processLine(const QByteArray& line) + emit internalCommandOutput(QString::fromUtf8(line) + '\n'); + + if (result.reason == "thread-group-started") { +- receivedReply_ = true; ++ if (currentCmd_->cmdToSend().contains("exec-run")) ++ receivedReply_ = true; + // (gdb) -exec-run + // =thread-group-started,id="i1",pid="16768" + if (line.contains("pid=\"")) { +-- +2.4.6 + diff --git a/dev-util/kdevelop/kdevelop-4.7.1-r1.ebuild b/dev-util/kdevelop/kdevelop-4.7.1-r1.ebuild new file mode 100644 index 000000000000..c720f567c8e2 --- /dev/null +++ b/dev-util/kdevelop/kdevelop-4.7.1-r1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-4.7.1-r1.ebuild,v 1.1 2015/08/03 13:09:33 kensington Exp $ + +EAPI=5 + +KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl hu it kk nb nds nl +pl pt pt_BR ru sk sl sv th tr uk zh_CN zh_TW" +VIRTUALX_REQUIRED="test" +EGIT_BRANCH="4.7" +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 +gdbui okteta qthelp" + +if [[ ${KDE_BUILD_TYPE} = release ]]; then + KEYWORDS="~amd64 ~ppc ~x86" +fi + +DEPEND=" + dev-libs/qjson + dev-qt/qtdeclarative:4[webkit] + gdbui? ( + $(add_kdebase_dep ksysguard) + $(add_kdebase_dep libkworkspace) + ) + okteta? ( $(add_kdeapps_dep okteta) ) + qthelp? ( dev-qt/qthelp:4 ) +" +RDEPEND="${DEPEND} + $(add_kdeapps_dep kapptemplate) + $(add_kdeapps_dep kdebase-kioslaves) + cxx? ( >=sys-devel/gdb-7.0[python] ) +" +RESTRICT="test" +# see bug 366471 + +PATCHES=( "${FILESDIR}/${P}-gdb.patch" ) + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_build cmake) + $(cmake-utils_use_build cmake cmakebuilder) + $(cmake-utils_use_build cxx cpp) + $(cmake-utils_use_with gdbui KDE4Workspace) + $(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 +} |