vala: here comes 0.7.5+fso2

6 files changed, 20 insertions, 50 deletions

diff --git a/recipes/vala/files/static-dbus-methods.patch b/recipes/vala/files/static-dbus-methods.patch
deleted file mode 100644
index 7bf4144860..0000000000
--- a/recipes/vala/files/static-dbus-methods.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Frederik Sdun <frederik.sdun@googlemail.com>
-Hi,
-
-I figured out that vala generates wrong code on static methods. It tries
-to add a user_data pointer, but then the C function has no void*
-user_data.
-
-I appended a diff which fixes the problem for me.
-
-Regards, Frederik
-
-Index: vala/gobject/valadbusclientmodule.vala
-===================================================================
---- vala/gobject/valadbusclientmodule.vala	(Revision 2430)
-+++ vala/gobject/valadbusclientmodule.vala	(Arbeitskopie)
-@@ -133,7 +133,9 @@
- 			cend_call.add_argument (new CCodeIdentifier ("call"));
- 			cend_call.add_argument (new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, new CCodeIdentifier ("error")));
- 			var creply_call = new CCodeFunctionCall ((CCodeExpression) callback.ccodenode);
--			creply_call.add_argument (new CCodeIdentifier ("user_data"));
-+                        if( reply_method.binding != MemberBinding.STATIC ) {
-+			    creply_call.add_argument (new CCodeIdentifier ("user_data"));
-+                        }
- 			int param_count = reply_method.get_parameters ().size;
- 			int i = 0;
- 			foreach (FormalParameter param in reply_method.get_parameters ()) {
diff --git a/recipes/vala/vala-bootstrap-native_0.6.0.bb b/recipes/vala/vala-bootstrap-native_0.6.0.bb
deleted file mode 100644
index 36db7174a6..0000000000
--- a/recipes/vala/vala-bootstrap-native_0.6.0.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require vala.inc
-PR = "r2"
-
-inherit native
-DEPENDS = "glib-2.0-native"
-
-# work around timestamp problem in tarball
-do_compile_prepend() {
-	touch gobject/gobject.vala.stamp
-}
-
diff --git a/recipes/vala/vala-native_0.7.5+fso2.bb b/recipes/vala/vala-native_0.7.5+fso2.bb
new file mode 100644
index 0000000000..7a73cf5736
--- /dev/null
+++ b/recipes/vala/vala-native_0.7.5+fso2.bb
@@ -0,0 +1,8 @@
+require vala.inc
+inherit native
+DEPENDS = "glib-2.0-native"
+
+VALA_FSO_RELEASE = "0.7.5-fso2"
+PV = "0.7.4+${VALA_FSO_RELEASE}"
+PR = "${INC_PR}.0"
+
diff --git a/recipes/vala/vala.inc b/recipes/vala/vala.inc
index f5ea1ee520..fa1cf6aaa8 100644
--- a/recipes/vala/vala.inc
+++ b/recipes/vala/vala.inc
@@ -1,19 +1,15 @@
 DESCRIPTION = "Vala is a C#-like language dedicated to ease GObject programming. \
-Vala compiles to plain C and has no runtime environment nor penality whatsoever."
+Vala compiles to plain C and has no runtime environment nor penalities whatsoever."
 SECTION = "devel"
 DEPENDS = "glib-2.0 dbus"
-HOMEPAGE = "http://live.gnome.org/Vala"
+HOMEPAGE = "http://vala-project.org"
 LICENSE = "LGPL"
+INC_PR = "r0"
 
-MAJV = "${@bb.data.getVar('PV',d,1)[:3]}"
+SRC_URI = "http://www.freesmartphone.org/sources/vala-${VALA_FSO_RELEASE}.tar.gz"
+S = "${WORKDIR}/vala-${VALA_FSO_RELEASE}"
 
-SRC_URI = "\
-  http://download.gnome.org/sources/vala/${MAJV}/vala-${PV}.tar.bz2 \
-  file://static-dbus-methods.patch;patch=1 \
-"
-S = "${WORKDIR}/vala-${PV}"
-
-inherit autotools autotools_stage lib_package
+inherit autotools_stage
 
 EXTRA_OECONF = "--enable-vapigen"
 
diff --git a/recipes/vala/vala_0.6.0.bb b/recipes/vala/vala_0.6.0.bb
deleted file mode 100644
index e03e39f002..0000000000
--- a/recipes/vala/vala_0.6.0.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require vala.inc
-DEPENDS = "vala-bootstrap-native"
-PR = "r2"
diff --git a/recipes/vala/vala_0.7.5+fso2.bb b/recipes/vala/vala_0.7.5+fso2.bb
new file mode 100644
index 0000000000..fff355ebaf
--- /dev/null
+++ b/recipes/vala/vala_0.7.5+fso2.bb
@@ -0,0 +1,6 @@
+require vala.inc
+VALA_FSO_RELEASE = "0.7.5-fso2"
+PV = "0.7.4+${VALA_FSO_RELEASE}"
+PR = "${INC_PR}.0"
+
+