classpath: revert seemingly erroneous manipulations of SRC_URI in classpath.inc

Add gconf_version.patch explicitly to the SRC_URI where appropriate

diff --git a/packages/classpath/classpath-gtk_0.93.bb b/packages/classpath/classpath-gtk_0.93.bb
index 9577947..137ee8f 100644 (file)
--- a/packages/classpath/classpath-gtk_0.93.bb
+++ b/packages/classpath/classpath-gtk_0.93.bb
@@ -4,6 +4,8 @@ DEPENDS = "glib-2.0 gtk+ cairo gconf libart-lgpl pango libxtst jikes-native zip-
 RDEPENDS_${PN} = "classpath-common (>= ${PV})"
 RCONFLICTS_${PN} = "classpath-minimal"
 
+SRC_URI += "file://gconf_version.patch;patch=1"
+
 EXTRA_OECONF = "--with-jikes --disable-plugin --disable-dssi"
 
 PACKAGES = "classpath-dev classpath-doc classpath-common classpath-examples classpath-tools ${PN}"

diff --git a/packages/classpath/classpath-minimal-native_0.93.bb b/packages/classpath/classpath-minimal-native_0.93.bb
index 05fd9b8..8a08a6c 100644 (file)
--- a/packages/classpath/classpath-minimal-native_0.93.bb
+++ b/packages/classpath/classpath-minimal-native_0.93.bb
@@ -1,8 +1,11 @@
-inherit native
 require classpath.inc
 
 DEPENDS = "glib-2.0 libart-lgpl pango libxtst jikes-native zip-native"
 
+SRC_URI += "file://gconf_version.patch;patch=1"
+
+inherit native
+
 EXTRA_OECONF = "--with-jikes --disable-gconf-peer --disable-gtk-peer --disable-plugin --disable-dssi --disable-examples"
 
 do_stage() {

diff --git a/packages/classpath/classpath.inc b/packages/classpath/classpath.inc
index 459788c..303c286 100644 (file)
--- a/packages/classpath/classpath.inc
+++ b/packages/classpath/classpath.inc
@@ -8,7 +8,7 @@ PBN = "classpath"
 
 SRC_URI = "${GNU_MIRROR}/classpath/${PBN}-${PV}.tar.gz \
            file://disable-automake-checks.patch;patch=1 \
-          file://gconf_version.patch;patch=1"
+           file://fix-endian-arm-floats.patch;patch=1"
 
 S = "${WORKDIR}/${PBN}-${PV}"