diff --git a/eclipse-dltk-ruby-debug-launch.patch b/eclipse-dltk-ruby-debug-launch.patch new file mode 100644 index 0000000..ab13102 --- /dev/null +++ b/eclipse-dltk-ruby-debug-launch.patch @@ -0,0 +1,45 @@ +From 3270d424546a06f984cc5bec6123c20dc8beeac9 Mon Sep 17 00:00:00 2001 +From: Alexander Kurtakov +Date: Thu, 6 Apr 2017 11:43:54 +0300 +Subject: Mark RubyBasicDebuggerRunner launch as debug one. + +Fix for Bug 419273 changed the default so only explicitly marked +launches are considered debug. + +Change-Id: I8d0022587d61f5bb0b96214b2695085d2cb16ebc +Signed-off-by: Alexander Kurtakov +--- + .../org/eclipse/dltk/ruby/basicdebugger/RubyBasicDebuggerRunner.java | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/plugins/org.eclipse.dltk.ruby.basicdebugger/src/org/eclipse/dltk/ruby/basicdebugger/RubyBasicDebuggerRunner.java b/plugins/org.eclipse.dltk.ruby.basicdebugger/src/org/eclipse/dltk/ruby/basicdebugger/RubyBasicDebuggerRunner.java +index 26c193c..ef4baa6 100644 +--- a/plugins/org.eclipse.dltk.ruby.basicdebugger/src/org/eclipse/dltk/ruby/basicdebugger/RubyBasicDebuggerRunner.java ++++ b/plugins/org.eclipse.dltk.ruby.basicdebugger/src/org/eclipse/dltk/ruby/basicdebugger/RubyBasicDebuggerRunner.java +@@ -1,12 +1,11 @@ + /******************************************************************************* +- * Copyright (c) 2005, 2016 IBM Corporation and others. ++ * Copyright (c) 2005, 2017 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + *******************************************************************************/ +- + package org.eclipse.dltk.ruby.basicdebugger; + + import java.io.IOException; +@@ -66,7 +65,7 @@ public class RubyBasicDebuggerRunner extends DebuggingEngineRunner { + if (deployment == null) { + return null; + } +- ++ launch.setAttribute("org.eclipse.dltk.debug.debugConsole", "true"); + DeploymentManager.getInstance().addDeployment(launch, deployment); + + // Get debugger source location +-- +cgit v0.11.2-4-g4a35 + + diff --git a/eclipse-dltk.spec b/eclipse-dltk.spec index 7198aa2..c59eb46 100644 --- a/eclipse-dltk.spec +++ b/eclipse-dltk.spec @@ -2,7 +2,7 @@ Name: eclipse-dltk Version: 5.7.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Dynamic Languages Toolkit (DLTK) Eclipse plug-in License: EPL and (CPL or GPLv2+ or LGPLv2+) and Ruby and ASL 2.0 URL: http://www.eclipse.org/dltk/ @@ -16,6 +16,9 @@ Source1: get-dltk.sh # Port to latest system lucene Patch0: eclipse-dltk-lucene.patch +# Fix ruby debug launch consoles +Patch1: eclipse-dltk-ruby-debug-launch.patch + BuildArch: noarch BuildRequires: eclipse-license >= 1.0.1 @@ -120,6 +123,10 @@ sed -i -e '/SearcherFactory()/s/false,//' \ %endif popd +pushd org.eclipse.dltk.ruby +%patch1 -p1 +popd + # We are not shipping the python and javascript editors # For python we have eclipse-pydev, which should be used instead # For javascript we have eclipse-webtools, which should be used instead @@ -183,6 +190,9 @@ QUALIFIER=$(date -u -d"$(stat --format=%y %{SOURCE0})" +%Y%m%d%H%M) %files tests -f .mfiles-tests %changelog +* Fri Apr 07 2017 Mat Booth - 5.7.1-2 +- Fix console defaults for ruby debugging + * Thu Mar 30 2017 Mat Booth - 5.7.1-1 - Update to latest upstream release - Allow building against lucene 6