[pkg-eucalyptus-maintainers] Bug#686785: wsdl2c: fails to build with openjdk 7

[Colin Watson]

tags 686785 patch
user ubuntu-devel at lists.ubuntu.com
usertags 686785 origin-ubuntu ubuntu-patch quantal
thanks

On Wed, Sep 05, 2012 at 08:22:06PM +0200, Julian Taylor wrote:
> wsdl2c fails to build with openjdk-7
> The issue appears as warning in openjdk-6 but is an error in 7.
[...]
> a similar failure was recently fixed in the scilab package.

I applied much the same fix as in scilab.  This exposed a further set of
errors to the effect that javax.servlet was missing, so I added a
build-dependency on libservlet3.0-java too.

  * Force encoding to UTF-8 to fix build failure in
    src/org/apache/axis2/transport/http/MultipartFormDataFormatter.java
    (closes: #686785).
  * Build-depend on libservlet3.0-java.

diff -Nru wsdl2c-0.1/debian/control wsdl2c-0.1/debian/control
--- wsdl2c-0.1/debian/control	2012-06-23 05:42:15.000000000 +0100
+++ wsdl2c-0.1/debian/control	2012-10-01 11:30:50.000000000 +0100
@@ -17,7 +17,8 @@
                libgnumail-java,
                libhttpcore-java,
                libjaxen-java,
-               libwsdl4j-java
+               libwsdl4j-java,
+               libservlet3.0-java
 Standards-Version: 3.9.3
 Homepage: https://github.com/a13m/wsdl2c
 
diff -Nru wsdl2c-0.1/debian/patches/encoding.patch wsdl2c-0.1/debian/patches/encoding.patch
--- wsdl2c-0.1/debian/patches/encoding.patch	1970-01-01 01:00:00.000000000 +0100
+++ wsdl2c-0.1/debian/patches/encoding.patch	2012-10-01 11:24:07.000000000 +0100
@@ -0,0 +1,19 @@
+Description: Force encoding to UTF-8
+Author: Colin Watson <cjwatson at ubuntu.com>
+Bug-Debian: http://bugs.debian.org/686785
+Forwarded: no
+Last-Update: 2012-10-01
+
+Index: b/build.xml
+===================================================================
+--- a/build.xml
++++ b/build.xml
+@@ -6,7 +6,7 @@
+   <target name="compile">
+     <mkdir dir="${build.dir}"/>
+     <mkdir dir="${build.classes}"/>
+-    <javac srcdir="${src.dir}" destdir="${build.classes}">
++    <javac srcdir="${src.dir}" destdir="${build.classes}" encoding="UTF-8">
+       <include name="**/*.java"/>
+     </javac>
+     <copy todir="${build.classes}">
diff -Nru wsdl2c-0.1/debian/patches/series wsdl2c-0.1/debian/patches/series
--- wsdl2c-0.1/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ wsdl2c-0.1/debian/patches/series	2012-10-01 11:22:38.000000000 +0100
@@ -0,0 +1 @@
+encoding.patch

Thanks,

-- 
Colin Watson                                       [cjwatson at ubuntu.com]