diff -Nru anjuta-3.34.0/debian/changelog anjuta-3.34.0/debian/changelog --- anjuta-3.34.0/debian/changelog 2020-02-05 22:20:13.000000000 +0000 +++ anjuta-3.34.0/debian/changelog 2020-02-06 08:41:40.000000000 +0000 @@ -1,3 +1,11 @@ +anjuta (2:3.34.0-3ubuntu1) focal; urgency=medium + + * debian/patches/gitlab_vala048_build.patch: + - patch from Rico Tzschichholz to fix the build with the new vala 0.48 + version + + -- Sebastien Bacher Thu, 06 Feb 2020 09:38:53 +0100 + anjuta (2:3.34.0-3build2) focal; urgency=medium * Rebuild with the vala version diff -Nru anjuta-3.34.0/debian/control anjuta-3.34.0/debian/control --- anjuta-3.34.0/debian/control 2019-10-28 01:48:39.000000000 +0000 +++ anjuta-3.34.0/debian/control 2020-02-06 08:41:53.000000000 +0000 @@ -5,7 +5,8 @@ Source: anjuta Section: gnome Priority: optional -Maintainer: Debian GNOME Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: Jeremy Bicha Build-Depends: debhelper-compat (= 12), dh-sequence-gir, diff -Nru anjuta-3.34.0/debian/control.in anjuta-3.34.0/debian/control.in --- anjuta-3.34.0/debian/control.in 2019-10-27 23:45:05.000000000 +0000 +++ anjuta-3.34.0/debian/control.in 2020-02-06 08:41:53.000000000 +0000 @@ -1,7 +1,8 @@ Source: anjuta Section: gnome Priority: optional -Maintainer: Debian GNOME Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ Build-Depends: debhelper-compat (= 12), dh-sequence-gir, diff -Nru anjuta-3.34.0/debian/patches/gitlab_vala048_build.patch anjuta-3.34.0/debian/patches/gitlab_vala048_build.patch --- anjuta-3.34.0/debian/patches/gitlab_vala048_build.patch 1970-01-01 00:00:00.000000000 +0000 +++ anjuta-3.34.0/debian/patches/gitlab_vala048_build.patch 2020-02-06 08:40:38.000000000 +0000 @@ -0,0 +1,120 @@ +From 92c0b79720629321a0909cb65e3ef49d3af3a64f Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz +Date: Thu, 6 Feb 2020 09:04:39 +0100 +Subject: [PATCH 1/2] language-support-vala: Support for vala 0.48 API + +https://gitlab.gnome.org/GNOME/anjuta/merge_requests/8 +--- + 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 +--- a/plugins/language-support-vala/plugin.vala ++++ b/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; +-- +2.24.1 + + +From ed6b1f73c795d78e430a50a851485cbda11a6e34 Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz +Date: Thu, 6 Feb 2020 08:46:54 +0100 +Subject: [PATCH 2/2] build: Allow building with vala 0.48 + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 3526a16e6..200526c2d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -338,7 +338,7 @@ if test "$user_disabled_vala" = 1; then + else + AC_MSG_RESULT(no) + AC_MSG_CHECKING(if libvala is available) +- m4_foreach_w([VERSION], [0.46 0.44 0.42 0.40 0.38 0.36 0.34 0.32], ++ m4_foreach_w([VERSION], [0.48 0.46 0.44 0.42 0.40 0.38 0.36 0.34 0.32], + [PKG_CHECK_EXISTS([ libvala-VERSION ], + [ valaver="-VERSION" ]) + ]) +-- +2.24.1 + diff -Nru anjuta-3.34.0/debian/patches/series anjuta-3.34.0/debian/patches/series --- anjuta-3.34.0/debian/patches/series 2019-10-27 23:44:40.000000000 +0000 +++ anjuta-3.34.0/debian/patches/series 2020-02-06 08:40:24.000000000 +0000 @@ -1,2 +1,3 @@ no_gnu_gettext.patch build-Allow-building-with-vala-0.46.patch +gitlab_vala048_build.patch