Signed-off-by: Frederik 'playya' Sdun <[email protected]> --- ...ate-variables-in-GObject-creation-methods.patch | 60 --------------- ...Fix-return-type-of-closure-unref-function.patch | 25 ------- ...-Fix-marshalling-of-GLib.Value-parameters.patch | 77 -------------------- ...Fix-error-propagation-in-creation-methods.patch | 29 -------- ...-glib-2.0-Fix-g_regex_get_pattern-binding.patch | 25 ------- recipes/vala/vala-native_0.7.7+fso1.bb | 7 ++ recipes/vala/vala-native_0.7.7.bb | 15 ---- recipes/vala/vala_0.7.7+fso1.bb | 5 ++ recipes/vala/vala_0.7.7.bb | 11 --- 9 files changed, 12 insertions(+), 242 deletions(-)
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 7f00072..0000000 --- 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?= <[email protected]> -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 5464831..0000000 --- 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?= <[email protected]> -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 ab5b93f..0000000 --- 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?= <[email protected]> -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 1c697ef..0000000 --- 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?= <[email protected]> -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 e791ec9..0000000 --- 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 <[email protected]> -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 0000000..8a4b136 --- /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 e85d4e4..0000000 --- a/recipes/vala/vala-native_0.7.7.bb +++ /dev/null @@ -1,15 +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 \ - " 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 0000000..b967800 --- /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 6f9279d..0000000 --- a/recipes/vala/vala_0.7.7.bb +++ /dev/null @@ -1,11 +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 \ - " -- 1.6.5.rc2.7.gf4df9.dirty _______________________________________________ Shr-devel mailing list [email protected] http://lists.shr-project.org/mailman/listinfo/shr-devel
