From c95168b3039c52bd929a082e647d437d62b9e26a Mon Sep 17 00:00:00 2001 From: "Volkmar W. Pogatzki" Date: Sat, 3 Feb 2024 23:46:32 +0100 Subject: dev-java/bsf: drop 2.4.0-r3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Volkmar W. Pogatzki Closes: https://github.com/gentoo/gentoo/pull/35174 Signed-off-by: Miroslav Šulc --- dev-java/bsf/files/bsf-2.4.0-PyJavaInstance.patch | 35 ----------------------- 1 file changed, 35 deletions(-) delete mode 100644 dev-java/bsf/files/bsf-2.4.0-PyJavaInstance.patch (limited to 'dev-java/bsf/files/bsf-2.4.0-PyJavaInstance.patch') diff --git a/dev-java/bsf/files/bsf-2.4.0-PyJavaInstance.patch b/dev-java/bsf/files/bsf-2.4.0-PyJavaInstance.patch deleted file mode 100644 index 4e8c4de7b015..000000000000 --- a/dev-java/bsf/files/bsf-2.4.0-PyJavaInstance.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- a/src/org/apache/bsf/engines/jython/JythonEngine.java.orig 2015-07-04 08:00:17.120000000 +0000 -+++ b/src/org/apache/bsf/engines/jython/JythonEngine.java 2015-07-04 08:04:55.230000000 +0000 -@@ -26,7 +26,7 @@ - import org.apache.bsf.util.BSFFunctions; - import org.python.core.Py; - import org.python.core.PyException; --import org.python.core.PyJavaInstance; -+import org.python.core.PyJavaType; - import org.python.core.PyObject; - import org.python.util.InteractiveInterpreter; - -@@ -110,8 +110,9 @@ - - Object result = interp.eval ("bsf_temp_fn()"); - -- if (result != null && result instanceof PyJavaInstance) -- result = ((PyJavaInstance)result).__tojava__(Object.class); -+ if (result != null && result instanceof PyJavaType) -+ //result = ((PyJavaInstance)result).__tojava__(Object.class); -+ result = PyJavaType.wrapJavaObject(result).__tojava__(Object.class); - return result; - } catch (PyException e) { - throw new BSFException (BSFException.REASON_EXECUTION_ERROR, -@@ -126,8 +127,9 @@ - Object script) throws BSFException { - try { - Object result = interp.eval (byteify(script.toString ())); -- if (result != null && result instanceof PyJavaInstance) -- result = ((PyJavaInstance)result).__tojava__(Object.class); -+ if (result != null && result instanceof PyJavaType) -+ //result = ((PyJavaInstance)result).__tojava__(Object.class); -+ result = PyJavaType.wrapJavaObject(result).__tojava__(Object.class); - return result; - } catch (PyException e) { - throw new BSFException (BSFException.REASON_EXECUTION_ERROR, -- cgit v1.2.3