[arch-commits] Commit in anjuta/trunk (4 files)
Date: Sunday, September 27, 2020 @ 21:41:37 Author: heftig Revision: 396818 3.34.0-5: remove vala plugin; no longer builds (again) Modified: anjuta/trunk/PKGBUILD Deleted: anjuta/trunk/0001-build-Allow-building-with-vala-0.46-and-drop-support.patch anjuta/trunk/0002-language-support-vala-Support-for-vala-0.48-API.patch anjuta/trunk/0003-build-Allow-building-with-vala-0.48.patch -+ 0001-build-Allow-building-with-vala-0.46-and-drop-support.patch | 39 --- 0002-language-support-vala-Support-for-vala-0.48-API.patch | 103 -- 0003-build-Allow-building-with-vala-0.48.patch | 25 -- PKGBUILD| 27 -- 4 files changed, 10 insertions(+), 184 deletions(-) Deleted: 0001-build-Allow-building-with-vala-0.46-and-drop-support.patch === --- 0001-build-Allow-building-with-vala-0.46-and-drop-support.patch 2020-09-27 21:33:41 UTC (rev 396817) +++ 0001-build-Allow-building-with-vala-0.46-and-drop-support.patch 2020-09-27 21:41:37 UTC (rev 396818) @@ -1,39 +0,0 @@ -From ebaac39cbd1f9e3442326262837230c3d71303fb Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz -Date: Wed, 18 Sep 2019 18:26:03 +0200 -Subject: [PATCH 1/3] build: Allow building with vala 0.46 and drop support for - 0.30 and earlier - - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 3b4c99504..3526a16e6 100644 a/configure.ac -+++ b/configure.ac -@@ -338,19 +338,19 @@ if test "$user_disabled_vala" = 1; then - else - AC_MSG_RESULT(no) - AC_MSG_CHECKING(if libvala is available) -- m4_foreach([VERSION], [[0.44], [0.42], [0.40], [0.38], [0.36], [0.34], [0.32], [0.30], [0.28], [0.26], [0.24], [0.22], [0.20], [0.18]], -+ m4_foreach_w([VERSION], [0.46 0.44 0.42 0.40 0.38 0.36 0.34 0.32], - [PKG_CHECK_EXISTS([ libvala-VERSION ], -[ valaver="-VERSION" ]) -]) - if test "x$valaver" != "x"; then - AC_MSG_RESULT(yes) - enable_vala="yes" - LIBVALA="libvala${valaver}" - PKG_CHECK_MODULES([VALA], ${LIBVALA}) - else - AC_MSG_RESULT(no) - enable_vala="no" -- VALA_REQUIRED=0.18.0 -+ VALA_REQUIRED=0.32.0 - fi - AC_SUBST(LIBVALA) - fi --- -2.25.1 - Deleted: 0002-language-support-vala-Support-for-vala-0.48-API.patch === --- 0002-language-support-vala-Support-for-vala-0.48-API.patch 2020-09-27 21:33:41 UTC (rev 396817) +++ 0002-language-support-vala-Support-for-vala-0.48-API.patch 2020-09-27 21:41:37 UTC (rev 396818) @@ -1,103 +0,0 @@ -From 56d2487cb26f90fd850d6fab47e0ec33e229ed1c Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz -Date: Thu, 6 Feb 2020 09:04:39 +0100 -Subject: [PATCH 2/3] 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 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,49 +571,58 @@ 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
[arch-commits] Commit in anjuta/trunk (4 files)
Date: Tuesday, March 3, 2020 @ 19:26:41 Author: heftig Revision: 376525 3.34.0-3: vala 0.48 Added: anjuta/trunk/0001-build-Allow-building-with-vala-0.46-and-drop-support.patch anjuta/trunk/0002-language-support-vala-Support-for-vala-0.48-API.patch anjuta/trunk/0003-build-Allow-building-with-vala-0.48.patch Modified: anjuta/trunk/PKGBUILD -+ 0001-build-Allow-building-with-vala-0.46-and-drop-support.patch | 39 +++ 0002-language-support-vala-Support-for-vala-0.48-API.patch | 103 ++ 0003-build-Allow-building-with-vala-0.48.patch | 25 ++ PKGBUILD| 17 + 4 files changed, 179 insertions(+), 5 deletions(-) Added: 0001-build-Allow-building-with-vala-0.46-and-drop-support.patch === --- 0001-build-Allow-building-with-vala-0.46-and-drop-support.patch (rev 0) +++ 0001-build-Allow-building-with-vala-0.46-and-drop-support.patch 2020-03-03 19:26:41 UTC (rev 376525) @@ -0,0 +1,39 @@ +From ebaac39cbd1f9e3442326262837230c3d71303fb Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz +Date: Wed, 18 Sep 2019 18:26:03 +0200 +Subject: [PATCH 1/3] build: Allow building with vala 0.46 and drop support for + 0.30 and earlier + +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 3b4c99504..3526a16e6 100644 +--- a/configure.ac b/configure.ac +@@ -338,19 +338,19 @@ if test "$user_disabled_vala" = 1; then + else + AC_MSG_RESULT(no) + AC_MSG_CHECKING(if libvala is available) +- m4_foreach([VERSION], [[0.44], [0.42], [0.40], [0.38], [0.36], [0.34], [0.32], [0.30], [0.28], [0.26], [0.24], [0.22], [0.20], [0.18]], ++ m4_foreach_w([VERSION], [0.46 0.44 0.42 0.40 0.38 0.36 0.34 0.32], + [PKG_CHECK_EXISTS([ libvala-VERSION ], +[ valaver="-VERSION" ]) +]) + if test "x$valaver" != "x"; then + AC_MSG_RESULT(yes) + enable_vala="yes" + LIBVALA="libvala${valaver}" + PKG_CHECK_MODULES([VALA], ${LIBVALA}) + else + AC_MSG_RESULT(no) + enable_vala="no" +- VALA_REQUIRED=0.18.0 ++ VALA_REQUIRED=0.32.0 + fi + AC_SUBST(LIBVALA) + fi +-- +2.25.1 + Added: 0002-language-support-vala-Support-for-vala-0.48-API.patch === --- 0002-language-support-vala-Support-for-vala-0.48-API.patch (rev 0) +++ 0002-language-support-vala-Support-for-vala-0.48-API.patch 2020-03-03 19:26:41 UTC (rev 376525) @@ -0,0 +1,103 @@ +From 56d2487cb26f90fd850d6fab47e0ec33e229ed1c Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz +Date: Thu, 6 Feb 2020 09:04:39 +0100 +Subject: [PATCH 2/3] 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 +--- 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,49 +571,58 @@ 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,