[oe-commits] org.oe.dev merge of '8a4df13bdb5d6b154edb85a4b71e38ac457670a0'
koen commit
oe at amethyst.openembedded.net
Thu Sep 4 10:25:31 UTC 2008
merge of '8a4df13bdb5d6b154edb85a4b71e38ac457670a0'
and '9ead7c7a970fd9cac9a8f7314036254e85d786dc'
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: b7c4403b65f8cb68116e2327d646cca5ec5312b9
ViewMTN: http://monotone.openembedded.org/revision/info/b7c4403b65f8cb68116e2327d646cca5ec5312b9
Files:
1
packages/nonworking/clucene/clucene-0.8.12-pre
packages/nonworking/clucene/clucene-0.8.12-pre/compile-fix.patch
packages/nonworking/clucene/clucene_0.8.12-pre.bb
packages/nonworking/clucene
packages/clucene
packages/clucene/clucene-core_0.9.21.bb
packages/classpath/files/cp-byte-loophelper.patch
packages/classpath/files/decimalformat.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 -r8a4df13bdb5d6b154edb85a4b71e38ac457670a0 -rb7c4403b65f8cb68116e2327d646cca5ec5312b9
#
#
#
# delete "packages/nonworking/clucene/clucene-0.8.12-pre"
#
# delete "packages/nonworking/clucene/clucene-0.8.12-pre/compile-fix.patch"
#
# delete "packages/nonworking/clucene/clucene_0.8.12-pre.bb"
#
# rename "packages/nonworking/clucene"
# to "packages/clucene"
#
# add_file "packages/clucene/clucene-core_0.9.21.bb"
# content [dae00620f34a32ad1e3db098afcf75322e9840bd]
#
============================================================
--- packages/clucene/clucene-core_0.9.21.bb dae00620f34a32ad1e3db098afcf75322e9840bd
+++ packages/clucene/clucene-core_0.9.21.bb dae00620f34a32ad1e3db098afcf75322e9840bd
@@ -0,0 +1,23 @@
+DESCRIPTION = "CLucene is a C++ port of Lucene: the high-performance, full-featured text search engine written in Java."
+SECTION = "libs"
+LICENSE = "LGPL"
+
+DEPENDS = "libtool"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/clucene/clucene-core-${PV}.tar.bz2"
+
+inherit autotools
+
+EXTRA_OECONF = "--disable-multithreading dps_static_const_type=2"
+
+do_configure() {
+ gnu-configize
+ cp ${STAGING_DATADIR}/libtool/config.sub ${S}/config
+ oe_runconf
+}
+
+do_stage() {
+ autotools_stage_all
+}
+
+FILES_${PN}-dev += "${libdir}/CLucene"
#
# mt diff -r9ead7c7a970fd9cac9a8f7314036254e85d786dc -rb7c4403b65f8cb68116e2327d646cca5ec5312b9
#
#
#
# add_file "packages/classpath/files/cp-byte-loophelper.patch"
# content [3d61e02534f06d6b4b63bc8924fb24f0f8658e64]
#
# add_file "packages/classpath/files/decimalformat.patch"
# content [9bb1d10f056daf0875603e27fba7c95ac5541b0d]
#
# patch "packages/classpath/classpath-minimal_0.97.2.bb"
# from [fe0236b7b3c70cfc9ae4ae7c9162e46c136eb1ef]
# to [177179004b0872961bb82b3f0478fbb4305e68b0]
#
# patch "packages/classpath/classpath-native_0.97.2.bb"
# from [537d513b9558846909bfcff51984e4dacdc7b586]
# to [435684f1e26b8284b25fcf75ceb62504efc4ba3e]
#
# patch "packages/classpath/classpath_0.97.2.bb"
# from [002223e29d941c20e5c67e5abd59a0367f5f759a]
# 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/files/decimalformat.patch 9bb1d10f056daf0875603e27fba7c95ac5541b0d
+++ packages/classpath/files/decimalformat.patch 9bb1d10f056daf0875603e27fba7c95ac5541b0d
@@ -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);
============================================================
--- packages/classpath/classpath-minimal_0.97.2.bb fe0236b7b3c70cfc9ae4ae7c9162e46c136eb1ef
+++ packages/classpath/classpath-minimal_0.97.2.bb 177179004b0872961bb82b3f0478fbb4305e68b0
@@ -7,9 +7,10 @@ SRC_URI += "\
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 = "r3"
PROVIDES = "${PN} classpath"
============================================================
--- packages/classpath/classpath-native_0.97.2.bb 537d513b9558846909bfcff51984e4dacdc7b586
+++ packages/classpath/classpath-native_0.97.2.bb 435684f1e26b8284b25fcf75ceb62504efc4ba3e
@@ -13,5 +13,6 @@ SRC_URI += "\
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 002223e29d941c20e5c67e5abd59a0367f5f759a
+++ packages/classpath/classpath_0.97.2.bb cad408a93df036893e2573d5d16baa2b07bd8b08
@@ -7,9 +7,10 @@ SRC_URI += "\
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 = "r3"
+PR = "r4"
DEPENDS += "gtk+ gconf libxtst"
More information about the Openembedded-commits
mailing list