merge of '0d3b0d788fccfc1c07e0da07e8f8596c062e2ef2'

     and '8a4df13bdb5d6b154edb85a4b71e38ac457670a0'

9 files changed, 108 insertions, 55 deletions

diff --git a/packages/classpath/classpath-0.97.2/autotools.patch b/packages/classpath/classpath-0.97.2/autotools.patch
index 3df65cf892..e36e143b5f 100644
--- a/packages/classpath/classpath-0.97.2/autotools.patch
+++ b/packages/classpath/classpath-0.97.2/autotools.patch
@@ -11,16 +11,3 @@ Index: classpath-0.97.2/configure.ac
  dnl -----------------------------------------------------------
  dnl Enable collections.jar (disabled by default)
  dnl -----------------------------------------------------------
-Index: classpath-0.97.2/Makefile.am
-===================================================================
---- classpath-0.97.2.orig/Makefile.am	2008-06-01 20:47:05.000000000 +0200
-+++ classpath-0.97.2/Makefile.am	2008-08-02 00:58:39.004023720 +0200
-@@ -5,7 +5,7 @@
- DIST_SUBDIRS = lib doc external include native resource scripts tools examples
- 
- # Allow users to pass site-specific flags to autoreconf via an env var. 
--ACLOCAL_AMFLAGS = -I m4 ${LOCAL_AUTORECONF_FLAGS}
-+ACLOCAL_AMFLAGS = -I m4 --install ${LOCAL_AUTORECONF_FLAGS}
- 
- native: lib
- 
diff --git a/packages/classpath/classpath-minimal-0.97.2/autotools.patch b/packages/classpath/classpath-minimal-0.97.2/autotools.patch
index 3df65cf892..e36e143b5f 100644
--- a/packages/classpath/classpath-minimal-0.97.2/autotools.patch
+++ b/packages/classpath/classpath-minimal-0.97.2/autotools.patch
@@ -11,16 +11,3 @@ Index: classpath-0.97.2/configure.ac
  dnl -----------------------------------------------------------
  dnl Enable collections.jar (disabled by default)
  dnl -----------------------------------------------------------
-Index: classpath-0.97.2/Makefile.am
-===================================================================
---- classpath-0.97.2.orig/Makefile.am	2008-06-01 20:47:05.000000000 +0200
-+++ classpath-0.97.2/Makefile.am	2008-08-02 00:58:39.004023720 +0200
-@@ -5,7 +5,7 @@
- DIST_SUBDIRS = lib doc external include native resource scripts tools examples
- 
- # Allow users to pass site-specific flags to autoreconf via an env var. 
--ACLOCAL_AMFLAGS = -I m4 ${LOCAL_AUTORECONF_FLAGS}
-+ACLOCAL_AMFLAGS = -I m4 --install ${LOCAL_AUTORECONF_FLAGS}
- 
- native: lib
- 
diff --git a/packages/classpath/classpath-minimal_0.97.2.bb b/packages/classpath/classpath-minimal_0.97.2.bb
index 5e6d53224e..44cffcec32 100644
--- a/packages/classpath/classpath-minimal_0.97.2.bb
+++ b/packages/classpath/classpath-minimal_0.97.2.bb
@@ -6,9 +6,11 @@ SRC_URI += "\
   file://javanet-local.patch;patch=1;pnum=0 \
   file://ecj_java_dir.patch;patch=1 \
   file://autotools.patch;patch=1 \
+  file://decimalformat.patch;patch=1 \
+  file://cp-byte-loophelper.patch;patch=1;pnum=0 \
   "
 
-PR = "r1"
+PR = "r3"
 
 PROVIDES = "${PN} classpath"
 
diff --git a/packages/classpath/classpath-native-0.97.2/autotools.patch b/packages/classpath/classpath-native-0.97.2/autotools.patch
index 3df65cf892..e36e143b5f 100644
--- a/packages/classpath/classpath-native-0.97.2/autotools.patch
+++ b/packages/classpath/classpath-native-0.97.2/autotools.patch
@@ -11,16 +11,3 @@ Index: classpath-0.97.2/configure.ac
  dnl -----------------------------------------------------------
  dnl Enable collections.jar (disabled by default)
  dnl -----------------------------------------------------------
