diff options
-rw-r--r-- | recipes-core/classpathx/gnujaf-1.1.1/MimeType-symbols-fix.patch | 51 | ||||
-rw-r--r-- | recipes-core/classpathx/gnujaf_1.1.1.bb | 3 |
2 files changed, 53 insertions, 1 deletions
diff --git a/recipes-core/classpathx/gnujaf-1.1.1/MimeType-symbols-fix.patch b/recipes-core/classpathx/gnujaf-1.1.1/MimeType-symbols-fix.patch new file mode 100644 index 0000000..d94f5a3 --- /dev/null +++ b/recipes-core/classpathx/gnujaf-1.1.1/MimeType-symbols-fix.patch @@ -0,0 +1,51 @@ +Fix build errors when using different javac then jamvm + +like + +| source/javax/activation/MimeTypeParameterList.java:128: error: cannot find symbol +| MimeType.checkValidity(name, "Parameter name is invalid"); +| ^ +| symbol: method checkValidity(String,String) +| location: class MimeType +| source/javax/activation/MimeType.java:262: error: no suitable constructor found for MimeTypeParseException(String,String) +| throw new MimeTypeParseException(message, token); +| ^ + + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Index: activation-1.1.1/source/javax/activation/MimeType.java +=================================================================== +--- activation-1.1.1.orig/source/javax/activation/MimeType.java 2006-05-13 02:50:11.000000000 -0700 ++++ activation-1.1.1/source/javax/activation/MimeType.java 2013-05-23 21:20:33.181013888 -0700 +@@ -253,7 +253,7 @@ + checkValidity(subType, "Sub type is invalid"); + } + +- static void checkValidity(String token, String message) ++ public static void checkValidity(String token, String message) + throws MimeTypeParseException + { + int len = token.length(); +@@ -271,7 +271,7 @@ + } + } + +- static boolean isValidChar(char c) ++ public static boolean isValidChar(char c) + { + return c > ' ' && c <= '~' && TSPECIALS.indexOf(c) == -1; + } +Index: activation-1.1.1/source/javax/activation/MimeTypeParseException.java +=================================================================== +--- activation-1.1.1.orig/source/javax/activation/MimeTypeParseException.java 2006-05-13 02:50:11.000000000 -0700 ++++ activation-1.1.1/source/javax/activation/MimeTypeParseException.java 2013-05-23 21:21:14.745013916 -0700 +@@ -58,7 +58,7 @@ + * @param message the exception message + * @param token the token in error + */ +- MimeTypeParseException(String message, String token) ++ public MimeTypeParseException(String message, String token) + { + this(new StringBuffer(message) + .append(':') diff --git a/recipes-core/classpathx/gnujaf_1.1.1.bb b/recipes-core/classpathx/gnujaf_1.1.1.bb index d6b9e0f..69681b4 100644 --- a/recipes-core/classpathx/gnujaf_1.1.1.bb +++ b/recipes-core/classpathx/gnujaf_1.1.1.bb @@ -7,6 +7,7 @@ PR = "r1" SRC_URI = "http://ftp.gnu.org/gnu/classpathx/activation-${PV}.tar.gz \ file://datadir_java.patch \ + file://MimeType-symbols-fix.patch \ " inherit autotools java-library @@ -26,7 +27,7 @@ do_compile() { javac -sourcepath source -d build `find source -name "*.java"` - fastjar -C build -c -f ${JARFILENAME} . + fastjar cf ${JARFILENAME} -C build . } SRC_URI[md5sum] = "de50d7728e8140eb404f2b4554321f8c" |