summaryrefslogtreecommitdiffstats
path: root/recipes-core/classpathx
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2013-05-24 13:39:28 -0700
committerHenning Heinold <heinold@inf.fu-berlin.de>2013-09-29 21:50:36 +0200
commit2abf8524c81d3e0e4ec5004721fdc74479bb2790 (patch)
tree3914ccf4e6256edd58c21d1aa3498c9e63939784 /recipes-core/classpathx
parentb81f7aafb3f8047faf89b1dd089062bcf2035462 (diff)
downloadmeta-java-2abf8524c81d3e0e4ec5004721fdc74479bb2790.tar.gz
gnujaf: Fix building with java7
When using different javac which used java 1.7 gnujaf would not compile error details are in patch header. Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes-core/classpathx')
-rw-r--r--recipes-core/classpathx/gnujaf-1.1.1/MimeType-symbols-fix.patch51
-rw-r--r--recipes-core/classpathx/gnujaf_1.1.1.bb3
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 @@
1Fix build errors when using different javac then jamvm
2
3like
4
5| source/javax/activation/MimeTypeParameterList.java:128: error: cannot find symbol
6| MimeType.checkValidity(name, "Parameter name is invalid");
7| ^
8| symbol: method checkValidity(String,String)
9| location: class MimeType
10| source/javax/activation/MimeType.java:262: error: no suitable constructor found for MimeTypeParseException(String,String)
11| throw new MimeTypeParseException(message, token);
12| ^
13
14
15Upstream-Status: Pending
16Signed-off-by: Khem Raj <raj.khem@gmail.com>
17Index: activation-1.1.1/source/javax/activation/MimeType.java
18===================================================================
19--- activation-1.1.1.orig/source/javax/activation/MimeType.java 2006-05-13 02:50:11.000000000 -0700
20+++ activation-1.1.1/source/javax/activation/MimeType.java 2013-05-23 21:20:33.181013888 -0700
21@@ -253,7 +253,7 @@
22 checkValidity(subType, "Sub type is invalid");
23 }
24
25- static void checkValidity(String token, String message)
26+ public static void checkValidity(String token, String message)
27 throws MimeTypeParseException
28 {
29 int len = token.length();
30@@ -271,7 +271,7 @@
31 }
32 }
33
34- static boolean isValidChar(char c)
35+ public static boolean isValidChar(char c)
36 {
37 return c > ' ' && c <= '~' && TSPECIALS.indexOf(c) == -1;
38 }
39Index: activation-1.1.1/source/javax/activation/MimeTypeParseException.java
40===================================================================
41--- activation-1.1.1.orig/source/javax/activation/MimeTypeParseException.java 2006-05-13 02:50:11.000000000 -0700
42+++ activation-1.1.1/source/javax/activation/MimeTypeParseException.java 2013-05-23 21:21:14.745013916 -0700
43@@ -58,7 +58,7 @@
44 * @param message the exception message
45 * @param token the token in error
46 */
47- MimeTypeParseException(String message, String token)
48+ public MimeTypeParseException(String message, String token)
49 {
50 this(new StringBuffer(message)
51 .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"
7 7
8SRC_URI = "http://ftp.gnu.org/gnu/classpathx/activation-${PV}.tar.gz \ 8SRC_URI = "http://ftp.gnu.org/gnu/classpathx/activation-${PV}.tar.gz \
9 file://datadir_java.patch \ 9 file://datadir_java.patch \
10 file://MimeType-symbols-fix.patch \
10 " 11 "
11 12
12inherit autotools java-library 13inherit autotools java-library
@@ -26,7 +27,7 @@ do_compile() {
26 27
27 javac -sourcepath source -d build `find source -name "*.java"` 28 javac -sourcepath source -d build `find source -name "*.java"`
28 29
29 fastjar -C build -c -f ${JARFILENAME} . 30 fastjar cf ${JARFILENAME} -C build .
30} 31}
31 32
32SRC_URI[md5sum] = "de50d7728e8140eb404f2b4554321f8c" 33SRC_URI[md5sum] = "de50d7728e8140eb404f2b4554321f8c"