[svgsalamander] 04/06: drop patch #0004, similar patch has been applied upstream

[Felix Natter]

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

fnatter-guest pushed a commit to branch master
in repository svgsalamander.

commit e8b0c432e521a46e3131d3c58853445211d80f07
Author: Felix Natter <fnatter at gmx.net>
Date:   Sat Aug 13 20:14:28 2016 +0200

    drop patch #0004, similar patch has been applied upstream
---
 ...wt-gradient-instead-of-the-embedded-batik.patch | 139 ---------------------
 debian/patches/series                              |   1 -
 2 files changed, 140 deletions(-)

diff --git a/debian/patches/0004-Use-system-awt-gradient-instead-of-the-embedded-batik.patch b/debian/patches/0004-Use-system-awt-gradient-instead-of-the-embedded-batik.patch
deleted file mode 100644
index 6199bf7..0000000
--- a/debian/patches/0004-Use-system-awt-gradient-instead-of-the-embedded-batik.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-Description: Use system awt gradient instead of the embedded batik code copy
-Author: Nicolas Dandrimont <Nicolas.Dandrimont at crans.org> (reapplied by Felix Natter)
-Forwarded: not-needed
-Last-Update: 2016-07-23
---- a/svg-core/src/main/java/com/kitfox/svg/LinearGradient.java
-+++ b/svg-core/src/main/java/com/kitfox/svg/LinearGradient.java
-@@ -41,6 +41,8 @@
- import java.awt.geom.AffineTransform;
- import java.awt.geom.Point2D;
- import java.awt.geom.Rectangle2D;
-+import java.awt.MultipleGradientPaint;
-+import java.awt.LinearGradientPaint;
- 
- /**
-  * @author Mark McKay
-@@ -96,18 +98,18 @@
- 
-     public Paint getPaint(Rectangle2D bounds, AffineTransform xform)
-     {
--        com.kitfox.svg.batik.MultipleGradientPaint.CycleMethodEnum method;
-+        MultipleGradientPaint.CycleMethod method;
-         switch (spreadMethod)
-         {
-             default:
-             case SM_PAD:
--                method = com.kitfox.svg.batik.MultipleGradientPaint.NO_CYCLE;
-+                method = MultipleGradientPaint.CycleMethod.NO_CYCLE;
-                 break;
-             case SM_REPEAT:
--                method = com.kitfox.svg.batik.MultipleGradientPaint.REPEAT;
-+                method = MultipleGradientPaint.CycleMethod.REPEAT;
-                 break;
-             case SM_REFLECT:
--                method = com.kitfox.svg.batik.MultipleGradientPaint.REFLECT;
-+                method = MultipleGradientPaint.CycleMethod.REFLECT;
-                 break;
-         }
- 
-@@ -120,13 +122,13 @@
-             paint = colors.length > 0 ? colors[0] : Color.black;
-         } else if (gradientUnits == GU_USER_SPACE_ON_USE)
-         {
--            paint = new com.kitfox.svg.batik.LinearGradientPaint(
-+            paint = new LinearGradientPaint(
-                 pt1,
-                 pt2,
-                 getStopFractions(),
-                 getStopColors(),
-                 method,
--                com.kitfox.svg.batik.MultipleGradientPaint.SRGB,
-+                MultipleGradientPaint.ColorSpaceType.SRGB,
-                 gradientTransform == null
-                 ? new AffineTransform()
-                 : gradientTransform);
-@@ -145,13 +147,13 @@
-                 viewXform.concatenate(gradientTransform);
-             }
- 
--            paint = new com.kitfox.svg.batik.LinearGradientPaint(
-+            paint = new LinearGradientPaint(
-                 pt1,
-                 pt2,
-                 getStopFractions(),
-                 getStopColors(),
-                 method,
--                com.kitfox.svg.batik.MultipleGradientPaint.SRGB,
-+                MultipleGradientPaint.ColorSpaceType.SRGB,
-                 viewXform);
-         }
- 
---- a/svg-core/src/main/java/com/kitfox/svg/RadialGradient.java
-+++ b/svg-core/src/main/java/com/kitfox/svg/RadialGradient.java
-@@ -41,6 +41,9 @@
- import java.awt.geom.AffineTransform;
- import java.awt.geom.Point2D;
- import java.awt.geom.Rectangle2D;
-+import java.awt.MultipleGradientPaint;
-+import java.awt.LinearGradientPaint;
-+import java.awt.RadialGradientPaint;
- 
- /**
-  * @author Mark McKay
-@@ -106,18 +109,18 @@
- 
-     public Paint getPaint(Rectangle2D bounds, AffineTransform xform)
-     {
--        com.kitfox.svg.batik.MultipleGradientPaint.CycleMethodEnum method;
-+        MultipleGradientPaint.CycleMethod method;
-         switch (spreadMethod)
-         {
-             default:
-             case SM_PAD:
--                method = com.kitfox.svg.batik.MultipleGradientPaint.NO_CYCLE;
-+                method = MultipleGradientPaint.CycleMethod.NO_CYCLE;
-                 break;
-             case SM_REPEAT:
--                method = com.kitfox.svg.batik.MultipleGradientPaint.REPEAT;
-+                method = MultipleGradientPaint.CycleMethod.REPEAT;
-                 break;
-             case SM_REFLECT:
--                method = com.kitfox.svg.batik.MultipleGradientPaint.REFLECT;
-+                method = MultipleGradientPaint.CycleMethod.REFLECT;
-                 break;
-         }
- 
-@@ -126,14 +129,14 @@
-         Point2D.Float pt2 = hasFocus ? new Point2D.Float(fx, fy) : pt1;
-         if (gradientUnits == GU_USER_SPACE_ON_USE)
-         {
--            paint = new com.kitfox.svg.batik.RadialGradientPaint(
-+            paint = new RadialGradientPaint(
-                 pt1,
-                 r,
-                 pt2,
-                 getStopFractions(),
-                 getStopColors(),
-                 method,
--                com.kitfox.svg.batik.MultipleGradientPaint.SRGB,
-+                MultipleGradientPaint.ColorSpaceType.SRGB,
-                 gradientTransform);
-         } else
-         {
-@@ -143,14 +146,14 @@
- 
-             viewXform.concatenate(gradientTransform);
- 
--            paint = new com.kitfox.svg.batik.RadialGradientPaint(
-+            paint = new RadialGradientPaint(
-                 pt1,
-                 r,
-                 pt2,
-                 getStopFractions(),
-                 getStopColors(),
-                 method,
--                com.kitfox.svg.batik.MultipleGradientPaint.SRGB,
-+                MultipleGradientPaint.ColorSpaceType.SRGB,
-                 viewXform);
-         }
- 
diff --git a/debian/patches/series b/debian/patches/series
index 0c0e5be..a396b50 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 0001-Make-build-use-system-libraries.patch
 0002-Disable-useless-automated-jar-signing.patch
 0003-Modify-javadoc-target-to-add-links-to-system-API-doc.patch
-0004-Use-system-awt-gradient-instead-of-the-embedded-batik.patch
 0005-dont-call-netbeans-ant-tasks.patch
 0006-modify-broken-upstream-pom.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/svgsalamander.git