[batik] 02/03: Fix "batik is crashing (libbatik-java)" by patching build.xml to specify classpaths as appropriate for Debian (Closes: #605063)
Christopher Stuart Hoskin
mans0954 at moszumanska.debian.org
Sun Sep 3 21:29:07 UTC 2017
This is an automated email from the git hooks/post-receive script.
mans0954 pushed a commit to branch master
in repository batik.
commit 30a01c4c12f641c179ac98d15ce863d26de81978
Author: Christopher Hoskin <mans0954 at debian.org>
Date: Sun Sep 3 22:23:42 2017 +0100
Fix "batik is crashing (libbatik-java)" by patching build.xml to specify classpaths as appropriate for Debian (Closes: #605063)
---
debian/changelog | 2 +
debian/patches/classpath.patch | 145 +++++++++++++++++++++++++++++++++++++++++
debian/patches/remove-js.patch | 26 --------
debian/patches/series | 2 +-
4 files changed, 148 insertions(+), 27 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0d103c2..498f926 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ batik (1.9-1) UNRELEASED; urgency=medium
+ Add debian/debian/libbatik-java.poms, call mh_install to install jars
and poms, for closer alignment to other pkg-java packages
* Fix spellings in debian/manpages/rasterizer.1
+ * Fix "batik is crashing (libbatik-java)" by patching build.xml to specify
+ classpaths as appropriate for Debian (Closes: #605063)
-- Christopher Hoskin <mans0954 at debian.org> Sun, 03 Sep 2017 16:39:56 +0100
diff --git a/debian/patches/classpath.patch b/debian/patches/classpath.patch
new file mode 100644
index 0000000..fd6eeee
--- /dev/null
+++ b/debian/patches/classpath.patch
@@ -0,0 +1,145 @@
+Subject: Set classpath for jars to /usr/share/java
+ Upstream bundles dependencies as jar files in libs/, which are removed during
+ repack. Modify classpaths in build.xml to use /usr/share/java/ instead.
+Forwarded: not-needed
+Author: Christopher Hoskin <mans0954 at debian.org>
+Last-Update: 2017-09-03
+
+--- a/build.xml
++++ b/build.xml
+@@ -87,7 +87,7 @@
+ <property name="revisionType" value="" />
+ <property name="revisionNumber" value="" />
+ <property name="completeVersion" value="${version}${revisionType}${revisionNumber}" />
+- <property name="xgcVersion" value="2.2" />
++ <property name="xgcVersion" value="2.1" />
+ <property name="fopVersion" value="2.2" />
+ <property name="vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/batik/)" />
+
+@@ -1048,13 +1048,20 @@
+ <!-- All batik in a single jar (dependencies: none) -->
+ <target name="all-jar" depends="init, compile, prepare-build"
+ description="Creates a combined JAR file of the Batik libraries in ${build}/lib">
+- <jar jarfile="${build}/lib/${project}-all-${completeVersion}.jar">
++ <jar flattenAttributes="true" jarfile="${build}/lib/${project}-all-${completeVersion}.jar">
+ <manifest>
+ <attribute name="Implementation-Title" value="Batik all-in-one JAR"/>
+ <attribute name="Implementation-Version" value="${completeVersion}"/>
+ <attribute name="Implementation-Vendor" value="${vendor}"/>
+ <attribute name="Build-Id" value="${build.id}"/>
+ <attribute name="Main-Class" value="${class-prefix}.apps.svgbrowser.Main"/>
++ <attribute name="Class-Path" value="/usr/share/java/xercesImpl-2.9.1.jar" />
++ <attribute name="Class-Path" value="/usr/share/java/xalan-2.7.2.jar" />
++ <attribute name="Class-Path" value="/usr/share/java/xml-apis-1.3.04.jar" />
++ <attribute name="Class-Path" value="/usr/share/java/xml-apis-ext-1.3.04.jar" />
++ <attribute name="Class-Path" value="/usr/share/java/js.jar" />
++ <attribute name="Class-Path" value="/usr/share/java/fop-transcoder-allinone-${fopVersion}.jar" />
++ <attribute name="Class-Path" value="/usr/share/java/xmlgraphics-commons-${xgcVersion}.jar" />
+ </manifest>
+ <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
+ <fileset dir="${dest}" excludes="**/.svn/">
+@@ -1714,7 +1721,7 @@
+ <!-- SVG Pretty-printer (dependencies: ???) -->
+ <target name="svg-pp-jar" depends="init, compile, prepare-build">
+ <antcall target = "svg-pp-jar-call">
+- <param name="jarsLibDir" value="lib/" />
++ <param name="jarsLibDir" value="/usr/share/java/" />
+ <param name="jarVersion" value="${completeVersion}" />
+ <param name="svg-ppJar" value= "${build}/${project}-svgpp-${completeVersion}.jar" />
+ </antcall>
+@@ -1736,7 +1743,7 @@
+ <attribute name="Class-Path" value="${jarsLibDir}${project}-util-${jarVersion}.jar" />
+ <attribute name="Class-Path" value="${jarsLibDir}${project}-xml-${jarVersion}.jar" />
+ <attribute name="Class-Path" value="${jarsLibDir}xml-apis-1.3.04.jar" />
+- <attribute name="Class-Path" value="${jarsLibDir}xml-apis-ext-1.3.04.jar" />
++ <attribute name="Class-Path" value="${jarsLibDir}xml-apis-ext.jar" />
+ </manifest>
+ <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
+ <fileset dir="${dest}">
+@@ -1751,7 +1758,7 @@
+ <!-- SVG Slide-show (dependencies: ???) -->
+ <target name="svg-slideshow-jar" depends="init, compile, prepare-build">
+ <antcall target="svg-slideshow-jar-call">
+- <param name="jarsLibDir" value="lib/" />
++ <param name="jarsLibDir" value="/usr/share/java/" />
+ <param name="jarVersion" value="${completeVersion}" />
+ <param name="svg-slideshowJar" value= "${build}/${project}-slideshow-${completeVersion}.jar"/>
+ </antcall>
+@@ -1782,10 +1789,10 @@
+ <attribute name="Class-Path" value="${jarsLibDir}${project}-codec-${jarVersion}.jar" />
+ <attribute name="Class-Path" value="${jarsLibDir}${project}-util-${jarVersion}.jar" />
+ <attribute name="Class-Path" value="${jarsLibDir}${project}-xml-${jarVersion}.jar" />
+- <attribute name="Class-Path" value="${jarsLibDir}xerces_2_5_0.jar" />
+- <attribute name="Class-Path" value="${jarsLibDir}xalan-2.7.0.jar" />
++ <attribute name="Class-Path" value="${jarsLibDir}xercesImpl.jar" />
++ <attribute name="Class-Path" value="${jarsLibDir}xalan2.jar" />
+ <attribute name="Class-Path" value="${jarsLibDir}xml-apis-1.3.04.jar" />
+- <attribute name="Class-Path" value="${jarsLibDir}xml-apis-ext-1.3.04.jar" />
++ <attribute name="Class-Path" value="${jarsLibDir}xml-apis-ext.jar" />
+ <attribute name="Class-Path" value="${jarsLibDir}xmlgraphics-commons-${xgcVersion}.jar"/>
+ </manifest>
+ <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
+@@ -1802,7 +1809,7 @@
+ <!-- Squiggle (dependencies: all) -->
+ <target name="squiggle-jar" depends="init, compile, prepare-build">
+ <antcall target="squiggle-jar-call">
+- <param name="jarsLibDir" value="lib/" />
++ <param name="jarsLibDir" value="/usr/share/java/" />
+ <param name="jarVersion" value="${completeVersion}" />
+ <param name="squiggleJar" value="${build}/${project}-squiggle-${completeVersion}.jar" />
+ </antcall>
+@@ -1840,10 +1847,10 @@
+ <attribute name="Class-Path" value="${jarsLibDir}${project}-codec-${jarVersion}.jar" />
+ <attribute name="Class-Path" value="${jarsLibDir}${project}-util-${jarVersion}.jar" />
+ <attribute name="Class-Path" value="${jarsLibDir}${project}-xml-${jarVersion}.jar" />
+- <attribute name="Class-Path" value="${jarsLibDir}xerces_2_5_0.jar" />
+- <attribute name="Class-Path" value="${jarsLibDir}xalan-2.7.0.jar" />
++ <attribute name="Class-Path" value="${jarsLibDir}xercesImpl.jar" />
++ <attribute name="Class-Path" value="${jarsLibDir}xalan2.jar" />
+ <attribute name="Class-Path" value="${jarsLibDir}xml-apis-1.3.04.jar" />
+- <attribute name="Class-Path" value="${jarsLibDir}xml-apis-ext-1.3.04.jar" />
++ <attribute name="Class-Path" value="${jarsLibDir}xml-apis-ext.jar" />
+ <attribute name="Class-Path" value="${jarsLibDir}js.jar" />
+ <attribute name="Class-Path" value="${jarsLibDir}xmlgraphics-commons-${xgcVersion}.jar"/>
+ </manifest>
+@@ -1872,7 +1879,7 @@
+ <target name="squiggle-ext-jar" depends="init, squiggle-jar">
+ <mkdir dir="${build}/extensions"/>
+ <antcall target="squiggle-ext-jar-call">
+- <param name="jarsLibDir" value="lib/" />
++ <param name="jarsLibDir" value="/usr/share/java/" />
+ <param name="jarVersion" value="" />
+ <param name="squiggle-extJar" value="${build}/extensions/${project}-squiggle-ext-${completeVersion}.jar" />
+ </antcall>
+@@ -1913,7 +1920,7 @@
+ <!-- Rasterizer (dependencies: all except GUI util) -->
+ <target name="rasterizer-jar" depends="init, compile, prepare-build">
+ <antcall target="rasterizer-jar-call">
+- <param name="jarsLibDir" value="lib/" />
++ <param name="jarsLibDir" value="/usr/share/java/" />
+ <param name="jarVersion" value="${completeVersion}" />
+ <param name="rasterizerJar" value="${build}/${project}-rasterizer-${completeVersion}.jar" />
+ </antcall>
+@@ -1950,10 +1957,10 @@
+ <attribute name="Class-Path" value="${jarsLibDir}${project}-codec-${jarVersion}.jar" />
+ <attribute name="Class-Path" value="${jarsLibDir}${project}-util-${jarVersion}.jar" />
+ <attribute name="Class-Path" value="${jarsLibDir}${project}-xml-${jarVersion}.jar" />
+- <attribute name="Class-Path" value="${jarsLibDir}xerces_2_5_0.jar" />
+- <attribute name="Class-Path" value="${jarsLibDir}xalan-2.7.0.jar" />
++ <attribute name="Class-Path" value="${jarsLibDir}xercesImpl.jar" />
++ <attribute name="Class-Path" value="${jarsLibDir}xalan2.jar" />
+ <attribute name="Class-Path" value="${jarsLibDir}xml-apis-1.3.04.jar" />
+- <attribute name="Class-Path" value="${jarsLibDir}xml-apis-ext-1.3.04.jar" />
++ <attribute name="Class-Path" value="${jarsLibDir}xml-apis-ext.jar" />
+ <attribute name="Class-Path" value="${jarsLibDir}js.jar" />
+ <attribute name="Class-Path" value="${jarsLibDir}fop-transcoder-allinone-${fopVersion}.jar" />
+ <attribute name="Class-Path" value="${jarsLibDir}xmlgraphics-commons-${xgcVersion}.jar" />
+@@ -2018,7 +2025,7 @@
+ <!-- batik-ttf2svg.jar (dependencies: all) -->
+ <target name="ttf2svg-jar" depends="init, compile, prepare-build">
+ <antcall target="ttf2svg-jar-call" >
+- <param name="jarsLibDir" value="lib/" />
++ <param name="jarsLibDir" value="/usr/share/java/" />
+ <param name="jarVersion" value="${completeVersion}" />
+ <param name="ttf2svgJar" value="${build}/${project}-ttf2svg-${completeVersion}.jar"/>
+ </antcall>
diff --git a/debian/patches/remove-js.patch b/debian/patches/remove-js.patch
deleted file mode 100644
index f100836..0000000
--- a/debian/patches/remove-js.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Date: Mon, 14 Oct 2013 14:59:02 +0200
-Subject: remove-js
-
-===================================================================
----
- build.xml | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-Index: batik-1.8/build.xml
-===================================================================
---- batik-1.8.orig/build.xml
-+++ batik-1.8/build.xml
-@@ -720,9 +720,9 @@ JAVA=/usr/bin/java
- <copy file="${src}/${project}-xml.pom.template" tofile="${maven}/${project}-xml/${completeVersion}/${project}-xml-${completeVersion}.pom" filtering="true"/>
- <copy file="${build}/lib/${project}-xml-${completeVersion}.jar" tofile="${maven}/${project}-xml/${completeVersion}/${project}-xml-${completeVersion}.jar"/>
-
-- <mkdir dir="${maven}/${project}-js/${completeVersion}"/>
-- <copy file="${src}/${project}-js.pom.template" tofile="${maven}/${project}-js/${completeVersion}/${project}-js-${completeVersion}.pom" filtering="true"/>
-- <copy file="${build}/lib/js.jar" tofile="${maven}/${project}-js/${completeVersion}/${project}-js-${completeVersion}.jar"/>
-+ <!--mkdir dir="${maven}/${project}-js/${completeVersion}"/-->
-+ <!--copy file="${src}/${project}-js.pom.template" tofile="${maven}/${project}-js/${completeVersion}/${project}-js-${completeVersion}.pom" filtering="true"/-->
-+ <!--copy file="${build}/lib/js.jar" tofile="${maven}/${project}-js/${completeVersion}/${project}-js-${completeVersion}.jar"/-->
-
- <!-- Generate checksums of all artifacts and POMs -->
- <checksum algorithm="MD5" fileext=".md5">
diff --git a/debian/patches/series b/debian/patches/series
index 65321d0..13c5c4e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
#06_fix_paths_in_policy_files.patch
#source-1.5.patch
-#remove-js.patch
#bug805469.patch
+classpath.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/batik.git
More information about the pkg-java-commits
mailing list