Replace errornous vala 0.7.7 by 0.7.7+fso1

Signed-off-by: Klaus Kurzmann <mok@fluxnetz.de>

14 files changed, 16 insertions, 496 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index f6f9094bb7..19a18a1d80 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -22018,6 +22018,10 @@ sha256=4dfd1ff2793f71ab11d842ff4379a676a30af4287b7b6892ba9733bf7b691c10
 md5=ca44d7e733e4f2058a1e5e8a0aa5d2e0
 sha256=59295d46010c19f7b23f46e60522e6161ffc44685ef20fc04aca8b54d3fd7ef0
 
+[http://www.freesmartphone.org/sources/vala-0.7.7+fso1.tar.bz2]
+md5=870e79fceb3d8c2d9fa139df097ec66d
+sha256=147613e4c794b45d4c75d78d7aba7b688ad6c90ff6778475c836412ee7f4cbed
+
 [http://ftp.gnome.org/pub/GNOME/sources/vala/0.7/vala-0.7.7.tar.bz2]
 md5=7d11fcddb2bd30b9ecbdacfaa20f2769
 sha256=ebb1afbb0a61dd8f5f8ef13512e789697e98d5ad5f98739120f3b3cc02d46d8f
diff --git a/recipes/vala/files/0001-Fix-generated-code-for-stack-allocated-arrays.patch b/recipes/vala/files/0001-Fix-generated-code-for-stack-allocated-arrays.patch
deleted file mode 100644
index de3dec433b..0000000000
--- a/recipes/vala/files/0001-Fix-generated-code-for-stack-allocated-arrays.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 2dda5192f775543bbd49494934f4d5c54cd45af1 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?J=C3=BCrg=20Billeter?= <j@bitron.ch>
-Date: Fri, 2 Oct 2009 23:46:29 +0200
-Subject: [PATCH] Fix generated code for stack-allocated arrays
-
-Fixes bug 595751.
----
- vala/valasymbolresolver.vala     |    7 ++++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/vala/valasymbolresolver.vala b/vala/valasymbolresolver.vala
-index 213bd53..09a9c19 100644
---- a/vala/valasymbolresolver.vala
-+++ b/vala/valasymbolresolver.vala
-@@ -350,7 +350,12 @@ public class Vala.SymbolResolver : CodeVisitor {
- 	public override void visit_local_variable (LocalVariable local) {
- 		local.accept_children (this);
- 		if (local.variable_type is ReferenceType) {
--			local.variable_type.nullable = true;
-+			var array_type = local.variable_type as ArrayType;
-+			if (array_type != null && array_type.fixed_length) {
-+				// local fixed length arrays are not nullable
-+			} else {
-+				local.variable_type.nullable = true;
-+			}
- 		}
- 	}
- 
--- 
-1.6.0.4
-
diff --git a/recipes/vala/files/0001-Fix-memory-management-for-closures-used-as-signal-ha.patch b/recipes/vala/files/0001-Fix-memory-management-for-closures-used-as-signal-ha.patch
deleted file mode 100644
index 9596b07830..0000000000
--- a/recipes/vala/files/0001-Fix-memory-management-for-closures-used-as-signal-ha.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 7e192cd797d8f950ee35082863e01d455192d9f2 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?J=C3=BCrg=20Billeter?= <j@bitron.ch>
-Date: Fri, 2 Oct 2009 21:50:28 +0200
-Subject: [PATCH] Fix memory management for closures used as signal handlers
-
-Fixes bug 597155.
----
- tests/Makefile.am            |    1 +
- tests/objects/bug597155.vala |   16 ++++++++++++++++
- vala/valasignaltype.vala     |    4 +++-
- 3 files changed, 20 insertions(+), 1 deletions(-)
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index e510669..2696259 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -52,6 +52,7 @@ TESTS = \
- 	objects/test-034.vala \
- 	objects/bug593260.vala \
- 	objects/bug596621.vala \
-+	objects/bug597155.vala \
- 	errors/errors.vala \
- 	errors/bug579101.vala \
- 	errors/bug596228.vala \
-diff --git a/tests/objects/bug597155.vala b/tests/objects/bug597155.vala
-new file mode 100644
-index 0000000..c6a6283
---- /dev/null
-+++ b/tests/objects/bug597155.vala
-@@ -0,0 +1,16 @@
-+class Foo : Object {
-+	public signal void bar ();
-+}
-+
-+Foo do_foo () {
-+	var foo = new Foo ();
-+	foo.bar.connect (() => {
-+		assert (foo is Foo);
-+	});
-+	return foo;
-+}
-+
-+void main () {
-+	var foo = do_foo ();
-+	foo.bar ();
-+}
-diff --git a/vala/valasignaltype.vala b/vala/valasignaltype.vala
-index 19430a8..b7e3b84 100644
---- a/vala/valasignaltype.vala
-+++ b/vala/valasignaltype.vala
-@@ -62,7 +62,9 @@ public class Vala.SignalType : DataType {
- 
- 	DelegateType get_handler_type () {
- 		var sender_type = new ObjectType ((ObjectTypeSymbol) signal_symbol.parent_symbol);
--		return new DelegateType (signal_symbol.get_delegate (sender_type, this));
-+		var result = new DelegateType (signal_symbol.get_delegate (sender_type, this));
-+		result.value_owned = true;
-+		return result;
- 	}
- 
- 	Method get_connect_method () {
--- 
-1.6.0.4
-
diff --git a/recipes/vala/files/0001-GAsync-Fix-async-methods-with-delegate-parameters.patch b/recipes/vala/files/0001-GAsync-Fix-async-methods-with-delegate-parameters.patch
deleted file mode 100644
index a06bf97261..0000000000
--- a/recipes/vala/files/0001-GAsync-Fix-async-methods-with-delegate-parameters.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 43c8f34ed184a730874f87be47f116d707407ff7 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?J=C3=BCrg=20Billeter?= <j@bitron.ch>
-Date: Mon, 5 Oct 2009 18:49:52 +0200
-Subject: [PATCH] GAsync: Fix async methods with delegate parameters
-
-Fixes bug 597294.
----
- codegen/valagasyncmodule.vala     |    7 +++++++
- tests/Makefile.am                 |    1 +
- tests/asynchronous/bug597294.vala |    8 ++++++++
- 3 files changed, 16 insertions(+), 0 deletions(-)
-
-diff --git a/codegen/valagasyncmodule.vala b/codegen/valagasyncmodule.vala
-index 4fade0d..6f17344 100644
---- a/codegen/valagasyncmodule.vala
-+++ b/codegen/valagasyncmodule.vala
-@@ -53,6 +53,7 @@ internal class Vala.GAsyncModule : GSignalModule {
- 				}
- 			} else if (param.parameter_type is DelegateType) {
- 				data.add_field ("gpointer", get_delegate_target_cname (get_variable_cname (param.name)));
-+				data.add_field ("GDestroyNotify", get_delegate_target_destroy_notify_cname (get_variable_cname (param.name)));
- 			}
- 		}
- 
-@@ -65,6 +66,7 @@ internal class Vala.GAsyncModule : GSignalModule {
- 				}
- 			} else if (m.return_type is DelegateType) {
- 				data.add_field ("gpointer", get_delegate_target_cname ("result"));
-+				data.add_field ("GDestroyNotify", get_delegate_target_destroy_notify_cname ("result"));
- 			}
- 		}
- 
-@@ -96,6 +98,7 @@ internal class Vala.GAsyncModule : GSignalModule {
- 				if (requires_destroy (param_type)) {
- 					var ma = new MemberAccess.simple (param.name);
- 					ma.symbol_reference = param;
-+					ma.value_type = param.parameter_type.copy ();
- 					freeblock.add_statement (new CCodeExpressionStatement (get_unref_expression (new CCodeMemberAccess.pointer (new CCodeIdentifier ("data"), get_variable_cname (param.name)), param.parameter_type, ma)));
- 				}
- 			}
-@@ -206,7 +209,11 @@ internal class Vala.GAsyncModule : GSignalModule {
- 						asyncblock.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeMemberAccess.pointer (data_var, get_array_length_cname (get_variable_cname (param.name), dim)), new CCodeIdentifier (get_array_length_cname (get_variable_cname (param.name), dim)))));
- 					}
- 				} else if (param.parameter_type is DelegateType) {
-+					var deleg_type = (DelegateType) param.parameter_type;
- 					asyncblock.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeMemberAccess.pointer (data_var, get_delegate_target_cname (get_variable_cname (param.name))), new CCodeIdentifier (get_delegate_target_cname (get_variable_cname (param.name))))));
-+					if (deleg_type.value_owned) {
-+						asyncblock.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeMemberAccess.pointer (data_var, get_delegate_target_destroy_notify_cname (get_variable_cname (param.name))), new CCodeIdentifier (get_delegate_target_destroy_notify_cname (get_variable_cname (param.name))))));
-+					}
- 				}
- 			}
- 		}
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 8f704db..e9be7e8 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -62,6 +62,7 @@ TESTS = \
- 	asynchronous/bug595735.vala \
- 	asynchronous/bug595755.vala \
- 	asynchronous/bug596177.vala \
-+	asynchronous/bug597294.vala \
- 	dbus/basic-types.test \
- 	dbus/arrays.test \
- 	dbus/async.test \
-diff --git a/tests/asynchronous/bug597294.vala b/tests/asynchronous/bug597294.vala
-new file mode 100644
-index 0000000..92a04bf
---- /dev/null
-+++ b/tests/asynchronous/bug597294.vala
-@@ -0,0 +1,8 @@
-+delegate void Foo ();
-+
-+async void do_foo (Foo f) {
-+	f ();
-+}
-+
-+void main () {
-+}
--- 
-1.6.0.4
-
diff --git a/recipes/vala/files/0001-GAsync-Fix-connecting-signal-handlers-in-async-meth.patch b/recipes/vala/files/0001-GAsync-Fix-connecting-signal-handlers-in-async-meth.patch
deleted file mode 100644
index 6351d52789..0000000000
--- a/recipes/vala/files/0001-GAsync-Fix-connecting-signal-handlers-in-async-meth.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From ca65d7ec727bea515030d0c9293979b2ac1cf188 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?J=C3=BCrg=20Billeter?= <j@bitron.ch>
-Date: Fri, 2 Oct 2009 22:11:11 +0200
-Subject: [PATCH] GAsync: Fix connecting signal handlers in async methods
-
-Fixes bug 595755.
----
- codegen/valagsignalmodule.vala    |    6 +++---
- tests/Makefile.am                 |    1 +
- tests/asynchronous/bug595755.vala |   11 +++++++++++
- 3 files changed, 15 insertions(+), 3 deletions(-)
-
-diff --git a/codegen/valagsignalmodule.vala b/codegen/valagsignalmodule.vala
-index 2387b12..8bfcd9f 100644
---- a/codegen/valagsignalmodule.vala
-+++ b/codegen/valagsignalmodule.vala
-@@ -594,7 +594,7 @@ internal class Vala.GSignalModule : GObjectModule {
- 		if (ma.inner != null) {
- 			ccall.add_argument ((CCodeExpression) get_ccodenode (ma.inner));
- 		} else {
--			ccall.add_argument (new CCodeIdentifier ("self"));
-+			ccall.add_argument (get_result_cexpression ("self"));
- 		}
- 
- 		if (sig is DynamicSignal) {
-@@ -671,10 +671,10 @@ internal class Vala.GSignalModule : GObjectModule {
- 				if (right_ma.inner != null) {
- 					ccall.add_argument ((CCodeExpression) right_ma.inner.ccodenode);
- 				} else {
--					ccall.add_argument (new CCodeIdentifier ("self"));
-+					ccall.add_argument (get_result_cexpression ("self"));
- 				}
- 			} else if (handler is LambdaExpression) {
--				ccall.add_argument (new CCodeIdentifier ("self"));
-+				ccall.add_argument (get_result_cexpression ("self"));
- 			}
- 			if (!disconnect && !(sig is DynamicSignal)
- 			    && in_gobject_instance (m)) {
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 2696259..eb19c7f 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -57,6 +57,7 @@ TESTS = \
- 	errors/bug579101.vala \
- 	errors/bug596228.vala \
- 	asynchronous/bug595735.vala \
-+	asynchronous/bug595755.vala \
- 	asynchronous/bug596177.vala \
- 	dbus/basic-types.test \
- 	dbus/arrays.test \
-diff --git a/tests/asynchronous/bug595755.vala b/tests/asynchronous/bug595755.vala
-new file mode 100644
-index 0000000..ac9bbd5
---- /dev/null
-+++ b/tests/asynchronous/bug595755.vala
-@@ -0,0 +1,11 @@
-+class Foo : Object {
-+	public signal void bar ();
-+
-+	public async void do_foo () {
-+		bar.connect (() => {
-+		});
-+	}
-+}
-+
-+void main () {
-+}
--- 
-1.6.0.4
-
diff --git a/recipes/vala/files/0003-Fix-delegate-variables-in-GObject-creation-methods.patch b/recipes/vala/files/0003-Fix-delegate-variables-in-GObject-creation-methods.patch
deleted file mode 100644
index 7f00072ef5..0000000000
--- a/recipes/vala/files/0003-Fix-delegate-variables-in-GObject-creation-methods.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 9c0e7c1447bb932df92e6f0a0966e1da363f2c9d Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?J=C3=BCrg=20Billeter?= <j@bitron.ch>
-Date: Mon, 28 Sep 2009 18:01:46 +0200
-Subject: [PATCH] Fix delegate variables in GObject creation methods
-
-Fixes bug 596621.
----
- codegen/valaccodemethodmodule.vala |    1 +
- tests/Makefile.am                  |    1 +
- tests/objects/bug596621.vala       |   15 +++++++++++++++
- 3 files changed, 17 insertions(+), 0 deletions(-)
-
-diff --git a/codegen/valaccodemethodmodule.vala b/codegen/valaccodemethodmodule.vala
-index aa2c1fe..93d49ab 100644
---- a/codegen/valaccodemethodmodule.vala
-+++ b/codegen/valaccodemethodmodule.vala
-@@ -311,6 +311,7 @@ internal class Vala.CCodeMethodModule : CCodeStructModule {
- 						if (!local.floating && requires_destroy (local.variable_type)) {
- 							var ma = new MemberAccess.simple (local.name);
- 							ma.symbol_reference = local;
-+							ma.value_type = local.variable_type.copy ();
- 							cblock.add_statement (new CCodeExpressionStatement (get_unref_expression (get_variable_cexpression (local.name), local.variable_type, ma)));
- 						}
- 					}
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 8c83e86..f1058b8 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -48,6 +48,7 @@ TESTS = \
- 	objects/test-029.vala \
- 	objects/test-034.vala \
- 	objects/bug593260.vala \
-+	objects/bug596621.vala \
- 	errors/errors.vala \
- 	errors/bug596228.vala \
- 	asynchronous/bug595735.vala \
-diff --git a/tests/objects/bug596621.vala b/tests/objects/bug596621.vala
-new file mode 100644
-index 0000000..348ea40
---- /dev/null
-+++ b/tests/objects/bug596621.vala
-@@ -0,0 +1,15 @@
-+class Foo : Object {
-+	[CCode (has_construct_function = false)]
-+	public Foo () {
-+	}
-+}
-+
-+class Bar : Foo {
-+	public Bar () {
-+		Func baz;
-+	}
-+}
-+
-+void main () {
-+}
-+
--- 
-1.6.0.4
-
diff --git a/recipes/vala/files/0005-Fix-return-type-of-closure-unref-function.patch b/recipes/vala/files/0005-Fix-return-type-of-closure-unref-function.patch
deleted file mode 100644
index 5464831afd..0000000000
--- a/recipes/vala/files/0005-Fix-return-type-of-closure-unref-function.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9ef542a99cc1d8263d5953b754c0b23bff4d0312 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?J=C3=BCrg=20Billeter?= <j@bitron.ch>
-Date: Tue, 29 Sep 2009 22:25:24 +0200
-Subject: [PATCH] Fix return type of closure unref function
-
----
- codegen/valaccodebasemodule.vala |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
-index 38662ba..8a1ce31 100644
---- a/codegen/valaccodebasemodule.vala
-+++ b/codegen/valaccodebasemodule.vala
-@@ -1839,7 +1839,7 @@ internal class Vala.CCodeBaseModule : CCodeModule {
- 			ref_fun.block.add_statement (new CCodeReturnStatement (new CCodeIdentifier ("_data%d_".printf (block_id))));
- 			source_type_member_definition.append (ref_fun);
- 
--			var unref_fun = new CCodeFunction ("block%d_data_unref".printf (block_id), struct_name + "*");
-+			var unref_fun = new CCodeFunction ("block%d_data_unref".printf (block_id), "void");
- 			unref_fun.add_parameter (new CCodeFormalParameter ("_data%d_".printf (block_id), struct_name + "*"));
- 			unref_fun.modifiers = CCodeModifiers.STATIC;
- 			source_declarations.add_type_member_declaration (unref_fun.copy ());
--- 
-1.6.0.4
-
diff --git a/recipes/vala/files/0010-D-Bus-Fix-marshalling-of-GLib.Value-parameters.patch b/recipes/vala/files/0010-D-Bus-Fix-marshalling-of-GLib.Value-parameters.patch
deleted file mode 100644
index ab5b93f8ae..0000000000
--- a/recipes/vala/files/0010-D-Bus-Fix-marshalling-of-GLib.Value-parameters.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 663d023a6bca8ccd04cd0e65ed8cc389379e5383 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?J=C3=BCrg=20Billeter?= <j@bitron.ch>
-Date: Wed, 30 Sep 2009 14:28:41 +0200
-Subject: [PATCH] D-Bus: Fix marshalling of GLib.Value parameters
-
-Fixes bug 596862.
----
- codegen/valadbusclientmodule.vala |    2 +-
- codegen/valadbusservermodule.vala |    4 ++--
- tests/Makefile.am                 |    1 +
- tests/dbus/bug596862.vala         |    8 ++++++++
- 4 files changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/codegen/valadbusclientmodule.vala b/codegen/valadbusclientmodule.vala
-index 2315853..6779e51 100644
---- a/codegen/valadbusclientmodule.vala
-+++ b/codegen/valadbusclientmodule.vala
-@@ -1273,7 +1273,7 @@ internal class Vala.DBusClientModule : DBusModule {
- 
- 		foreach (FormalParameter param in sig.get_parameters ()) {
- 			cdecl = new CCodeDeclaration (param.parameter_type.get_cname ());
--			cdecl.add_declarator (new CCodeVariableDeclarator (param.name, default_value_for_type (param.parameter_type, true)));
-+			cdecl.add_declarator (new CCodeVariableDeclarator.zero (param.name, default_value_for_type (param.parameter_type, true)));
- 			prefragment.append (cdecl);
- 
- 			if (get_type_signature (param.parameter_type) == null) {
-diff --git a/codegen/valadbusservermodule.vala b/codegen/valadbusservermodule.vala
-index c211ecd..fb5fcf1 100644
---- a/codegen/valadbusservermodule.vala
-+++ b/codegen/valadbusservermodule.vala
-@@ -186,7 +186,7 @@ internal class Vala.DBusServerModule : DBusClientModule {
- 			owned_type.value_owned = true;
- 
- 			cdecl = new CCodeDeclaration (owned_type.get_cname ());
--			cdecl.add_declarator (new CCodeVariableDeclarator (param.name, default_value_for_type (param.parameter_type, true)));
-+			cdecl.add_declarator (new CCodeVariableDeclarator.zero (param.name, default_value_for_type (param.parameter_type, true)));
- 			if (param.direction == ParameterDirection.IN) {
- 				in_prefragment.append (cdecl);
- 			} else {
-@@ -270,7 +270,7 @@ internal class Vala.DBusServerModule : DBusClientModule {
- 				Report.error (m.return_type.source_reference, "D-Bus serialization of type `%s' is not supported".printf (m.return_type.to_string ()));
- 			} else if (m.return_type.is_real_struct_type ()) {
- 				cdecl = new CCodeDeclaration (m.return_type.get_cname ());
--				cdecl.add_declarator (new CCodeVariableDeclarator ("result", default_value_for_type (m.return_type, true)));
-+				cdecl.add_declarator (new CCodeVariableDeclarator.zero ("result", default_value_for_type (m.return_type, true)));
- 				out_prefragment.append (cdecl);
- 
- 				if (!m.coroutine) {
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index f3771d5..e510669 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -60,6 +60,7 @@ TESTS = \
- 	dbus/basic-types.test \
- 	dbus/arrays.test \
- 	dbus/async.test \
-+	dbus/bug596862.vala \
- 	$(NULL)
- 
- check-TESTS: $(TESTS)
-diff --git a/tests/dbus/bug596862.vala b/tests/dbus/bug596862.vala
-new file mode 100644
-index 0000000..fd9ec5e
---- /dev/null
-+++ b/tests/dbus/bug596862.vala
-@@ -0,0 +1,8 @@
-+[DBus (name = "org.example.Test")]
-+public class Foo : Object {
-+        public void do_foo (Value value) {
-+        }
-+}
-+
-+void main () {
-+}
--- 
-1.6.0.4
-
diff --git a/recipes/vala/files/0014-GError-Fix-error-propagation-in-creation-methods.patch b/recipes/vala/files/0014-GError-Fix-error-propagation-in-creation-methods.patch
deleted file mode 100644
index 1c697ef8ab..0000000000
--- a/recipes/vala/files/0014-GError-Fix-error-propagation-in-creation-methods.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From fe541bc5cd9d84a567705b72777c2b2117c85aef Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?J=C3=BCrg=20Billeter?= <j@bitron.ch>
-Date: Wed, 30 Sep 2009 19:28:37 +0200
-Subject: [PATCH] GError: Fix error propagation in creation methods
-
----
- codegen/valagerrormodule.vala |    6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/codegen/valagerrormodule.vala b/codegen/valagerrormodule.vala
-index 9d624de..2f1d385 100644
---- a/codegen/valagerrormodule.vala
-+++ b/codegen/valagerrormodule.vala
-@@ -116,7 +116,11 @@ internal class Vala.GErrorModule : CCodeDelegateModule {
- 		append_local_free (current_symbol, free_frag, false);
- 		cerror_block.add_statement (free_frag);
- 
--		if (current_return_type is VoidType) {
-+		if (current_method is CreationMethod) {
-+			cerror_block.add_statement (new CCodeReturnStatement (new CCodeConstant ("NULL")));
-+		} else if (current_method != null && current_method.coroutine) {
-+			cerror_block.add_statement (new CCodeReturnStatement (new CCodeConstant ("FALSE")));
-+		} else if (current_return_type is VoidType) {
- 			cerror_block.add_statement (new CCodeReturnStatement ());
- 		} else {
- 			cerror_block.add_statement (new CCodeReturnStatement (default_value_for_type (current_return_type, false)));
--- 
-1.6.0.4
-
diff --git a/recipes/vala/files/0018-glib-2.0-Fix-g_regex_get_pattern-binding.patch b/recipes/vala/files/0018-glib-2.0-Fix-g_regex_get_pattern-binding.patch
deleted file mode 100644
index e791ec906e..0000000000
--- a/recipes/vala/files/0018-glib-2.0-Fix-g_regex_get_pattern-binding.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 1c402a0db04c355a8414af4871b77bb62f72391f Mon Sep 17 00:00:00 2001
-From: Michael 'Mickey' Lauer <mickey@vanille-media.de>
-Date: Thu, 1 Oct 2009 13:52:44 +0200
-Subject: [PATCH] glib-2.0: Fix g_regex_get_pattern binding
-
----
- vapi/glib-2.0.vapi |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi
-index 4837bc6..3682e7f 100644
---- a/vapi/glib-2.0.vapi
-+++ b/vapi/glib-2.0.vapi
-@@ -2707,7 +2707,7 @@ namespace GLib {
- 	[CCode (ref_function = "g_regex_ref", unref_function = "g_regex_unref")]
- 	public class Regex {
- 		public Regex (string pattern, RegexCompileFlags compile_options = 0, RegexMatchFlags match_options = 0) throws RegexError;
--		public string get_pattern ();
-+		public unowned string get_pattern ();
- 		public int get_max_backref ();
- 		public int get_capture_count ();
- 		public int get_string_number (string name);
--- 
-1.6.0.4
-
diff --git a/recipes/vala/vala-native_0.7.7+fso1.bb b/recipes/vala/vala-native_0.7.7+fso1.bb
new file mode 100644
index 0000000000..8a4b136a82
--- /dev/null
+++ b/recipes/vala/vala-native_0.7.7+fso1.bb
@@ -0,0 +1,7 @@
+require vala.inc
+inherit native
+DEPENDS = "glib-2.0-native"
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "http://www.freesmartphone.org/sources/vala-${PV}.tar.bz2"
diff --git a/recipes/vala/vala-native_0.7.7.bb b/recipes/vala/vala-native_0.7.7.bb
deleted file mode 100644
index e25d87f781..0000000000
--- a/recipes/vala/vala-native_0.7.7.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-require vala.inc
-inherit native
-
-PR = "r1"
-
-DEPENDS = "glib-2.0-native"
-
-SRC_URI = "\
-                  ${GNOME_MIRROR}/vala/0.7/vala-${PV}.tar.bz2 \
-                  file://0003-Fix-delegate-variables-in-GObject-creation-methods.patch;patch=1 \
-                  file://0005-Fix-return-type-of-closure-unref-function.patch;patch=1 \
-                  file://0010-D-Bus-Fix-marshalling-of-GLib.Value-parameters.patch;patch=1 \
-                  file://0014-GError-Fix-error-propagation-in-creation-methods.patch;patch=1 \
-                  file://0018-glib-2.0-Fix-g_regex_get_pattern-binding.patch;patch=1 \
-                  file://0001-Fix-generated-code-for-stack-allocated-arrays.patch;patch=1 \
-                  file://0001-Fix-memory-management-for-closures-used-as-signal-ha.patch;patch=1 \
-                  file://0001-GAsync-Fix-async-methods-with-delegate-parameters.patch;patch=1 \
-                  file://0001-GAsync-Fix-connecting-signal-handlers-in-async-meth.patch;patch=1 \
-                  "
diff --git a/recipes/vala/vala_0.7.7+fso1.bb b/recipes/vala/vala_0.7.7+fso1.bb
new file mode 100644
index 0000000000..b9678009ff
--- /dev/null
+++ b/recipes/vala/vala_0.7.7+fso1.bb
@@ -0,0 +1,5 @@
+require vala.inc
+PR = "${INC_PR}.0"
+
+
+SRC_URI = "http://www.freesmartphone.org/sources/vala-${PV}.tar.bz2"
diff --git a/recipes/vala/vala_0.7.7.bb b/recipes/vala/vala_0.7.7.bb
deleted file mode 100644
index d7167bf932..0000000000
--- a/recipes/vala/vala_0.7.7.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require vala.inc
-PR = "r1"
-
-SRC_URI = "\
-                  ${GNOME_MIRROR}/vala/0.7/vala-${PV}.tar.bz2 \
-                  file://0003-Fix-delegate-variables-in-GObject-creation-methods.patch;patch=1 \
-                  file://0005-Fix-return-type-of-closure-unref-function.patch;patch=1 \
-                  file://0010-D-Bus-Fix-marshalling-of-GLib.Value-parameters.patch;patch=1 \
-                  file://0014-GError-Fix-error-propagation-in-creation-methods.patch;patch=1 \
-                  file://0018-glib-2.0-Fix-g_regex_get_pattern-binding.patch;patch=1 \
-                  file://0001-Fix-generated-code-for-stack-allocated-arrays.patch;patch=1 \
-                  file://0001-Fix-memory-management-for-closures-used-as-signal-ha.patch;patch=1 \
-                  file://0001-GAsync-Fix-async-methods-with-delegate-parameters.patch;patch=1 \
-                  file://0001-GAsync-Fix-connecting-signal-handlers-in-async-meth.patch;patch=1 \
-                  "