-Index: classpath-0.97.2/Makefile.am
-===================================================================
---- classpath-0.97.2.orig/Makefile.am	2008-06-01 20:47:05.000000000 +0200
-+++ classpath-0.97.2/Makefile.am	2008-08-02 00:58:39.004023720 +0200
-@@ -5,7 +5,7 @@
- DIST_SUBDIRS = lib doc external include native resource scripts tools examples
- 
- # Allow users to pass site-specific flags to autoreconf via an env var. 
--ACLOCAL_AMFLAGS = -I m4 ${LOCAL_AUTORECONF_FLAGS}
-+ACLOCAL_AMFLAGS = -I m4 --install ${LOCAL_AUTORECONF_FLAGS}
- 
- native: lib
- 
diff --git a/packages/classpath/classpath-native_0.97.2.bb b/packages/classpath/classpath-native_0.97.2.bb
index c9a239418b..cec256ecc2 100644
--- a/packages/classpath/classpath-native_0.97.2.bb
+++ b/packages/classpath/classpath-native_0.97.2.bb
@@ -1,6 +1,6 @@
 require classpath-native.inc
 
-PR = "r1"
+PR = "r2"
 
 # The code affected by the javanet-local patch
 # is usually not compiled. However if someone changes
@@ -12,5 +12,7 @@ SRC_URI += "\
   file://sun-security-getproperty_0.96.1.patch;patch=1;pnum=0 \
   file://ecj_java_dir.patch;patch=1 \
   file://autotools.patch;patch=1 \
+  file://decimalformat.patch;patch=1 \
+  file://cp-byte-loophelper.patch;patch=1;pnum=0 \
   "
 
diff --git a/packages/classpath/classpath_0.97.2.bb b/packages/classpath/classpath_0.97.2.bb
index 1393e2c453..242bab95f2 100644
--- a/packages/classpath/classpath_0.97.2.bb
+++ b/packages/classpath/classpath_0.97.2.bb
@@ -6,9 +6,11 @@ SRC_URI += "\
   file://javanet-local.patch;patch=1;pnum=0 \
   file://ecj_java_dir.patch;patch=1 \
   file://autotools.patch;patch=1 \
+  file://decimalformat.patch;patch=1 \
+  file://cp-byte-loophelper.patch;patch=1;pnum=0 \
   "
 
-PR = "r2"
+PR = "r4"
 
 DEPENDS += "gtk+ gconf libxtst"
 
diff --git a/packages/classpath/files/autotools.patch b/packages/classpath/files/autotools.patch
index baae366d5f..663c0340cd 100644
--- a/packages/classpath/files/autotools.patch
+++ b/packages/classpath/files/autotools.patch
@@ -22,16 +22,3 @@ Index: classpath-0.93/configure.ac
  
  # Handle -Werror default case.
  if test "$ENABLE_WERROR" = default; then
