From: Andrea Del Signore <sejerpz@tin.it>
Subject: Fix build with vala 0.14
Origin: upstream
---
configure.ac | 10 +++++-----
vtg/vtgprojectmanagerui.vala | 2 +-
vtg/vtgprojectview.vala | 2 +-
vtg/vtgsourceoutlinerview.vala | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
--- valatoys.orig/configure.ac
+++ valatoys/configure.ac
@@ -12,7 +12,7 @@ AM_PROG_CC_C_O
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
-AC_PATH_PROG(VALAC, valac-0.12, valac-0.12)
+AC_PATH_PROG(VALAC, valac-0.14, valac-0.14)
AC_SUBST(VALAC)
GLIB_GSETTINGS
@@ -31,10 +31,10 @@ AC_SUBST(LDFLAGS)
GLIB_REQUIRED=2.28.0
GTHREAD_REQUIRED=2.28.0
GTK_REQUIRED=3.0.0
-GEDIT_REQUIRED=2.91.0
-GTKSOURCEVIEW_REQUIRED=2.91.0
-VALA_REQUIRED=0.11.0
-VALA_VERSION=0.12
+GEDIT_REQUIRED=3.0.0
+GTKSOURCEVIEW_REQUIRED=3.0.0
+VALA_REQUIRED=0.14.0
+VALA_VERSION=0.14
PEAS_REQUIRED=0.7.4
AFRODITE_REQUIRED=
--- valatoys.orig/vtg/vtgprojectmanagerui.vala
+++ valatoys/vtg/vtgprojectmanagerui.vala
@@ -131,7 +131,7 @@ namespace Vtg
</ui>""";
private uint _ui_id;
- const ActionEntry[] _action_entries = {
+ const Gtk.ActionEntry[] _action_entries = {
{"ProjectNew", null, N_("_New Project..."), null, N_("Create a new project"), on_project_new},
{"ProjectOpen", null, N_("Op_en Project..."), "<control><alt>O", N_("Open an existing project"), on_project_open},
{"ProjectSaveAll", null, N_("Save All"), null, N_("Save all project files"), on_project_save_all},
--- valatoys.orig/vtg/vtgprojectview.vala
+++ valatoys/vtg/vtgprojectview.vala
@@ -56,7 +56,7 @@ namespace Vtg
</ui>""";
- const ActionEntry[] _action_entries = {
+ const Gtk.ActionEntry[] _action_entries = {
{"packages-open-configure", Gtk.Stock.OPEN, N_("Open configure file..."), "<control><shift>C", N_("Open configure.ac file"), on_packages_open_configure},
{"target-open-makefile", Gtk.Stock.OPEN, N_("Open makefile"), "<control><shift>M", N_("Open makefile.am file"), on_target_open_makefile}
};
--- valatoys.orig/vtg/vtgsourceoutlinerview.vala
+++ valatoys/vtg/vtgsourceoutlinerview.vala
@@ -74,7 +74,7 @@ namespace Vtg
</popup>
</ui>""";
- const ActionEntry[] _action_entries = {
+ const Gtk.ActionEntry[] _action_entries = {
{"source-outliner-goto", Gtk.Stock.OPEN, N_("Goto definition..."), null, N_("Goto symbol definition"), on_source_outliner_goto}
};