[oe-commits] org.oe.dev classpath: revert seemingly erroneous manipulations of SRC_URI in classpath.inc

[Laibsch commit]

classpath: revert seemingly erroneous manipulations of SRC_URI in classpath.inc
Add gconf_version.patch explicitly to the SRC_URI where appropriate

Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: 0720bd0a82c8392e4c15a280ce7075eb650da9ac
ViewMTN: http://monotone.openembedded.org/revision.psp?id=0720bd0a82c8392e4c15a280ce7075eb650da9ac
Files:
1
packages/classpath/classpath-gtk_0.93.bb
packages/classpath/classpath-minimal-native_0.93.bb
packages/classpath/classpath.inc
Diffs:

#
# mt diff -r5339a91e1eb927a0828f71ca5d475985d33c1932 -r0720bd0a82c8392e4c15a280ce7075eb650da9ac
#
# 
# 
# patch "packages/classpath/classpath-gtk_0.93.bb"
#  from [7cd5359a90cf2d11668d59746d40df2331bbdeb8]
#    to [ff181753a8bd030618856024b99afb591b7ce073]
# 
# patch "packages/classpath/classpath-minimal-native_0.93.bb"
#  from [7ff048b183078fdd67d25147bd3aa69e60fbb0fa]
#    to [44072c8f062f99524266f7d9387bb1c9026455a5]
# 
# patch "packages/classpath/classpath.inc"
#  from [53a5c7c54807a2c616268880a7b21e33b695175f]
#    to [7977dbbfb72be556af6f262074749de821ebf9e6]
# 
============================================================
--- packages/classpath/classpath-gtk_0.93.bb	7cd5359a90cf2d11668d59746d40df2331bbdeb8
+++ packages/classpath/classpath-gtk_0.93.bb	ff181753a8bd030618856024b99afb591b7ce073
@@ -1,9 +1,11 @@ RCONFLICTS_${PN} = "classpath-minimal"
 require classpath.inc
 
 DEPENDS = "glib-2.0 gtk+ cairo gconf libart-lgpl pango libxtst jikes-native zip-native"
 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}"
============================================================
--- packages/classpath/classpath-minimal-native_0.93.bb	7ff048b183078fdd67d25147bd3aa69e60fbb0fa
+++ packages/classpath/classpath-minimal-native_0.93.bb	44072c8f062f99524266f7d9387bb1c9026455a5
@@ -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() {
============================================================
--- packages/classpath/classpath.inc	53a5c7c54807a2c616268880a7b21e33b695175f
+++ packages/classpath/classpath.inc	7977dbbfb72be556af6f262074749de821ebf9e6
@@ -8,7 +8,7 @@ SRC_URI = "${GNU_MIRROR}/classpath/${PBN
 
 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}"