From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on sa.int.altlinux.org X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,DNS_FROM_OPENWHOIS autolearn=no version=3.2.5 From: Sergey Borovikov Organization: Top-Sportbets To: ALT Linux Sisyphus discussions Date: Tue, 22 Feb 2011 17:51:40 +0100 User-Agent: KMail/1.13.6 (Linux/2.6.37-std-ng-alt3; KDE/4.6.0; i686; ; ) MIME-Version: 1.0 Content-Type: Multipart/Mixed; boundary="Boundary-00=_lm+YNaM25vBAFQ8" Message-Id: <201102221751.49526.sergey.borovikov@top-sportbets.com> X-AntiVirus: checked by AntiVir MailGate (version: 2.1.3-2; AVE: 7.9.4.170; VDF: 7.11.3.180; host: ox.top-sportbets.com) Subject: [sisyphus] KDevelop4 patch X-BeenThere: sisyphus@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: ALT Linux Sisyphus discussions List-Id: ALT Linux Sisyphus discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Feb 2011 16:59:50 -0000 Archived-At: List-Archive: List-Post: --Boundary-00=_lm+YNaM25vBAFQ8 Content-Type: multipart/signed; boundary="nextPart2001997.hBCpY7zHHc"; protocol="application/pgp-signature"; micalg=pgp-sha1 Content-Transfer-Encoding: 7bit --nextPart2001997.hBCpY7zHHc Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: base64 0J/RgNC40LLQtdGC0YHRgtCy0YPRji4uCtCa0L7QstGL0YDRj9C70YHRjyDRgtGD0YIg0YEg0L7Q sdC90L7QstC70LXQvdC40LXQvCBLRGV2ZWxvcCDQtNC+INCy0LXRgNGB0LjQuCA0LjIgKNC60YHR gtCw0YLQuCDQutGC0L4g0LLRgdGRLdGC0LDQutC4INGB0L7QsdC10YDRkdGCPykg0Lgg0YHQu9GD 0YfQsNC50L3QviDQv9C+0YfQuNC90LjQuyAiRGVidWdpbmcgU2hlbGwiLCDQutC+0YLQvtGA0YvQ uSDRg9C20LUg0L3QtdGB0LrQvtC70YzQutC+INC70LXRgiDQutCw0Log0L/QvtC70L7QvNCw0L3R i9C5LiAoaHR0cDovL3d3dy5rZGV2ZWxvcC5vcmcvbWVkaWF3aWtpL2luZGV4LnBocC9GQVEjSG93 X3RvX2RlYnVnX2V4ZWNfb2JqZWN0c193aXRoX2xpYnRvb2xfLjIydGVtcG9yYXJ5X3dyYXBwZXJf c2NyaXB0cy4yMi4zRikK0KDQtdGI0LXQvdC40LUg0LrQvtC90LXRh9C90L4g0L3QtdC80L3QvtCz 0L4g0LrRgNC40LLQvtC1LCDQvdC+INC/0L7Qt9Cy0L7Qu9GP0LXRgiDQtNC10LHQsNC20LjRgtGM IGxpYnRvb2wt0L/RgNC40LvQvtC20LXQvdC40Y8g0LHQtdC3INC/0YDQvtCx0LvQtdC8LiDQn9C+ INC60YDQsNC50L3QtdC5INC80LXRgNC1INC00YDRg9Cz0LjRhSDQv9GA0LjQvNC10L3QtdC90LjQ uSAiRGVidWdpbmcgU2hlbGwiLCDQutGA0L7QvNC1INC60LDQuiDQvdCw0L/QuNGB0LDRgtGMINGC 0YPQtNCwICJsaWJ0b29sIC0tbW9kZT1leGVjdXRlIiDRjyDQsiDQuNC90LXRgtC1INC90LUg0L3Q sNGI0ZHQuy4KCtCf0L4g0L/QvtCy0L7QtNGDINGA0LXRiNC10L3QuNGPOiDQuNC00LXRjyDQsiDR gtC+0LwsINGH0YLQvtCx0YsgJ2dkYicg0LfQsNC/0YPRgdC60LDQuyDQvtCx0YvRh9C90YvQuSAn c2gnLCDQutC+0YLQvtGA0L7QvNGDINCw0YDQs9GD0LzQtdC90YLQvtC8INC/0LXRgNC10LTQsNGR 0YLRgdGPICctYyAibGlidG9vbCAtLW1vZGU9ZXhlY3V0ZSBhcHBOYW1lIGFwcEFyZ3MiJy4g0JXR gdGC0LXRgdGC0LLQtdC90L3QviDRjdGC0L4g0YLQvtC70YzQutC+INC10YHQu9C4ICJEZWJ1Z2lu ZyBTaGVsbCIg0YPQutCw0LfQsNC9KNC90LUg0L/Rg9GB0YIpLiDQoNCw0LHQvtGC0LDQtdGCINC9 0LAg0YPRgNCwLgrQndCw0LnQtNC10L3QvdGL0LUg0LIg0LrQvtC00LUg0LDRgNGC0LXRhNCw0LrR gtGLINC/0L4g0L/QvtCy0L7QtNGDINGN0YLQvtCz0L4g0YTRg9C90LrRhtC40L7QvdCw0LvQsCDQ vdC1INGA0LDQsdC+0YLQvtGB0L/QvtGB0L7QsdC90Ysg0LIg0L/RgNC40L3RhtC40L/QtS4KLS0g ClNlcmdleSBCb3Jvdmlrb3YKClRvcCBTcG9ydHdldHRlbiBHZXNtYkgKSGlldHppbmdlciBLYWkg MTM3YQpBLTExMzAgV2llbgoKZW1haWw6IHNlcmdleS5ib3Jvdmlrb3ZAdG9wLXNwb3J0YmV0cy5j b20Kd3d3LmFtYmFzc2Fkb3ItYmV0cy5jb20K --nextPart2001997.hBCpY7zHHc Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) iJwEAAECAAYFAk1j6aUACgkQH5H5WNMAqiJGlQP/UaqyrU5nd+cfkjkWbTMiSd+A 4RJLrC6AHWKQpYntqV2lTOtRfjeKpxCvDG8fTO98O5p2dygvXGmVfxgoEwjACqPX DN4AtiG6S7qeiCn8bqCASl3YBWOH3RfsDM2pEN+tk/LB5xGEPJoei/cZaSBrkalf pFc6ARvgzMv/b6ZHEtc= =D7RY -----END PGP SIGNATURE----- --nextPart2001997.hBCpY7zHHc-- --Boundary-00=_lm+YNaM25vBAFQ8 Content-Type: text/x-patch; charset="UTF-8"; name="DebugShellFix.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="DebugShellFix.patch" diff -Naurd kdevelop-4.2.0.orig/debuggers/gdb/debugsession.cpp kdevelop-4.2.0/debuggers/gdb/debugsession.cpp --- kdevelop-4.2.0.orig/debuggers/gdb/debugsession.cpp 2011-01-23 20:36:25.000000000 +0100 +++ kdevelop-4.2.0/debuggers/gdb/debugsession.cpp 2011-02-22 17:11:48.000000000 +0100 @@ -1024,6 +1024,11 @@ queueCmd(new GDBCommand(GDBMI::EnvironmentCd, dir)); + if(!config_dbgShell_.isEmpty()){ + QString realArgs = KShell::joinArgs(arguments); + arguments = QStringList( QString("-c")); + arguments << config_dbgShell_.toLocalFile()+QString(" ")+executable+QString(" ")+realArgs; + } // Set the run arguments if (!arguments.isEmpty()) queueCmd( @@ -1078,6 +1083,12 @@ // Note: script could contain "run" or "continue" } + else if(!config_dbgShell_.isEmpty()){ + QStringList arguments; + queueCmd(new GDBCommand(GDBMI::FileExecAndSymbols, "sh", this, &DebugSession::handleFileExecAndSymbols, true)); + raiseEvent(connected_to_program); + queueCmd(new GDBCommand(GDBMI::ExecRun)); + } else { queueCmd(new GDBCommand(GDBMI::FileExecAndSymbols, executable, this, &DebugSession::handleFileExecAndSymbols, true)); diff -Naurd kdevelop-4.2.0.orig/debuggers/gdb/gdb.cpp kdevelop-4.2.0/debuggers/gdb/gdb.cpp --- kdevelop-4.2.0.orig/debuggers/gdb/gdb.cpp 2011-01-23 20:36:25.000000000 +0100 +++ kdevelop-4.2.0/debuggers/gdb/gdb.cpp 2011-02-22 15:07:02.000000000 +0100 @@ -75,7 +75,8 @@ arguments << "--interpreter=mi2" << "-quiet"; QString shell = config.readEntry(GDBDebugger::debuggerShellEntry); - if( !shell.isEmpty() ) +// if( !shell.isEmpty() ) + if( false ) { kDebug(9012) << "have shell\n"; shell = shell.simplified(); --Boundary-00=_lm+YNaM25vBAFQ8--