Adding upstream version 1:7.0.4.upstream/1%7.0.4upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 53 insertions, 0 deletions

diff --git a/external/jfreereport/patches/libbase-1.1.6-deprecated.patch b/external/jfreereport/patches/libbase-1.1.6-deprecated.patch
new file mode 100644
index 000000000..e5cd38bd8
--- /dev/null
+++ b/external/jfreereport/patches/libbase-1.1.6-deprecated.patch
@@ -0,0 +1,53 @@
+--- misc/libbase-1.1.6/source/org/pentaho/reporting/libraries/base/boot/ModuleInitializeException.java	2010-04-27 15:58:44.000000000 +0200
++++ misc/build/libbase-1.1.6/source/org/pentaho/reporting/libraries/base/boot/ModuleInitializeException.java	2011-06-13 01:28:14.000000000 +0200
+@@ -48,7 +48,7 @@
+    */
+   public ModuleInitializeException(final String s, final Exception e)
+   {
+-    super(s, e);
++    super(s, (Throwable) e);
+   }
+ 
+   /**
+--- misc/libbase-1.1.6/source/org/pentaho/reporting/libraries/base/util/ClassQueryTool.java	2010-04-27 15:58:46.000000000 +0200
++++ misc/build/libbase-1.1.6/source/org/pentaho/reporting/libraries/base/util/ClassQueryTool.java	2014-07-22 17:53:13.000000000 +0200
+@@ -173,7 +173,7 @@
+       final File file = directoryOrJar.getAbsoluteFile();
+       if (file.isDirectory() && file.exists() && file.canRead())
+       {
+-        allURLs.add(file.toURL());
++        allURLs.add(file.toURI().toURL());
+         directoryURLs.add(file);
+         continue;
+       }
+@@ -186,8 +186,8 @@
+       final String fileName = file.getName();
+       if (fileName.endsWith(".jar") || fileName.endsWith(".zip"))
+       {
+-        allURLs.add(file.toURL());
+-        jarURLs.add(file.toURL());
++        allURLs.add(file.toURI().toURL());
++        jarURLs.add(file.toURI().toURL());
+       }
+     }
+ 
+@@ -199,7 +199,7 @@
+         final File file = driverFiles[i];
+         if (file.isDirectory() && file.exists() && file.canRead())
+         {
+-          allURLs.add(file.toURL());
++          allURLs.add(file.toURI().toURL());
+           directoryURLs.add(file);
+           continue;
+         }
+@@ -212,8 +212,8 @@
+         final String fileName = file.getName();
+         if (fileName.endsWith(".jar") || fileName.endsWith(".zip"))
+         {
+-          allURLs.add(file.toURL());
+-          jarURLs.add(file.toURL());
++          allURLs.add(file.toURI().toURL());
++          jarURLs.add(file.toURI().toURL());
+         }
+       }
+     }