Merge branch 'org.openembedded.dev' of ssh://git@git.openembedded.net/openembedded into org.openembedded.dev

11 files changed, 146 insertions, 6 deletions

diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 37010096dd..656d6b2219 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -22,8 +22,8 @@ PREFERRED_VERSION_alsa-state ?= "0.1.0"
 PREFERRED_VERSION_alsa-utils ?= "1.0.15"
 PREFERRED_VERSION_anthy ?= "7811"
 PREFERRED_VERSION_anthy-native ?= "7811"
-PREFERRED_VERSION_antlr ?= "2.7.5"
-PREFERRED_VERSION_antlr-native ?= "2.7.5"
+PREFERRED_VERSION_antlr ?= "2.7.7"
+PREFERRED_VERSION_antlr-native ?= "2.7.7"
 PREFERRED_VERSION_apache2 ?= "2.2.3"
 PREFERRED_VERSION_apache2-native ?= "2.2.3"
 PREFERRED_VERSION_apex-env ?= "1.5.8"
diff --git a/packages/antlr/antlr-native_2.7.7.bb b/packages/antlr/antlr-native_2.7.7.bb
new file mode 100644
index 0000000000..bd95ce7a7c
--- /dev/null
+++ b/packages/antlr/antlr-native_2.7.7.bb
@@ -0,0 +1,17 @@
+require antlr_${PV}.bb
+
+SRC_URI += "file://runantlr"
+
+inherit native
+
+do_configure() {
+	sed -i -e"s|@JAR_FILE@|${STAGING_DATADIR_NATIVE}/java/antlr.jar|" ${WORKDIR}/runantlr
+}
+
+do_stage() {
+	java_stage
+
+	install -d ${STAGING_BINDIR}
+
+	install -m 0755 ${WORKDIR}/runantlr ${STAGING_BINDIR}
+}
diff --git a/packages/antlr/antlr_2.7.7.bb b/packages/antlr/antlr_2.7.7.bb
new file mode 100644
index 0000000000..431b7b5b4f
--- /dev/null
+++ b/packages/antlr/antlr_2.7.7.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Framework for constructing recognizers, interpreters, compilers, and translators"
+# see http://www.antlr2.org/license.html
+LICENSE = "Public Domain"
+HOMEPAGE = "http://www.antlr2.org"
+
+SRC_URI = "http://www.antlr2.org/download/${BP}.tar.gz"
+
+inherit java-library
+
+do_compile() {
+  mkdir -p build
+
+  javac -sourcepath . -d build `find antlr -name "*.java"`
+
+  fastjar -C build -c -f ${JARFILENAME} .
+}
diff --git a/packages/antlr/files/runantlr b/packages/antlr/files/runantlr
new file mode 100755
index 0000000000..b924bf477d
--- /dev/null
+++ b/packages/antlr/files/runantlr
@@ -0,0 +1,11 @@
+#!/bin/sh
+echo Running 'java antlr.Tool $*' with @JAR_FILE@ appended to the CLASSPATH variable
+
+export CLASSPATH
+CLASSPATH=$CLASSPATH:@JAR_FILE@
+
+if [ ! $JAVA ];then
+	JAVA=java
+fi
+
+$JAVA antlr.Tool $*
diff --git a/packages/classpath/classpath-0.97.2/gtk-fix.patch b/packages/classpath/classpath-0.97.2/gtk-fix.patch
new file mode 100644
index 0000000000..94c4c1f59d
--- /dev/null
+++ b/packages/classpath/classpath-0.97.2/gtk-fix.patch
@@ -0,0 +1,88 @@
+Index: gnu/java/awt/peer/gtk/FreetypeGlyphVector.java
+===================================================================
+--- gnu/java/awt/peer/gtk/FreetypeGlyphVector.java.orig	2007-04-12 22:18:09.000000000 +0200
++++ gnu/java/awt/peer/gtk/FreetypeGlyphVector.java	2008-11-21 16:45:33.000000000 +0100
+@@ -247,7 +247,8 @@
+   /**
+    * Returns the kerning of a glyph pair
+    */
+-  private native Point2D getKerning(int leftGlyph, int rightGlyph, long font);
++  private native void getKerning(int leftGlyph, int rightGlyph, long font,
++				 float[] p);
+ 
+   private native double[] getMetricsNative(int glyphCode, long font);
+ 
+@@ -301,6 +302,7 @@
+     GlyphMetrics gm = null;
+     float x = 0;
+     float y = 0;
++    float[] p = {0.0f, 0.0f};
+     for(int i = 0; i < nGlyphs; i++)
+       {
+         gm = getGlyphMetrics( i );
+@@ -314,9 +316,9 @@
+         // using the same font
+         if (i != nGlyphs-1 && fontSet[i] == fontSet[i+1])
+           {
+-            Point2D p = getKerning(glyphCodes[i], glyphCodes[i + 1], fontSet[i]);
+-            x += p.getX();
+-            y += p.getY();
++            getKerning(glyphCodes[i], glyphCodes[i + 1], fontSet[i], p);
++            x += p[0];
++            y += p[1];
+           }
+       }
+     glyphPositions[nGlyphs * 2] = x;
+Index: include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h
+===================================================================
+--- include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h.orig	2008-06-06 04:10:00.000000000 +0200
++++ include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h	2008-11-21 16:45:33.000000000 +0100
+@@ -13,7 +13,7 @@
+ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_dispose (JNIEnv *env, jobject, jlongArray);
+ JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getNativeFontPointer (JNIEnv *env, jobject, jint);
+ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getGlyphs (JNIEnv *env, jobject, jintArray, jintArray, jlongArray);
+-JNIEXPORT jobject JNICALL Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getKerning (JNIEnv *env, jobject, jint, jint, jlong);
++JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getKerning (JNIEnv *env, jobject, jint, jint, jlong, jfloatArray);
+ JNIEXPORT jdoubleArray JNICALL Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getMetricsNative (JNIEnv *env, jobject, jint, jlong);
+ JNIEXPORT jobject JNICALL Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getGlyphOutlineNative (JNIEnv *env, jobject, jint, jlong);
+ 
+Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c
+===================================================================
+--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c.orig	2007-04-25 16:53:03.000000000 +0200
++++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c	2008-11-21 16:47:12.000000000 +0100
+@@ -169,15 +169,13 @@
+   (*env)->ReleaseLongArrayElements (env, fonts, fontArray, 0);
+ }
+ 
+-JNIEXPORT jobject JNICALL 
++JNIEXPORT void JNICALL
+ Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getKerning
+-(JNIEnv *env, jobject obj __attribute__((unused)), jint rightGlyph, jint leftGlyph, jlong fnt)
++  (JNIEnv *env, jobject obj __attribute__((unused)), jint rightGlyph,
++   jint leftGlyph, jlong fnt, jfloatArray p)
+ {
+   FT_Face ft_face;
+   FT_Vector kern;
+-  jclass cls;
+-  jmethodID method;
+-  jvalue values[2];
+   PangoFcFont *font;
+ 
+   font = JLONG_TO_PTR(PangoFcFont, fnt);
+@@ -187,12 +185,10 @@
+ 
+   pango_fc_font_unlock_face( font );
+ 
+-  values[0].d = (jdouble)kern.x/64.0;
+-  values[1].d = (jdouble)kern.y/64.0;
+-
+-  cls = (*env)->FindClass (env, "java/awt/geom/Point2D$Double");
+-  method = (*env)->GetMethodID (env, cls, "<init>", "(DD)V");
+-  return (*env)->NewObjectA(env, cls, method, values);
++  jfloat *pelements = (*env)->GetPrimitiveArrayCritical(env, p, NULL);
++  pelements[0] = (jfloat)kern.x/64.0;
++  pelements[1] = (jfloat)kern.y/64.0;
++  (*env)->ReleasePrimitiveArrayCritical (env, p, pelements, 0);
+ }
+ 
+ JNIEXPORT jdoubleArray JNICALL 
diff --git a/packages/classpath/classpath_0.97.2.bb b/packages/classpath/classpath_0.97.2.bb
index a6327d3710..4e146e1606 100644
--- a/packages/classpath/classpath_0.97.2.bb
+++ b/packages/classpath/classpath_0.97.2.bb
@@ -9,9 +9,10 @@ SRC_URI += "\
   file://decimalformat.patch;patch=1 \
   file://cp-byte-loophelper.patch;patch=1;pnum=0 \
   file://drawpolyline.patch;patch=1;pnum=0 \
+  file://gtk-fix.patch;patch=1;pnum=0 \
   "
 
