From f70a1bfc721336d4fc7dfb711c2f518a6b18cf16 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 30 Sep 2020 17:27:54 +0100 Subject: gentoo resync : 30.09.2020 --- dev-lang/tuprolog/files/build-2.9.2.xml | 110 ----------------- .../tuprolog-2.9.2-no-dynamic-object-test.patch | 20 --- .../tuprolog/files/tuprolog-2.9.2-no-ikvm.patch | 116 ----------------- .../tuprolog/files/tuprolog-3.0.1-no-ikvm.patch | 137 --------------------- .../files/tuprolog-3.0.1-oolibrary-unit-test.patch | 12 -- 5 files changed, 395 deletions(-) delete mode 100644 dev-lang/tuprolog/files/build-2.9.2.xml delete mode 100644 dev-lang/tuprolog/files/tuprolog-2.9.2-no-dynamic-object-test.patch delete mode 100644 dev-lang/tuprolog/files/tuprolog-2.9.2-no-ikvm.patch delete mode 100644 dev-lang/tuprolog/files/tuprolog-3.0.1-no-ikvm.patch delete mode 100644 dev-lang/tuprolog/files/tuprolog-3.0.1-oolibrary-unit-test.patch (limited to 'dev-lang/tuprolog/files') diff --git a/dev-lang/tuprolog/files/build-2.9.2.xml b/dev-lang/tuprolog/files/build-2.9.2.xml deleted file mode 100644 index 823c2371d1fd..000000000000 --- a/dev-lang/tuprolog/files/build-2.9.2.xml +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dev-lang/tuprolog/files/tuprolog-2.9.2-no-dynamic-object-test.patch b/dev-lang/tuprolog/files/tuprolog-2.9.2-no-dynamic-object-test.patch deleted file mode 100644 index 0416258e9e14..000000000000 --- a/dev-lang/tuprolog/files/tuprolog-2.9.2-no-dynamic-object-test.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- tuprolog-2.9.2.orig/test/unit/alice/tuprolog/JavaLibraryTestCase.java 2015-02-27 14:02:49.000000000 +0100 -+++ tuprolog-2.9.2/test/unit/alice/tuprolog/JavaLibraryTestCase.java 2016-02-17 15:24:47.000000000 +0100 -@@ -39,7 +39,7 @@ - SolveInfo goal = engine.solve(new Struct("demo", t)); - assertFalse(goal.isSuccess()); - } -- -+/* - public void testDynamicObjectsRetrival() throws PrologException { - Prolog engine = new Prolog(); - JavaLibrary lib = (JavaLibrary) engine.getLibrary("alice.tuprolog.lib.JavaLibrary"); -@@ -53,7 +53,7 @@ - TestCounter counter = (TestCounter) lib.getRegisteredDynamicObject(id); - assertEquals(2, counter.getValue()); - } -- -+*/ - - public void test_java_object() throws PrologException, IOException - { diff --git a/dev-lang/tuprolog/files/tuprolog-2.9.2-no-ikvm.patch b/dev-lang/tuprolog/files/tuprolog-2.9.2-no-ikvm.patch deleted file mode 100644 index d94dc66bbac5..000000000000 --- a/dev-lang/tuprolog/files/tuprolog-2.9.2-no-ikvm.patch +++ /dev/null @@ -1,116 +0,0 @@ -diff -urN tuprolog-2.9.0.orig/src/alice/tuprolog/LibraryManager.java tuprolog-2.9.0/src/alice/tuprolog/LibraryManager.java ---- tuprolog-2.9.0.orig/src/alice/tuprolog/LibraryManager.java 2014-09-29 18:14:21.000000000 +0200 -+++ tuprolog-2.9.0/src/alice/tuprolog/LibraryManager.java 2015-01-11 14:48:57.000000000 +0100 -@@ -9,11 +9,11 @@ - import java.net.URL; - import java.net.URLClassLoader; - import java.util.*; --import cli.System.Reflection.Assembly; -+//import cli.System.Reflection.Assembly; - - import alice.tuprolog.event.LibraryEvent; - import alice.tuprolog.event.WarningEvent; --import alice.util.AssemblyCustomClassLoader; -+//import alice.util.AssemblyCustomClassLoader; - - /** - * @author Alex Benini -@@ -179,31 +179,7 @@ - } else - // .NET - { -- Assembly asm = null; -- boolean classFound = false; -- className = "cli." -- + className.substring(0, className.indexOf(",")) -- .trim(); -- for (int i = 0; i < paths.length; i++) -- { -- try -- { -- asm = Assembly.LoadFrom(paths[i]); -- loader = new AssemblyCustomClassLoader(asm, urls); -- lib = (Library) Class.forName(className, true, loader).newInstance(); -- if (lib != null) -- { -- classFound = true; -- break; -- } -- } catch (Exception e) -- { -- e.printStackTrace(); -- continue; -- } -- } -- if (!classFound) -- throw new InvalidLibraryException(className, -1, -1); -+ throw new InvalidLibraryException(className, -1, -1); - } - } - -@@ -462,4 +438,4 @@ - return optimizedDirectory; - } - --} -\ No newline at end of file -+} -diff -urN tuprolog-2.9.0.orig/src/alice/tuprologx/ide/LibraryManager.java tuprolog-2.9.0/src/alice/tuprologx/ide/LibraryManager.java ---- tuprolog-2.9.0.orig/src/alice/tuprologx/ide/LibraryManager.java 2014-09-29 18:14:21.000000000 +0200 -+++ tuprolog-2.9.0/src/alice/tuprologx/ide/LibraryManager.java 2015-01-11 14:46:23.000000000 +0100 -@@ -18,7 +18,7 @@ - package alice.tuprologx.ide; - - import alice.tuprolog.*; --import alice.util.AssemblyCustomClassLoader; -+//import alice.util.AssemblyCustomClassLoader; - - import java.io.File; - import java.net.URL; -@@ -26,7 +26,7 @@ - import java.util.ArrayList; - import java.util.Hashtable; - import java.util.StringTokenizer; --import cli.System.Reflection.Assembly; -+//import cli.System.Reflection.Assembly; - - /** - * A dynamic manager for tuProlog libraries. -@@ -155,10 +155,7 @@ - // .NET - if(System.getProperty("java.vm.name").equals("IKVM.NET")) - { -- Assembly asm = Assembly.LoadFrom(file.getPath()); -- loader = new AssemblyCustomClassLoader(asm, new URL[]{url}); -- libraryClassname = "cli." + libraryClassname.substring(0, -- libraryClassname.indexOf(",")).trim(); -+ throw new InvalidLibraryException(libraryClassname,-1,-1); - } - // JVM - else -diff -urN tuprolog-2.9.0.orig/src/alice/util/AssemblyCustomClassLoader.java tuprolog-2.9.0/src/alice/util/AssemblyCustomClassLoader.java ---- tuprolog-2.9.0.orig/src/alice/util/AssemblyCustomClassLoader.java 2014-09-29 18:14:21.000000000 +0200 -+++ tuprolog-2.9.0/src/alice/util/AssemblyCustomClassLoader.java 1970-01-01 01:00:00.000000000 +0100 -@@ -1,21 +0,0 @@ --package alice.util; -- --import java.net.URL; -- --public class AssemblyCustomClassLoader extends java.net.URLClassLoader --{ -- public AssemblyCustomClassLoader(cli.System.Reflection.Assembly asm, URL[] urls) -- { -- super(new java.net.URL[0], new ikvm.runtime.AssemblyClassLoader(asm)); -- // explicitly calling addURL() is safer than passing it to the super constructor, -- // because this class loader instance may be used during the URL construction. -- for (URL url : urls) { -- addURL(url); -- } -- } -- -- public void addUrl(URL url) -- { -- addURL(url); -- } --} -\ No newline at end of file diff --git a/dev-lang/tuprolog/files/tuprolog-3.0.1-no-ikvm.patch b/dev-lang/tuprolog/files/tuprolog-3.0.1-no-ikvm.patch deleted file mode 100644 index 660b22c79341..000000000000 --- a/dev-lang/tuprolog/files/tuprolog-3.0.1-no-ikvm.patch +++ /dev/null @@ -1,137 +0,0 @@ -diff -urN tuprolog-3.0.1.orig/src/alice/tuprolog/LibraryManager.java tuprolog-3.0.1/src/alice/tuprolog/LibraryManager.java ---- tuprolog-3.0.1.orig/src/alice/tuprolog/LibraryManager.java 2017-09-27 12:31:06.689334505 +0200 -+++ tuprolog-3.0.1/src/alice/tuprolog/LibraryManager.java 2017-09-27 12:50:04.193286931 +0200 -@@ -9,11 +9,11 @@ - import java.net.URL; - import java.net.URLClassLoader; - import java.util.*; --import cli.System.Reflection.Assembly; -+//import cli.System.Reflection.Assembly; - - import alice.tuprolog.event.LibraryEvent; - import alice.tuprolog.event.WarningEvent; --import alice.util.AssemblyCustomClassLoader; -+//import alice.util.AssemblyCustomClassLoader; - - /** - * @author Alex Benini -@@ -179,31 +179,7 @@ - } else - // .NET - { -- Assembly asm = null; -- boolean classFound = false; -- className = "cli." -- + className.substring(0, className.indexOf(",")) -- .trim(); -- for (int i = 0; i < paths.length; i++) -- { -- try -- { -- asm = Assembly.LoadFrom(paths[i]); -- loader = new AssemblyCustomClassLoader(asm, urls); -- lib = (Library) Class.forName(className, true, loader).newInstance(); -- if (lib != null) -- { -- classFound = true; -- break; -- } -- } catch (Exception e) -- { -- e.printStackTrace(); -- continue; -- } -- } -- if (!classFound) -- throw new InvalidLibraryException(className, -1, -1); -+ throw new InvalidLibraryException(className, -1, -1); - } - } - -@@ -462,4 +438,4 @@ - return optimizedDirectory; - } - --} -\ Manca newline alla fine del file -+} -diff -urN tuprolog-3.0.1.orig/src/alice/tuprologx/ide/LibraryManager.java tuprolog-3.0.1/src/alice/tuprologx/ide/LibraryManager.java ---- tuprolog-3.0.1.orig/src/alice/tuprologx/ide/LibraryManager.java 2017-09-27 12:31:06.696334504 +0200 -+++ tuprolog-3.0.1/src/alice/tuprologx/ide/LibraryManager.java 2017-09-27 12:50:04.194286931 +0200 -@@ -18,7 +18,7 @@ - package alice.tuprologx.ide; - - import alice.tuprolog.*; --import alice.util.AssemblyCustomClassLoader; -+//import alice.util.AssemblyCustomClassLoader; - - import java.io.File; - import java.net.URL; -@@ -26,7 +26,7 @@ - import java.util.ArrayList; - import java.util.Hashtable; - import java.util.StringTokenizer; --import cli.System.Reflection.Assembly; -+//import cli.System.Reflection.Assembly; - - /** - * A dynamic manager for tuProlog libraries. -@@ -155,10 +155,7 @@ - // .NET - if(System.getProperty("java.vm.name").equals("IKVM.NET")) - { -- Assembly asm = Assembly.LoadFrom(file.getPath()); -- loader = new AssemblyCustomClassLoader(asm, new URL[]{url}); -- libraryClassname = "cli." + libraryClassname.substring(0, -- libraryClassname.indexOf(",")).trim(); -+ throw new InvalidLibraryException(libraryClassname,-1,-1); - } - // JVM - else -diff -urN tuprolog-3.0.1.orig/src/alice/util/AssemblyCustomClassLoader.java tuprolog-3.0.1/src/alice/util/AssemblyCustomClassLoader.java ---- tuprolog-3.0.1.orig/src/alice/util/AssemblyCustomClassLoader.java 2017-09-27 12:31:06.699334504 +0200 -+++ tuprolog-3.0.1/src/alice/util/AssemblyCustomClassLoader.java 1970-01-01 01:00:00.000000000 +0100 -@@ -1,21 +0,0 @@ --package alice.util; -- --import java.net.URL; -- --public class AssemblyCustomClassLoader extends java.net.URLClassLoader --{ -- public AssemblyCustomClassLoader(cli.System.Reflection.Assembly asm, URL[] urls) -- { -- super(new java.net.URL[0], new ikvm.runtime.AssemblyClassLoader(asm)); -- // explicitly calling addURL() is safer than passing it to the super constructor, -- // because this class loader instance may be used during the URL construction. -- for (URL url : urls) { -- addURL(url); -- } -- } -- -- public void addUrl(URL url) -- { -- addURL(url); -- } --} -\ Manca newline alla fine del file -diff -urN tuprolog-3.0.1.orig/src/alice/util/proxyGenerator/Generator.java tuprolog-3.0.1/src/alice/util/proxyGenerator/Generator.java ---- tuprolog-3.0.1.orig/src/alice/util/proxyGenerator/Generator.java 2017-09-27 12:31:06.700334504 +0200 -+++ tuprolog-3.0.1/src/alice/util/proxyGenerator/Generator.java 2017-09-27 12:50:04.195286931 +0200 -@@ -1,7 +1,7 @@ - package alice.util.proxyGenerator; - import javax.tools.*; - --import cli.System.Reflection.Assembly; -+//import cli.System.Reflection.Assembly; - - import java.lang.reflect.*; - import java.util.*; -@@ -29,7 +29,7 @@ - } - - if(System.getProperty("java.vm.name").equals("IKVM.NET")) -- ikvm.runtime.Startup.addBootClassPathAssemby(Assembly.Load("IKVM.OpenJDK.Tools")); -+ throw new UnsupportedOperationException("IKVM.NET not supported!"); - - jc = ToolProvider.getSystemJavaCompiler(); - if (jc == null) { diff --git a/dev-lang/tuprolog/files/tuprolog-3.0.1-oolibrary-unit-test.patch b/dev-lang/tuprolog/files/tuprolog-3.0.1-oolibrary-unit-test.patch deleted file mode 100644 index 9d09ff202b08..000000000000 --- a/dev-lang/tuprolog/files/tuprolog-3.0.1-oolibrary-unit-test.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur tuprolog-3.0.1.orig/test/unit/alice/tuprolog/PrologTestCase.java tuprolog-3.0.1/test/unit/alice/tuprolog/PrologTestCase.java ---- tuprolog-3.0.1.orig/test/unit/alice/tuprolog/PrologTestCase.java 2017-09-27 12:31:12.908334244 +0200 -+++ tuprolog-3.0.1/test/unit/alice/tuprolog/PrologTestCase.java 2017-09-27 19:30:31.813282027 +0200 -@@ -32,7 +32,7 @@ - assertNotNull(engine.getLibrary("alice.tuprolog.StringLibrary")); - Library javaLibrary = new alice.tuprolog.lib.OOLibrary(); - engine.loadLibrary(javaLibrary); -- assertSame(javaLibrary, engine.getLibrary("alice.tuprolog.lib.JavaLibrary")); -+ assertSame(javaLibrary, engine.getLibrary("alice.tuprolog.lib.OOLibrary")); - } - - public void testGetLibraryWithName() throws InvalidLibraryException { -- cgit v1.2.3