This is an automated email from the git hooks/post-receive script. xhaakon-guest pushed a commit to branch master in repository eclipse-wtp.
commit 2976e962c8d38b0c8241be2c2e83e40597b7d7aa Author: Jakub Adam <[email protected]> Date: Sat Aug 31 16:01:19 2013 +0200 Add patch for compatibility with rhino 1.7R4 --- debian/changelog | 1 + debian/patches/rhino-1.7R4-compatibility.patch | 45 ++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 47 insertions(+) diff --git a/debian/changelog b/debian/changelog index 46b02e2..bd86527 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ eclipse-wtp (3.5.0-1) UNRELEASED; urgency=low * Refreshed d/patches: - debian-custom-build.patch - regenerate-xpath2-parser.patch. + * Add patch for compatibility with rhino 1.7R4. -- Jakub Adam <[email protected]> Fri, 28 Jun 2013 08:42:01 +0200 diff --git a/debian/patches/rhino-1.7R4-compatibility.patch b/debian/patches/rhino-1.7R4-compatibility.patch new file mode 100644 index 0000000..6d9bf2f --- /dev/null +++ b/debian/patches/rhino-1.7R4-compatibility.patch @@ -0,0 +1,45 @@ +From: Jakub Adam <[email protected]> +Date: Sat, 31 Aug 2013 12:03:10 +0200 +Subject: rhino-1.7R4-compatibility + +--- + .../wst/jsdt/debug/rhino/debugger/shell/DebugMain.java | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/org.eclipse.wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug/rhino/debugger/shell/DebugMain.java b/org.eclipse.wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug/rhino/debugger/shell/DebugMain.java +index bb19337..8d15d44 100644 +--- a/org.eclipse.wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug/rhino/debugger/shell/DebugMain.java ++++ b/org.eclipse.wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug/rhino/debugger/shell/DebugMain.java +@@ -10,6 +10,7 @@ + *******************************************************************************/ + package org.eclipse.wst.jsdt.debug.rhino.debugger.shell; + ++import java.io.IOException; + import java.util.ArrayList; + import java.util.List; + +@@ -76,9 +77,9 @@ public class DebugMain { + throw Kit.codeBug(); + } + if(scriptsrc != null) { +- Script script = Main.loadScriptFromSource(cx, scriptsrc, FROM_EVAL, 0, null); ++ Script script = cx.compileString(scriptsrc, FROM_EVAL, 0, null); + if(script != null) { +- Main.evaluateScript(script, cx, Main.getGlobal()); ++ script.exec(cx, Main.getGlobal()); + } + } + Object[] array = new Object[scripts.length]; +@@ -86,7 +87,11 @@ public class DebugMain { + Scriptable argsObj = cx.newArray(Main.global, array); + Main.global.defineProperty(GLOBAL_ARGUMENTS, argsObj, ScriptableObject.DONTENUM); + for (int i = 0; i < scripts.length; i++) { +- Main.processFile(cx, Main.global, scripts[i]); ++ try { ++ Main.processFile(cx, Main.global, scripts[i]); ++ } catch (IOException e) { ++ e.printStackTrace(); ++ } + } + return null; + } diff --git a/debian/patches/series b/debian/patches/series index 4dc7dea..2abc420 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,3 +7,4 @@ eclipsehelp-rebuild-customizations.patch add-debian-system-catalog-reader.patch regenerate-js-parser-resources.patch use-xslt-xsd-from-system-location.patch +rhino-1.7R4-compatibility.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse-wtp.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