-PR = "r5"
+PR = "r6"
 
 DEPENDS += "gtk+ gconf libxtst"
 
diff --git a/packages/e17/e-wm_svn.bb b/packages/e17/e-wm_svn.bb
index 024228b7a3..172d351b22 100644
--- a/packages/e17/e-wm_svn.bb
+++ b/packages/e17/e-wm_svn.bb
@@ -2,11 +2,17 @@ DESCRIPTION = "The Enlightenment Window Manager Version 17"
 DEPENDS = "eet evas ecore edje efreet edbus"
 LICENSE = "MIT BSD"
 PV = "0.16.999.043+svnr${SRCREV}"
-PR = "r19"
+PR = "r20"
 
 inherit e update-alternatives
 
-RDEPENDS += "shared-mime-info mime-support edje-utils glibc-utils"
+RDEPENDS += "shared-mime-info mime-support edje-utils"
+
+# Uclibc build don't have 'glibc-utils'
+# I suspect the workaround below breaks eglibc, though. Koen - 20081125
+RDEPENDS_${PN}_append_linux = " glibc-utils "
+RDEPENDS_${PN}_append_linux-uclibc = " uclibc-utils "
+RDEPENDS_${PN}_append_linux-uclibcgnueabi = " uclibc-utils "
 
 PACKAGES =+ "\
   ${PN}-config-default \
diff --git a/packages/lesstif/lesstif_0.95.0.bb b/packages/lesstif/lesstif_0.95.0.bb
index 6a01a9c72b..bfc41b8f50 100644
--- a/packages/lesstif/lesstif_0.95.0.bb
+++ b/packages/lesstif/lesstif_0.95.0.bb
@@ -39,7 +39,8 @@ addtask preconfigure after do_patch before do_configure
 
 EXTRA_OECONF = "\
 	--with-gnu-ld --disable-verbose --disable-build-12 --disable-build-20 \
-	--enable-build-21 --enable-xrender --enable-production \
+	--enable-build-21 --enable-xrender --enable-production --without-motif \
+	--x-includes=. \
 "
 
 PACKAGES += "${PN}-bin"
diff --git a/packages/antlr/antlr-native_2.7.5.bb b/packages/obsolete/antlr/antlr-native_2.7.5.bb
index 77cb88c7e7..77cb88c7e7 100644
--- a/packages/antlr/antlr-native_2.7.5.bb
+++ b/packages/obsolete/antlr/antlr-native_2.7.5.bb
diff --git a/packages/antlr/antlr_2.7.5.bb b/packages/obsolete/antlr/antlr_2.7.5.bb
index f61b3a0b87..f61b3a0b87 100644
--- a/packages/antlr/antlr_2.7.5.bb
+++ b/packages/obsolete/antlr/antlr_2.7.5.bb
diff --git a/packages/antlr/files/install.patch b/packages/obsolete/antlr/files/install.patch
index 3ab0932673..3ab0932673 100644
--- a/packages/antlr/files/install.patch
+++ b/packages/obsolete/antlr/files/install.patch