From 7fd04485a5f54c802b6dd67edfc824356c5f6800 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Tue, 18 Aug 2020 06:40:23 +0200 Subject: [PATCH] anjuta: rebuild for vala-0.48 --- srcpkgs/anjuta/patches/vala048.patch | 90 ++++++++++++++++++++++++++++ srcpkgs/anjuta/template | 2 +- 2 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/anjuta/patches/vala048.patch diff --git a/srcpkgs/anjuta/patches/vala048.patch b/srcpkgs/anjuta/patches/vala048.patch new file mode 100644 index 0000000000..f9e11ba07b --- /dev/null +++ b/srcpkgs/anjuta/patches/vala048.patch @@ -0,0 +1,90 @@ +From 56d2487cb26f90fd850d6fab47e0ec33e229ed1c Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz +Date: Thu, 6 Feb 2020 09:04:39 +0100 +Subject: [PATCH] language-support-vala: Support for vala 0.48 API + +--- + plugins/language-support-vala/plugin.vala | 33 +++++++++++++++++------ + 1 file changed, 25 insertions(+), 8 deletions(-) + +diff --git a/plugins/language-support-vala/plugin.vala b/plugins/language-support-vala/plugin.vala +index 13d35fec4..718d74cc8 100644 +--- plugins/language-support-vala/plugin.vala ++++ plugins/language-support-vala/plugin.vala +@@ -414,11 +414,19 @@ public class ValaPlugin : Plugin, IAnjuta.Preferences { + builder.append_printf ("%s sender", widget.get_full_name ()); + + foreach (var param in sig.get_parameters ()) { ++#if VALA_0_48 ++ builder.append_printf (", %s %s", param.variable_type.type_symbol.get_full_name (), param.name); ++#else + builder.append_printf (", %s %s", param.variable_type.data_type.get_full_name (), param.name); ++#endif + } + } else { + foreach (var param in sig.get_parameters ()) { ++#if VALA_0_48 ++ builder.append_printf ("%s %s, ", param.variable_type.type_symbol.get_full_name (), param.name); ++#else + builder.append_printf ("%s %s, ", param.variable_type.data_type.get_full_name (), param.name); ++#endif + } + + builder.append_printf ("%s sender", widget.get_full_name ()); +@@ -563,6 +571,15 @@ public class ValaPlugin : Plugin, IAnjuta.Preferences { + } + return matching_symbols; + } ++ ++ inline List symbol_lookup_inherited_for_type (Vala.DataType data_type, string name, bool prefix_match, bool invocation = false) { ++#if VALA_0_48 ++ return symbol_lookup_inherited (data_type.type_symbol, name, prefix_match, invocation); ++#else ++ return symbol_lookup_inherited (data_type.data_type, name, prefix_match, invocation); ++#endif ++ } ++ + List symbol_lookup_inherited (Vala.Symbol? sym, string name, bool prefix_match, bool invocation = false) { + List result = null; + +@@ -580,32 +597,32 @@ public class ValaPlugin : Plugin, IAnjuta.Preferences { + } + if (invocation && sym is Vala.Method) { + var func = (Vala.Method) sym; +- result.concat (symbol_lookup_inherited (func.return_type.data_type, name, prefix_match)); ++ result.concat (symbol_lookup_inherited_for_type (func.return_type, name, prefix_match)); + } else if (sym is Vala.Class) { + var cl = (Vala.Class) sym; + foreach (var base_type in cl.get_base_types ()) { +- result.concat (symbol_lookup_inherited (base_type.data_type, name, prefix_match)); ++ result.concat (symbol_lookup_inherited_for_type (base_type, name, prefix_match)); + } + } else if (sym is Vala.Struct) { + var st = (Vala.Struct) sym; +- result.concat (symbol_lookup_inherited (st.base_type.data_type, name, prefix_match)); ++ result.concat (symbol_lookup_inherited_for_type (st.base_type, name, prefix_match)); + } else if (sym is Vala.Interface) { + var iface = (Vala.Interface) sym; + foreach (var prerequisite in iface.get_prerequisites ()) { +- result.concat (symbol_lookup_inherited (prerequisite.data_type, name, prefix_match)); ++ result.concat (symbol_lookup_inherited_for_type (prerequisite, name, prefix_match)); + } + } else if (sym is Vala.LocalVariable) { + var variable = (Vala.LocalVariable) sym; +- result.concat (symbol_lookup_inherited (variable.variable_type.data_type, name, prefix_match)); ++ result.concat (symbol_lookup_inherited_for_type (variable.variable_type, name, prefix_match)); + } else if (sym is Vala.Field) { + var field = (Vala.Field) sym; +- result.concat (symbol_lookup_inherited (field.variable_type.data_type, name, prefix_match)); ++ result.concat (symbol_lookup_inherited_for_type (field.variable_type, name, prefix_match)); + } else if (sym is Vala.Property) { + var prop = (Vala.Property) sym; +- result.concat (symbol_lookup_inherited (prop.property_type.data_type, name, prefix_match)); ++ result.concat (symbol_lookup_inherited_for_type (prop.property_type, name, prefix_match)); + } else if (sym is Vala.Parameter) { + var fp = (Vala.Parameter) sym; +- result.concat (symbol_lookup_inherited (fp.variable_type.data_type, name, prefix_match)); ++ result.concat (symbol_lookup_inherited_for_type (fp.variable_type, name, prefix_match)); + } + + return result; diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template index eb73aee88d..c21c927cd1 100644 --- a/srcpkgs/anjuta/template +++ b/srcpkgs/anjuta/template @@ -1,7 +1,7 @@ # Template file for 'anjuta' pkgname=anjuta version=3.34.0 -revision=2 +revision=3 build_style=gnu-configure build_helper="gir qemu" configure_args="--disable-compile-warnings --disable-schemas-compile