-Index: classpath-0.93/Makefile.am
-===================================================================
---- classpath-0.93.orig/Makefile.am	2006-02-08 08:35:30.000000000 +0100
-+++ classpath-0.93/Makefile.am	2008-08-24 21:45:42.405241264 +0200
-@@ -4,7 +4,7 @@
- SUBDIRS = lib doc external include native resource scripts tools $(EXAMPLESDIR)
- DIST_SUBDIRS = lib doc external include native resource scripts tools examples
- 
--ACLOCAL_AMFLAGS = -I m4
-+ACLOCAL_AMFLAGS = -I m4 --install
- 
- native: lib
- 
diff --git a/packages/classpath/files/cp-byte-loophelper.patch b/packages/classpath/files/cp-byte-loophelper.patch
new file mode 100644
index 0000000000..4fac362cba
--- /dev/null
+++ b/packages/classpath/files/cp-byte-loophelper.patch
@@ -0,0 +1,68 @@
+Index: gnu/java/nio/charset/ByteDecodeLoopHelper.java
+===================================================================
+RCS file: /sources/classpath/classpath/gnu/java/nio/charset/ByteDecodeLoopHelper.java,v
+retrieving revision 1.1
+diff -u -r1.1 ByteDecodeLoopHelper.java
+--- gnu/java/nio/charset/ByteDecodeLoopHelper.java	23 Nov 2007 16:11:17 -0000	1.1
++++ gnu/java/nio/charset/ByteDecodeLoopHelper.java	3 Sep 2008 23:11:29 -0000
+@@ -119,6 +119,8 @@
+     int inRemaining = in.remaining();
+     int outRemaining = out.remaining();
+     CoderResult result;
++
++	bailOut:
+     if (inRemaining <= outRemaining)
+       {
+         for (int i = 0; i < inRemaining; i++)
+@@ -129,7 +131,7 @@
+               {
+                 inPos--;
+                 result = CoderResult.unmappableForLength(1);
+-                break;
++				break bailOut;
+               }
+             char c = mapToChar(b);
+             outArray[outPos] = c;
+@@ -147,7 +149,7 @@
+               {
+                 inPos--;
+                 result = CoderResult.unmappableForLength(1);
+-                break;
++				break bailOut;
+               }
+             char c = mapToChar(b);
+             outArray[outPos] = c;
+Index: gnu/java/nio/charset/ByteEncodeLoopHelper.java
+===================================================================
+RCS file: /sources/classpath/classpath/gnu/java/nio/charset/ByteEncodeLoopHelper.java,v
+retrieving revision 1.1
+diff -u -r1.1 ByteEncodeLoopHelper.java
+--- gnu/java/nio/charset/ByteEncodeLoopHelper.java	23 Nov 2007 16:11:17 -0000	1.1
++++ gnu/java/nio/charset/ByteEncodeLoopHelper.java	3 Sep 2008 23:11:29 -0000
+@@ -120,6 +120,8 @@
+     int inRemaining = in.remaining();
+     int outRemaining = out.remaining();
+     CoderResult result;
++
++	bailOut:
+     if (inRemaining <= outRemaining)
+       {
+         for (int i = 0; i < inRemaining; i++)
+@@ -130,7 +132,7 @@
+               {
+                 inPos--;
+                 result = CoderResult.unmappableForLength(1);
+-                break;
++                break bailOut;
+               }
+             byte b = mapToByte(inChar);
+             outArray[outPos] = b;
+@@ -148,7 +150,7 @@
+               {
+                 inPos--;
+                 result = CoderResult.unmappableForLength(1);
+-                break;
++                break bailOut;
+               }
+             byte b = mapToByte(inChar);
+             outArray[outPos] = b;
diff --git a/packages/classpath/files/decimalformat.patch b/packages/classpath/files/decimalformat.patch
new file mode 100644
index 0000000000..4997523830
--- /dev/null
+++ b/packages/classpath/files/decimalformat.patch
@@ -0,0 +1,31 @@
+Index: classpath-0.97.2/java/text/DecimalFormat.java
+===================================================================
+--- classpath-0.97.2.orig/java/text/DecimalFormat.java
++++ classpath-0.97.2/java/text/DecimalFormat.java
+@@ -1296,7 +1296,7 @@ public class DecimalFormat extends Numbe
+             currencySymbol = this.symbols.getCurrencySymbol();
+ 
+             // if \u00A4 is doubled, we use the international currency symbol
+-            if (i < len && pattern.charAt(i + 1) == '\u00A4')
++            if ((i + 1) < len && pattern.charAt(i + 1) == '\u00A4')
+               {
+                 currencySymbol = this.symbols.getInternationalCurrencySymbol();
+                 i++;
+@@ -1320,7 +1320,7 @@ public class DecimalFormat extends Numbe
+         else if (ch == '\'')
+           {
+             // QUOTE
+-            if (i < len && pattern.charAt(i + 1) == '\'')
++            if ((i + 1) < len && pattern.charAt(i + 1) == '\'')
+               {
+                 // we need to add ' to the buffer 
+                 buffer.append(ch);
+@@ -1692,7 +1692,7 @@ public class DecimalFormat extends Numbe
+         else if (ch == '\'')
+           {
+             // QUOTE
+-            if (i < len && pattern.charAt(i + 1) == '\'')
++            if ((i + 1) < len && pattern.charAt(i + 1) == '\'')
+               {
+                 // we need to add ' to the buffer 
+                 buffer.append(ch);