Control: tags -1 + patch pending Dear maintainer,
since this bug is preventing the version of vtk with a fix for the libav 10 transition to be built on kfreebsd, I've prepared an NMU for vtk (versioned as 5.8.0-17.2) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Cheers -- Sebastian Ramacher
diff -Nru vtk-5.8.0/debian/changelog vtk-5.8.0/debian/changelog --- vtk-5.8.0/debian/changelog 2014-05-11 15:33:15.000000000 +0200 +++ vtk-5.8.0/debian/changelog 2014-05-17 16:48:41.000000000 +0200 @@ -1,3 +1,11 @@ +vtk (5.8.0-17.2) unstable; urgency=medium + + * Non-maintainer upload. + * debian/patches/java15.patch: Remove @Override which is not supported in + Java 1.5 to build on kfreebsd-*. (Closes: #747698) + + -- Sebastian Ramacher <sramac...@debian.org> Sat, 17 May 2014 16:48:33 +0200 + vtk (5.8.0-17.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru vtk-5.8.0/debian/patches/java15.patch vtk-5.8.0/debian/patches/java15.patch --- vtk-5.8.0/debian/patches/java15.patch 1970-01-01 01:00:00.000000000 +0100 +++ vtk-5.8.0/debian/patches/java15.patch 2014-05-17 16:48:30.000000000 +0200 @@ -0,0 +1,138 @@ +Description: Remove @Override which is not supported in Java 1.5 +Author: Sebastian Ramacher <sramac...@debian.org> +Bug-Debian: http://bugs.debian.org/747698 +Last-Update: 2014-05-17 + +--- a/Wrapping/Java/vtk/vtkJavaTesting.java ++++ b/Wrapping/Java/vtk/vtkJavaTesting.java +@@ -104,7 +104,6 @@ + public static void StartTimeoutExit(long time, TimeUnit unit) { + ScheduledExecutorService killerThread = Executors.newSingleThreadScheduledExecutor(); + Runnable killer = new Runnable() { +- @Override + public void run() { + System.exit(0); + } +--- a/Wrapping/Java/vtk/sample/ImagePlaneWidget.java ++++ b/Wrapping/Java/vtk/sample/ImagePlaneWidget.java +@@ -165,7 +165,6 @@ + ImagePlaneWidget.printUsage(f.getAbsolutePath() + " does not exist or cannot be read."); + + SwingUtilities.invokeLater(new Runnable() { +- @Override + public void run() { + new ImagePlaneWidget(f.getAbsolutePath() + "/quarter"); + } +--- a/Wrapping/Java/vtk/sample/Demo.java ++++ b/Wrapping/Java/vtk/sample/Demo.java +@@ -75,7 +75,6 @@ + this.actorToAdd = a; + } + +- @Override + public void run() { + this.renderer.AddActor(this.actorToAdd); + this.panel.Render(); +@@ -89,7 +88,6 @@ + private vtkShrinkFilter shrink; + private vtkSphereSource sphere; + +- @Override + public vtkActor call() throws Exception { + // New + actor = new vtkActor(); +@@ -157,7 +155,6 @@ + this.nbSeconds = 0; + new Timer(1000, new ActionListener() { + +- @Override + public void actionPerformed(ActionEvent e) { + if (nbSeconds++ < 10) { + panel3d.resetCamera(); +@@ -190,7 +187,6 @@ + + // Start/Stop the GC based on the checkbox + runGC.addActionListener(new ActionListener() { +- @Override + public void actionPerformed(ActionEvent arg0) { + vtkObject.JAVA_OBJECT_MANAGER.getAutoGarbageCollector().SetAutoGarbageCollection(runGC.isSelected()); + } +@@ -198,7 +194,6 @@ + + // Change GC mode based on the checkbox + debugMode.addActionListener(new ActionListener() { +- @Override + public void actionPerformed(ActionEvent arg0) { + vtkObject.JAVA_OBJECT_MANAGER.getAutoGarbageCollector().SetDebug(debugMode.isSelected()); + } +@@ -238,7 +233,6 @@ + // ----------------------------------------------------------------- + public static void main(String[] args) throws InterruptedException, InvocationTargetException { + SwingUtilities.invokeLater(new Runnable() { +- @Override + public void run() { + Demo app = new Demo(); + +--- a/Wrapping/Java/vtk/sample/InternalFrames.java ++++ b/Wrapping/Java/vtk/sample/InternalFrames.java +@@ -170,7 +170,6 @@ + + public static void main(String[] args) { + SwingUtilities.invokeLater(new Runnable() { +- @Override + public void run() { + new InternalFrames(); + } +--- a/Wrapping/Java/vtk/sample/ReleaseVtkPanel.java ++++ b/Wrapping/Java/vtk/sample/ReleaseVtkPanel.java +@@ -78,7 +78,6 @@ + public static void main(String[] args) { + SwingUtilities.invokeLater(new Runnable() { + +- @Override + public void run() { + // Setup GC to run every 1 second in EDT + vtkObject.JAVA_OBJECT_MANAGER.getAutoGarbageCollector().SetScheduleTime(5, TimeUnit.SECONDS); +@@ -88,12 +87,10 @@ + JButton startVTKApp = new JButton("Start VTK application"); + startVTKApp.addActionListener(new ActionListener() { + +- @Override + public void actionPerformed(ActionEvent e) { + final VtkApplication app = new VtkApplication(); + JFrame f = buildFrame("VtkApp", app, 400, 200); + f.addWindowListener(new WindowAdapter() { +- @Override + public void windowClosing(WindowEvent e) { + app.Delete(); + } +--- a/Wrapping/Java/vtk/sample/SimpleVTK.java ++++ b/Wrapping/Java/vtk/sample/SimpleVTK.java +@@ -71,7 +71,6 @@ + + public static void main(String s[]) { + SwingUtilities.invokeLater(new Runnable() { +- @Override + public void run() { + JFrame frame = new JFrame("SimpleVTK"); + frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); +--- a/Wrapping/Java/vtk/test/ConcurrencyGC.java ++++ b/Wrapping/Java/vtk/test/ConcurrencyGC.java +@@ -25,7 +25,6 @@ + + // Setup working runnable + Runnable workingJob = new Runnable() { +- @Override + public void run() { + try { + vtkUnstructuredGrid grid = new vtkUnstructuredGrid(); +--- a/Wrapping/Java/vtk/vtkReferenceInformation.java ++++ b/Wrapping/Java/vtk/vtkReferenceInformation.java +@@ -104,7 +104,6 @@ + return builder.toString(); + } + +- @Override + public String toString() { + final StringBuilder builder = new StringBuilder(50); + builder.append("VTK Gabage Collection: free("); diff -Nru vtk-5.8.0/debian/patches/series vtk-5.8.0/debian/patches/series --- vtk-5.8.0/debian/patches/series 2014-05-11 15:32:29.000000000 +0200 +++ vtk-5.8.0/debian/patches/series 2014-05-16 14:32:22.000000000 +0200 @@ -3,3 +3,4 @@ freetype.patch tcl-links.patch libav10.patch +java15.patch
signature.asc
Description: Digital signature
