[oe-commits] org.oe.dev merge of '2f187f3aefd5783137489ac83567e80296d3e37b'

[oe commit]

merge of '2f187f3aefd5783137489ac83567e80296d3e37b'
     and '9ace05afbe48689414ba40971c10e189a2234247'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 54383b7d45cbdbb90ca3491e4a105edd944c66ec
ViewMTN: http://monotone.openembedded.org/revision/info/54383b7d45cbdbb90ca3491e4a105edd944c66ec
Files:
1
packages/libwpd/libwpd_0.8.14.bb
packages/cacao/files/cacao-0.99.1-build-java-runtime-library-classes.patch
packages/cacao/cacao-native_0.99.1.bb
packages/cacao/cacao-native_0.99.2.bb
packages/cacao/cacao_0.99.1.bb
packages/cacao/cacao_0.99.2.bb
packages/cacao/cacaoh-native_0.99.1.bb
packages/cacao/cacaoh-native_0.99.2.bb
packages/cacao/cacao-native.inc
packages/cacao/cacao-native_0.98+hg20071001.bb
packages/classpath/classpath_0.97.2.bb
Diffs:

#
# mt diff -r2f187f3aefd5783137489ac83567e80296d3e37b -r54383b7d45cbdbb90ca3491e4a105edd944c66ec
#
#
#
# add_file "packages/libwpd/libwpd_0.8.14.bb"
#  content [d94ab8003d42c654cd7c798c1f66c7232b8316fb]
#
============================================================
--- packages/libwpd/libwpd_0.8.14.bb	d94ab8003d42c654cd7c798c1f66c7232b8316fb
+++ packages/libwpd/libwpd_0.8.14.bb	d94ab8003d42c654cd7c798c1f66c7232b8316fb
@@ -0,0 +1,12 @@
+LICENSE = "LGPL"
+DESCRIPTION = "libwpd is a C++ library designed to help process WordPerfect documents."
+HOMEPAGE = "http://libwpd.sourceforge.net/index.html"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz"
+DEPENDS = "libgsf"
+
+inherit autotools pkgconfig
+
+do_stage() {
+	autotools_stage_all
+}


#
# mt diff -r9ace05afbe48689414ba40971c10e189a2234247 -r54383b7d45cbdbb90ca3491e4a105edd944c66ec
#
#
#
# delete "packages/cacao/files/cacao-0.99.1-build-java-runtime-library-classes.patch"
# 
# rename "packages/cacao/cacao-native_0.99.1.bb"
#     to "packages/cacao/cacao-native_0.99.2.bb"
# 
# rename "packages/cacao/cacao_0.99.1.bb"
#     to "packages/cacao/cacao_0.99.2.bb"
# 
# rename "packages/cacao/cacaoh-native_0.99.1.bb"
#     to "packages/cacao/cacaoh-native_0.99.2.bb"
# 
# patch "packages/cacao/cacao-native.inc"
#  from [07b702fccb42b3216ccbc83f1e71c7ef63a0c5bc]
#    to [01518adc1a5be594a1b7a0745fbe809fe9c32e37]
# 
# patch "packages/cacao/cacao-native_0.98+hg20071001.bb"
#  from [b087b9a24b9593dfff241d8dbafef831492c316b]
#    to [8929611fd90eb4fdcb23fe53d68ecbb8c33008a2]
# 
# patch "packages/cacao/cacao-native_0.99.2.bb"
#  from [99b2a0554ed0083d21e60e8b10e7d9bf9f96ea22]
#    to [ec6694c3440d7213e55f7fc7aa9401c8252419a2]
# 
# patch "packages/cacao/cacao_0.99.2.bb"
#  from [77d2dd2b46672fce71c875cb18b3294166d240cd]
#    to [c37006a6c2daf29f28f7a3af6c18f2546da63545]
# 
# patch "packages/classpath/classpath_0.97.2.bb"
#  from [278cb300abf8c1fd2c84992aad5b9a71d2f050e5]
#    to [950979b9546b09b411c3a41c14bf06b8450bd8bd]
#
============================================================
--- packages/cacao/cacao-native.inc	07b702fccb42b3216ccbc83f1e71c7ef63a0c5bc
+++ packages/cacao/cacao-native.inc	01518adc1a5be594a1b7a0745fbe809fe9c32e37
@@ -17,13 +17,13 @@ EXTRA_OECONF = "\
   --with-vm-zip=${datadir}/cacao/vm.zip \
   \
   --with-classpath-libdir=${libdir_jni}:${libdir} \
-  --with-classpath-includedir=${incdir}/classpath \
+  --with-classpath-includedir=${includedir}/classpath \
   --with-classpath-classes=${datadir}/classpath/glibj.zip \
   \
   --with-java-runtime-library-classes=${datadir}/classpath/glibj.zip \
   --with-java-runtime-library-libdir=${libdir_jni}:${libdir} \
-  --with-jni_md_h=${incdir}/classpath \
-  --with-jni_h=${incdir}/classpath \
+  --with-jni_md_h=${includedir}/classpath \
+  --with-jni_h=${includedir}/classpath \
   "
 
 # force usage of ecj-initial
