[svgsalamander] 02/06: add fixed patches for 1.0.0
Felix Natter
fnatter-guest at moszumanska.debian.org
Sat Jul 30 09:36:06 UTC 2016
This is an automated email from the git hooks/post-receive script.
fnatter-guest pushed a commit to branch master
in repository svgsalamander.
commit 9f9fe190a7b26558db04e25a2b826212c705f837
Author: Felix Natter <fnatter at gmx.net>
Date: Sat Jul 30 11:21:36 2016 +0200
add fixed patches for 1.0.0
---
.../0001-Make-build-use-system-libraries.patch | 15 +-
...002-Disable-useless-automated-jar-signing.patch | 24 ++-
...doc-target-to-add-links-to-system-API-doc.patch | 25 ++-
...t-gradient-instead-of-the-embedded-batik.patch} | 101 ++++++------
.../0005-dont-call-netbeans-ant-tasks.patch | 14 ++
.../patches/0006-modify-broken-upstream-pom.patch | 172 +++++++++++++++++++++
debian/patches/series | 4 +-
7 files changed, 255 insertions(+), 100 deletions(-)
diff --git a/debian/patches/0001-Make-build-use-system-libraries.patch b/debian/patches/0001-Make-build-use-system-libraries.patch
index 6799a60..d4fdeaf 100644
--- a/debian/patches/0001-Make-build-use-system-libraries.patch
+++ b/debian/patches/0001-Make-build-use-system-libraries.patch
@@ -1,13 +1,7 @@
-From: Nicolas Dandrimont <Nicolas.Dandrimont at crans.org>
-Date: Fri, 18 Feb 2011 13:21:02 +0100
-Subject: Make build use system libraries
-
----
- svg-core/build.xml | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/svg-core/build.xml b/svg-core/build.xml
-index 0fbc9b1..74e3fed 100755
+Description: Make build use system libraries
+Author: Nicolas Dandrimont <Nicolas.Dandrimont at crans.org>
+Forwarded: not-needed
+Last-Update: 2011-02-18
--- a/svg-core/build.xml
+++ b/svg-core/build.xml
@@ -68,7 +68,7 @@
@@ -19,4 +13,3 @@ index 0fbc9b1..74e3fed 100755
<property name="gen.main.src.dir" location="src/gen/java"/>
<property name="gen.main.res.dir" location="src/gen/res"/>
<property name="animtime.jjtree" location="src/main/java/com/kitfox/svg/animation/AnimTimeParser.jjt"/>
---
diff --git a/debian/patches/0002-Disable-useless-automated-jar-signing.patch b/debian/patches/0002-Disable-useless-automated-jar-signing.patch
index 6d4fb7b..d4dbd06 100644
--- a/debian/patches/0002-Disable-useless-automated-jar-signing.patch
+++ b/debian/patches/0002-Disable-useless-automated-jar-signing.patch
@@ -1,16 +1,10 @@
-From: Nicolas Dandrimont <Nicolas.Dandrimont at crans.org>
-Date: Sun, 6 Mar 2011 11:10:29 +0100
-Subject: Disable useless automated jar signing.
-
----
- svg-core/build.xml | 14 --------------
- 1 files changed, 0 insertions(+), 14 deletions(-)
-
-diff --git a/svg-core/build.xml b/svg-core/build.xml
-index 74e3fed..05d3dc6 100755
+Description: Disable jar signing in ant script
+Author: Felix Natter <fnatter at gmx.net>
+Forwarded: not-needed
+Last-Update: 2016-07-23
--- a/svg-core/build.xml
+++ b/svg-core/build.xml
-@@ -109,20 +109,6 @@
+@@ -110,23 +110,7 @@
</fileset>
</jar>
@@ -26,9 +20,11 @@ index 74e3fed..05d3dc6 100755
- </dname>
- </genkey>
-
-- <signjar jar="${dist.jar}" alias="${key.user}" storepass="${key.password}" keystore="${key.location}"/>
--
<copy file="${dist.jar}" toFile="${project.www.jar}"/>
+- <signjar jar="${project.www.jar}"
+- alias="${key.user}"
+- storepass="${key.password}"
+- keystore="${key.location}"/>
<delete file="${project.tiny.jar}"/>
---
+ <jar destfile="${project.tiny.jar}" update="true">
diff --git a/debian/patches/0003-Modify-javadoc-target-to-add-links-to-system-API-doc.patch b/debian/patches/0003-Modify-javadoc-target-to-add-links-to-system-API-doc.patch
index 54a6e70..9abb8e8 100644
--- a/debian/patches/0003-Modify-javadoc-target-to-add-links-to-system-API-doc.patch
+++ b/debian/patches/0003-Modify-javadoc-target-to-add-links-to-system-API-doc.patch
@@ -1,22 +1,15 @@
-From: Nicolas Dandrimont <Nicolas.Dandrimont at crans.org>
-Date: Sun, 6 Mar 2011 11:36:54 +0100
-Subject: Modify javadoc target to add links to system API docs
-
----
- svg-core/nbproject/build-impl.xml | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/svg-core/nbproject/build-impl.xml b/svg-core/nbproject/build-impl.xml
-index 3a71c95..56d5331 100755
+Description: Modify javadoc target to add links to system API docs
+Author: Nicolas Dandrimont <Nicolas.Dandrimont at crans.org>
+Forwarded: not-needed
+Last-Update: 2011-03-06
--- a/svg-core/nbproject/build-impl.xml
+++ b/svg-core/nbproject/build-impl.xml
-@@ -756,6 +756,8 @@ is divided into following sections:
- <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
+@@ -1282,6 +1282,8 @@
<include name="**/*.java"/>
+ <exclude name="*.java"/>
</fileset>
-+ <link href="/usr/share/doc/default-jdk-doc/api" />
-+ <link href="/usr/share/doc/ant/api" />
++ <link href="/usr/share/doc/default-jdk-doc/api" />
++ <link href="/usr/share/doc/ant/api" />
+ <arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/>
</javadoc>
<copy todir="${dist.javadoc.dir}">
- <fileset dir="${src.www.dir}" excludes="${excludes}" includes="${includes}">
---
diff --git a/debian/patches/0004-Use-system-awt-gradient-instead-of-the-embedded-bati.patch b/debian/patches/0004-Use-system-awt-gradient-instead-of-the-embedded-batik.patch
similarity index 60%
rename from debian/patches/0004-Use-system-awt-gradient-instead-of-the-embedded-bati.patch
rename to debian/patches/0004-Use-system-awt-gradient-instead-of-the-embedded-batik.patch
index 0bdb6b0..65b45d4 100644
--- a/debian/patches/0004-Use-system-awt-gradient-instead-of-the-embedded-bati.patch
+++ b/debian/patches/0004-Use-system-awt-gradient-instead-of-the-embedded-batik.patch
@@ -1,30 +1,20 @@
-From: Nicolas Dandrimont <Nicolas.Dandrimont at crans.org>
-Date: Mon, 7 Mar 2011 00:13:13 +0100
-Subject: Use system awt gradient instead of the embedded batik code copy
-
-Upstream embeds batik as a backwards-compatibility measure, as the
-Gradient classes used were added to java.awt in JDK6.
----
- .../main/java/com/kitfox/svg/LinearGradient.java | 21 ++++++++-----------
- .../main/java/com/kitfox/svg/RadialGradient.java | 21 ++++++++-----------
- 2 files changed, 18 insertions(+), 24 deletions(-)
-
-diff --git a/svg-core/src/main/java/com/kitfox/svg/LinearGradient.java b/svg-core/src/main/java/com/kitfox/svg/LinearGradient.java
-index 06a1503..bdfe724 100644
+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: no (upstream requires only java4)
+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
-@@ -34,9 +34,6 @@ import java.awt.*;
- import com.kitfox.svg.xml.*;
- import org.xml.sax.*;
-
--//import org.apache.batik.ext.awt.*;
--import com.kitfox.svg.batik.*;
--
+@@ -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
-@@ -95,32 +92,32 @@ public class LinearGradient extends Gradient {
-
+@@ -96,18 +98,18 @@
+
public Paint getPaint(Rectangle2D bounds, AffineTransform xform)
{
- com.kitfox.svg.batik.MultipleGradientPaint.CycleMethodEnum method;
@@ -46,31 +36,30 @@ index 06a1503..bdfe724 100644
break;
}
-- com.kitfox.svg.batik.LinearGradientPaint paint;
-+ LinearGradientPaint paint;
- if (gradientUnits == GU_USER_SPACE_ON_USE)
+@@ -120,13 +122,13 @@
+ paint = colors.length > 0 ? colors[0] : Color.black;
+ } else if (gradientUnits == GU_USER_SPACE_ON_USE)
{
- // paint = new LinearGradientPaint(x1, y1, x2, y2, getStopFractions(), getStopColors(), method);
- paint = new com.kitfox.svg.batik.LinearGradientPaint(
+ paint = new LinearGradientPaint(
- new Point2D.Float(x1, y1),
- new Point2D.Float(x2, y2),
+ pt1,
+ pt2,
getStopFractions(),
getStopColors(),
method,
- com.kitfox.svg.batik.MultipleGradientPaint.SRGB,
+ MultipleGradientPaint.ColorSpaceType.SRGB,
- gradientTransform);
- }
- else
-@@ -137,13 +134,13 @@ public class LinearGradient extends Gradient {
-
- viewXform.concatenate(gradientTransform);
+ gradientTransform == null
+ ? new AffineTransform()
+ : gradientTransform);
+@@ -145,13 +147,13 @@
+ viewXform.concatenate(gradientTransform);
+ }
- paint = new com.kitfox.svg.batik.LinearGradientPaint(
+ paint = new LinearGradientPaint(
- new Point2D.Float(x1, y1),
- new Point2D.Float(x2, y2),
+ pt1,
+ pt2,
getStopFractions(),
getStopColors(),
method,
@@ -79,22 +68,20 @@ index 06a1503..bdfe724 100644
viewXform);
}
-diff --git a/svg-core/src/main/java/com/kitfox/svg/RadialGradient.java b/svg-core/src/main/java/com/kitfox/svg/RadialGradient.java
-index 37b9414..52521cc 100644
--- a/svg-core/src/main/java/com/kitfox/svg/RadialGradient.java
+++ b/svg-core/src/main/java/com/kitfox/svg/RadialGradient.java
-@@ -34,9 +34,6 @@ import java.awt.*;
- import com.kitfox.svg.xml.*;
- import org.xml.sax.*;
-
--//import org.apache.batik.ext.awt.*;
--import com.kitfox.svg.batik.*;
--
+@@ -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
-@@ -101,33 +98,33 @@ public class RadialGradient extends Gradient {
-
+@@ -106,18 +109,18 @@
+
public Paint getPaint(Rectangle2D bounds, AffineTransform xform)
{
- com.kitfox.svg.batik.MultipleGradientPaint.CycleMethodEnum method;
@@ -116,33 +103,32 @@ index 37b9414..52521cc 100644
break;
}
-- com.kitfox.svg.batik.RadialGradientPaint paint;
-+ RadialGradientPaint paint;
-
+@@ -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(
- new Point2D.Float(cx, cy),
+ pt1,
r,
- new Point2D.Float(fx, fy),
+ pt2,
getStopFractions(),
getStopColors(),
method,
- com.kitfox.svg.batik.MultipleGradientPaint.SRGB,
+ MultipleGradientPaint.ColorSpaceType.SRGB,
gradientTransform);
- }
- else
-@@ -138,14 +135,14 @@ public class RadialGradient extends Gradient {
+ } else
+ {
+@@ -143,14 +146,14 @@
viewXform.concatenate(gradientTransform);
- paint = new com.kitfox.svg.batik.RadialGradientPaint(
+ paint = new RadialGradientPaint(
- new Point2D.Float(cx, cy),
+ pt1,
r,
- new Point2D.Float(fx, fy),
+ pt2,
getStopFractions(),
getStopColors(),
method,
@@ -151,4 +137,3 @@ index 37b9414..52521cc 100644
viewXform);
}
---
diff --git a/debian/patches/0005-dont-call-netbeans-ant-tasks.patch b/debian/patches/0005-dont-call-netbeans-ant-tasks.patch
new file mode 100644
index 0000000..6f236ca
--- /dev/null
+++ b/debian/patches/0005-dont-call-netbeans-ant-tasks.patch
@@ -0,0 +1,14 @@
+Description: Skip some netbeans ant tasks by setting mkdist.disabled:=true
+Author: Felix Natter <fnatter at gmx.net>
+Forwarded: not-needed
+Last-Update: 2016-07-23
+--- a/svg-core/build.xml
++++ b/svg-core/build.xml
+@@ -79,6 +79,7 @@
+ <property name="www.dir" location="../www"/>
+ <property name="project.www.jar" value="${www.dir}/binaries/svgSalamander.jar"/>
+ <property name="project.tiny.jar" value="${www.dir}/binaries/svgSalamander-tiny.jar"/>
++ <property name="mkdist.disabled" value="true"/>
+
+ <target name="-pre-compile">
+ <mkdir dir="${animtime.outdir}"/>
diff --git a/debian/patches/0006-modify-broken-upstream-pom.patch b/debian/patches/0006-modify-broken-upstream-pom.patch
new file mode 100644
index 0000000..ac78006
--- /dev/null
+++ b/debian/patches/0006-modify-broken-upstream-pom.patch
@@ -0,0 +1,172 @@
+Description: Fix version and remove build information and ant dependency
+ in outdated upstream pom.xml (outdated according to author)
+Author: Felix Natter <fnatter at gmx.net>
+Forwarded: <URL|no|not-needed, useless if you have a Bug field, optional>
+Last-Update: 2016-07-29
+--- a/svg-core/pom.xml
++++ b/svg-core/pom.xml
+@@ -11,7 +11,7 @@
+ <!-- TODO Mark: replace with com.kitfox -->
+ <groupId>com.kitfox</groupId>
+ <artifactId>kitfox-svg-salamander</artifactId>
+- <version>1.0.39</version>
++ <version>1.0.0</version>
+ <packaging>jar</packaging>
+
+ <name>${project.artifactId}</name>
+@@ -22,7 +22,7 @@
+ <!-- TODO Mark: set actual year -->
+ <inceptionYear>2011</inceptionYear>
+
+- <url>http://java.net/projects/svgsalamander</url>
++ <url>https://github.com/blackears/svgSalamander/</url>
+
+ <organization>
+ <name>Kitfox Studios</name>
+@@ -77,146 +77,4 @@
+
+ </properties>
+
+- <dependencies>
+-
+- <!-- TODO Mark: do you really need to depend on this? -->
+- <dependency>
+- <groupId>org.apache.ant</groupId>
+- <artifactId>ant</artifactId>
+- <version>1.8.1</version>
+- </dependency>
+-
+- </dependencies>
+-
+- <build>
+-
+- <!-- location of MAIN sources & resources -->
+- <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
+- <resources>
+- <resource>
+- <directory>${basedir}/src/main/res</directory>
+- </resource>
+- </resources>
+-
+- <!-- location of TEST sources & resources -->
+- <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
+- <testResources>
+- <testResource>
+- <directory>${basedir}/src/test/res</directory>
+- </testResource>
+- </testResources>
+-
+- <plugins>
+-
+- <!-- generated code: animation parser; see for more settings: http://mojo.codehaus.org/javacc-maven-plugin/javacc-mojo.html -->
+- <plugin>
+- <groupId>org.codehaus.mojo</groupId>
+- <artifactId>javacc-maven-plugin</artifactId>
+- <version>2.6</version>
+- <executions>
+- <execution>
+- <id>javacc</id>
+- <phase>generate-sources</phase>
+- <goals>
+- <goal>javacc</goal>
+- </goals>
+- <configuration>
+- <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
+- <includes>
+- <include>**/*.jjt</include>
+- </includes>
+- </configuration>
+- </execution>
+- </executions>
+- </plugin>
+-
+- <!-- enforce java version -->
+- <plugin>
+- <groupId>org.apache.maven.plugins</groupId>
+- <artifactId>maven-compiler-plugin</artifactId>
+- <version>2.3.2</version>
+- <configuration>
+- <source>1.6</source>
+- <target>1.6</target>
+- </configuration>
+- </plugin>
+-
+- <!-- enforce maven version -->
+- <plugin>
+- <groupId>org.apache.maven.plugins</groupId>
+- <artifactId>maven-enforcer-plugin</artifactId>
+- <version>1.0</version>
+- <executions>
+- <execution>
+- <id>enforce-maven-version</id>
+- <goals>
+- <goal>enforce</goal>
+- </goals>
+- <configuration>
+- <rules>
+- <requireMavenVersion>
+- <version>[3.0,)</version>
+- <message>you-must-run-maven-3.0-or-above</message>
+- </requireMavenVersion>
+- </rules>
+- </configuration>
+- </execution>
+- </executions>
+- </plugin>
+-
+-
+- <plugin>
+- <!-- generate javadoc -->
+- <groupId>org.apache.maven.plugins</groupId>
+- <artifactId>maven-javadoc-plugin</artifactId>
+- <version>2.7</version>
+- <configuration>
+- <quiet>true</quiet>
+- <verbose>false</verbose>
+- <links>
+- <show>public</show>
+- <link>http://java.sun.com/javase/1.6.0/docs/api</link>
+- </links>
+- <linksource>true</linksource>
+- <detectLinks>true</detectLinks>
+- <windowtitle>${project.name} API ${project.version} /
+- ${maven.build.timestamp}</windowtitle>
+- <doctitle>${project.name} API ${project.version} /
+- ${maven.build.timestamp}</doctitle>
+- <header><![CDATA[<a href="${project.organization.url}" target="_blank">${project.organization.name}</a>]]></header>
+- <footer><![CDATA[<a href="${project.organization.url}" target="_blank">${project.organization.name}</a>]]></footer>
+- <bottom>
+- <!-- note: these "years" are internal javadoc plugin tags -->
+- Copyright © {inceptionYear}-{currentYear}
+- <![CDATA[<a href="${project.organization.url}" target="_blank">${project.organization.name}</a>]]>.
+- All Rights Reserved.
+- </bottom>
+- </configuration>
+- </plugin>
+-
+- <plugin>
+- <!-- generate source -->
+- <groupId>org.apache.maven.plugins</groupId>
+- <artifactId>maven-source-plugin</artifactId>
+- <version>2.1.2</version>
+- <configuration>
+- </configuration>
+- </plugin>
+-
+- <plugin>
+- <!-- release to sonaytype staging repo -->
+- <groupId>org.apache.maven.plugins</groupId>
+- <artifactId>maven-release-plugin</artifactId>
+- <configuration>
+- <!-- used by release:prepare -->
+- <preparationGoals>clean verify</preparationGoals>
+- <!-- used by release:perform -->
+- <goals>deploy</goals>
+- </configuration>
+- </plugin>
+-
+- </plugins>
+-
+- </build>
+-
+ </project>
diff --git a/debian/patches/series b/debian/patches/series
index a1749da..0c0e5be 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,6 @@
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-bati.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
More information about the pkg-java-commits
mailing list