From 1b47f10517ee70e66b902d378876120fe0b20882 Mon Sep 17 00:00:00 2001
From: Henning Heinold <henning@itconsulting-heinold.de>
Date: Sat, 8 Mar 2014 01:03:19 +0100
Subject: jamvm: update git version to ebd11bde0a97b57f0d18938c6b65468d3c932719

* remove annotations.patch, because it was fixed upstream
---
 recipes-core/jamvm/jamvm/annotations.patch | 31 ------------------------------
 recipes-core/jamvm/jamvm_git.bb            |  3 +--
 2 files changed, 1 insertion(+), 33 deletions(-)
 delete mode 100644 recipes-core/jamvm/jamvm/annotations.patch

(limited to 'recipes-core/jamvm')

diff --git a/recipes-core/jamvm/jamvm/annotations.patch b/recipes-core/jamvm/jamvm/annotations.patch
deleted file mode 100644
index 6279366..0000000
--- a/recipes-core/jamvm/jamvm/annotations.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: git/src/classlib/gnuclasspath/annotations.c
-===================================================================
---- git.orig/src/classlib/gnuclasspath/annotations.c	2013-07-29 10:44:38.597241346 +0000
-+++ git/src/classlib/gnuclasspath/annotations.c	2013-07-29 11:03:42.927744962 +0000
-@@ -247,7 +247,7 @@
-     return anno;
- }
- 
--Object *parseAnnotations(Class *class, AnnotationData *annotations) {
-+Object *parseAnnotations(Class *class, AttributeData *annotations) {
-     if(!anno_inited && !initAnnotation())
-         return NULL;
- 
-@@ -290,7 +290,7 @@
- }
- 
- Object *getMethodParameterAnnotations(MethodBlock *mb) {
--    AnnotationData *annotations;
-+    AttributeData *annotations;
-     Object **outer_array_data;
-     Object *outer_array;
-     int no_params, i;
-@@ -342,7 +342,7 @@
- }
- 
- Object *getMethodDefaultValue(MethodBlock *mb) {
--    AnnotationData *annotations;
-+    AttributeData *annotations;
- 
-     if(!anno_inited && !initAnnotation())
-         return NULL;
diff --git a/recipes-core/jamvm/jamvm_git.bb b/recipes-core/jamvm/jamvm_git.bb
index 97ed1cc..bfa856a 100644
--- a/recipes-core/jamvm/jamvm_git.bb
+++ b/recipes-core/jamvm/jamvm_git.bb
@@ -3,14 +3,13 @@
 
 require jamvm.inc
 
-SRCREV = "ac22c9948434e528ece451642b4ebde40953ee7e"
+SRCREV = "ebd11bde0a97b57f0d18938c6b65468d3c932719"
 PV = "1.5.5+1.6.0-devel+git${SRCPV}"
 
 SRC_URI = "git://git.berlios.de/jamvm;protocol=git \
            file://jamvm-jni_h-noinst.patch \
            file://libffi.patch \
            file://jamvm-minmax-heap.patch \
-           file://annotations.patch \
            file://java \
           "
 
-- 
cgit v1.2.3-54-g00ecf