============================================================
--- packages/cacao/cacao-native_0.98+hg20071001.bb	b087b9a24b9593dfff241d8dbafef831492c316b
+++ packages/cacao/cacao-native_0.98+hg20071001.bb	8929611fd90eb4fdcb23fe53d68ecbb8c33008a2
@@ -3,3 +3,7 @@ SRC_URI = "http://jalimo.evolvis.org/rep
 PR = "r1"
 
 SRC_URI = "http://jalimo.evolvis.org/repository/sources/cacao-${PV}.tar.bz2;md5sum=9ff10c929bd0cbf15909107c1aff7518"
+
+# force usage of ecj-initial (but Java5-compatible class library)
+export JAVAC = "${STAGING_BINDIR_NATIVE}/ecj-initial -bootclasspath ${STAGING_DATADIR_NATIVE}/classpath/glibj.zip"
+
============================================================
--- packages/cacao/cacao-native_0.99.1.bb	99b2a0554ed0083d21e60e8b10e7d9bf9f96ea22
+++ packages/cacao/cacao-native_0.99.2.bb	ec6694c3440d7213e55f7fc7aa9401c8252419a2
@@ -2,6 +2,6 @@ PR = "r0"
 
 PR = "r0"
 
-SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2;md5sum=a5641452c7ba173060c99ed700950b3d \
-  "
+SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2;md5sum=a5641452c7ba173060c99ed700950b3d"
 
+
============================================================
--- packages/cacao/cacao_0.99.1.bb	77d2dd2b46672fce71c875cb18b3294166d240cd
+++ packages/cacao/cacao_0.99.2.bb	c37006a6c2daf29f28f7a3af6c18f2546da63545
@@ -3,7 +3,6 @@ SRC_URI = "http://www.complang.tuwien.ac
 PR = "r0"
 
 SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2;md5sum=a5641452c7ba173060c99ed700950b3d \
-           file://cacao-${PV}-build-java-runtime-library-classes.patch;patch=1 \
           "
 
 # Quirks for Nokia N800:
============================================================
--- packages/classpath/classpath_0.97.2.bb	278cb300abf8c1fd2c84992aad5b9a71d2f050e5
+++ packages/classpath/classpath_0.97.2.bb	950979b9546b09b411c3a41c14bf06b8450bd8bd
@@ -3,7 +3,7 @@ SRC_URI += "\
 SRC_URI += "\
   file://netif_16.patch;patch=1;pnum=0 \
   file://SimpleName.diff;patch=1;pnum=0 \
-  file://javanet-local;patch=1;pnum=0 \
+  file://javanet-local.patch;patch=1;pnum=0 \
   "
 
 PR = "r1"