[scilab] 12/29: Drop patch to update the xmlgraphics api

[Julien Puydt]

This is an automated email from the git hooks/post-receive script.

jpuydt-guest pushed a commit to branch master
in repository scilab.

commit bc79c1318432e1543babf4e88d4d8f7f922a002a
Author: Julien Puydt <julien.puydt at laposte.net>
Date:   Wed Nov 15 17:59:34 2017 +0100

    Drop patch to update the xmlgraphics api
---
 debian/changelog                            |  1 +
 debian/patches/series                       |  1 -
 debian/patches/xmlgraphics-commons-2.0.diff | 88 -----------------------------
 3 files changed, 1 insertion(+), 89 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 43f459f..0ce54e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ scilab (6.0.0-1) UNRELEASED; urgency=medium
     - Refresh patch to simplify the helper command-line.
     - Refresh patch to add deps for scicos' modelica compiler.
     - Refresh patch to add a missing lib to the linker list.
+    - Drop patch to adap the xmlgraphics api : useless now.
 
  -- Julien Puydt <julien.puydt at laposte.net>  Tue, 14 Nov 2017 16:46:25 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index 31f0852..e8fe025 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,7 +4,6 @@ disable-xcos-dep-check.diff
 jh.diff
 depend-scicos.diff
 missing-lib.diff
-xmlgraphics-commons-2.0.diff
 fop-2.0.diff
 batik-1.8.diff
 jvm-archdir-ppc64le.diff
diff --git a/debian/patches/xmlgraphics-commons-2.0.diff b/debian/patches/xmlgraphics-commons-2.0.diff
deleted file mode 100644
index 7fe99f5..0000000
--- a/debian/patches/xmlgraphics-commons-2.0.diff
+++ /dev/null
@@ -1,88 +0,0 @@
-Description: adapt to xmlgraphics-commons 2.0 API
- New signature fo PSGraphics2D.processShape:
- int PSGraphics2D.processShape(Shape s, boolean cached)
-Author: Gilles Filippini <pini at debian.org>
-Index: scilab-5.5.2/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java
-===================================================================
---- scilab-5.5.2.orig/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java
-+++ scilab-5.5.2/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java
-@@ -857,7 +857,7 @@ public class Export {
-                     }
- 
-                     @Override
--                    public int processShape(Shape s) throws IOException {
-+                    public int processShape(Shape s, boolean cached) throws IOException {
-                         if (s instanceof Ellipse2D.Double) {
-                             Ellipse2D.Double ell = (Ellipse2D.Double) s;
-                             if (ell.height == ell.width) {
-@@ -880,10 +880,10 @@ public class Export {
-                                     buffer.append("[").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1]));
-                                     it.next();
-                                 } else {
--                                    return super.processShape(s);
-+                                    return super.processShape(s, cached);
-                                 }
-                             } else {
--                                return super.processShape(s);
-+                                return super.processShape(s, cached);
-                             }
- 
-                             for (; !it.isDone(); it.next()) {
-@@ -891,7 +891,7 @@ public class Export {
-                                 if (type == PathIterator.SEG_LINETO) {
-                                     buffer.append(" ").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1]));
-                                 } else {
--                                    return super.processShape(s);
-+                                    return super.processShape(s, cached);
-                                 }
-                             }
-                             buffer.append("] DP");
-@@ -899,7 +899,7 @@ public class Export {
-                             return PathIterator.WIND_NON_ZERO;
-                         }
- 
--                        return super.processShape(s);
-+                        return super.processShape(s, cached);
-                     }
-                 };
-                 g2d.setGraphicContext(new GraphicContext());
-@@ -1029,7 +1029,7 @@ public class Export {
-                     }
- 
-                     @Override
--                    public int processShape(Shape s) throws IOException {
-+                    public int processShape(Shape s, boolean cached) throws IOException {
-                         if (s instanceof Ellipse2D.Double) {
-                             Ellipse2D.Double ell = (Ellipse2D.Double) s;
-                             if (ell.height == ell.width) {
-@@ -1052,10 +1052,10 @@ public class Export {
-                                     buffer.append("[").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1]));
-                                     it.next();
-                                 } else {
--                                    return super.processShape(s);
-+                                    return super.processShape(s, cached);
-                                 }
-                             } else {
--                                return super.processShape(s);
-+                                return super.processShape(s, cached);
-                             }
- 
-                             for (; !it.isDone(); it.next()) {
-@@ -1063,7 +1063,7 @@ public class Export {
-                                 if (type == PathIterator.SEG_LINETO) {
-                                     buffer.append(" ").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1]));
-                                 } else {
--                                    return super.processShape(s);
-+                                    return super.processShape(s, cached);
-                                 }
-                             }
-                             buffer.append("] DP");
-@@ -1071,7 +1071,7 @@ public class Export {
-                             return PathIterator.WIND_NON_ZERO;
-                         }
- 
--                        return super.processShape(s);
-+                        return super.processShape(s, cached);
-                     }
- 
-                 };

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/scilab.git