[oe-commits] org.oe.dev classpath 0.97.2: Added cp-byte-loophelper.patch.

[thebohemian commit]

classpath 0.97.2: Added cp-byte-loophelper.patch.
classpath-minimal 0.97.2: Dito.
classpath-native 0.97.2: Dito.

Author: thebohemian at openembedded.org
Branch: org.openembedded.dev
Revision: e3764e63c962032848edc5b4ea1e787aec87c16b
ViewMTN: http://monotone.openembedded.org/revision/info/e3764e63c962032848edc5b4ea1e787aec87c16b
Files:
1
packages/classpath/files/cp-byte-loophelper.patch
packages/classpath/classpath-minimal_0.97.2.bb
packages/classpath/classpath-native_0.97.2.bb
packages/classpath/classpath_0.97.2.bb
Diffs:

#
# mt diff -r01fd906254b3838521badd31e6b686d8faa0c99a -re3764e63c962032848edc5b4ea1e787aec87c16b
#
#
#
# add_file "packages/classpath/files/cp-byte-loophelper.patch"
#  content [3d61e02534f06d6b4b63bc8924fb24f0f8658e64]
# 
# patch "packages/classpath/classpath-minimal_0.97.2.bb"
#  from [cc6670b99fd590bf0ad74fa09447b184313fc008]
#    to [177179004b0872961bb82b3f0478fbb4305e68b0]
# 
# patch "packages/classpath/classpath-native_0.97.2.bb"
#  from [a757f77768377156889b4b9e0147b2d651b9d4fd]
#    to [435684f1e26b8284b25fcf75ceb62504efc4ba3e]
# 
# patch "packages/classpath/classpath_0.97.2.bb"
#  from [d8ccab26ac79ea713973f6b5f066aba811994ccb]
#    to [cad408a93df036893e2573d5d16baa2b07bd8b08]
#
============================================================
--- packages/classpath/files/cp-byte-loophelper.patch	3d61e02534f06d6b4b63bc8924fb24f0f8658e64
+++ packages/classpath/files/cp-byte-loophelper.patch	3d61e02534f06d6b4b63bc8924fb24f0f8658e64
@@ -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;
============================================================
--- packages/classpath/classpath-minimal_0.97.2.bb	cc6670b99fd590bf0ad74fa09447b184313fc008
+++ packages/classpath/classpath-minimal_0.97.2.bb	177179004b0872961bb82b3f0478fbb4305e68b0
@@ -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"
 
============================================================
--- packages/classpath/classpath-native_0.97.2.bb	a757f77768377156889b4b9e0147b2d651b9d4fd
+++ packages/classpath/classpath-native_0.97.2.bb	435684f1e26b8284b25fcf75ceb62504efc4ba3e
@@ -1,6 +1,6 @@ require classpath-native.inc
 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 \
   "
 
============================================================
--- packages/classpath/classpath_0.97.2.bb	d8ccab26ac79ea713973f6b5f066aba811994ccb
+++ packages/classpath/classpath_0.97.2.bb	cad408a93df036893e2573d5d16baa2b07bd8b08
@@ -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"