peter green wrote:
The ftbfs bugs caused by vala and a new gobject-introspection can
easily be fixed (at least in most cases) by switching to valac-0.20
which just got its way into unstable. I just fixed bug #707378 this
way by switching the build dependency accordingly.
Unfortunately in the case of valatoys it's not that simple. Switching
to valac 0.20 (debdiff attached)
Sorry forgot to actually attach the diff for this one
diff -urN valatoys-0.12.1/debian/control valatoys-0.12.1.new/debian/control
--- valatoys-0.12.1/debian/control 2012-04-07 17:10:22.000000000 +0000
+++ valatoys-0.12.1.new/debian/control 2013-08-20 19:27:00.000000000 +0000
@@ -6,11 +6,11 @@
debhelper (>= 8~)
, dh-autoreconf
, autotools-dev
- , valac-0.14
+ , valac-0.20
, intltool (>= 0.35.0)
, libglib2.0-dev (>= 2.16.0)
, libgtk2.0-dev (>= 2.18.0)
- , libvala-0.14-dev (>= 0.9.7)
+ , libvala-0.20-dev (>= 0.9.7)
, libgtksourceview2.0-dev (>= 2.10.3)
, libgconf2-dev (>= 2.22.0)
, gedit-dev (>= 2.28.0)
diff -urN valatoys-0.12.1/debian/patches/07-build_with_0.14.patch valatoys-0.12.1.new/debian/patches/07-build_with_0.14.patch
--- valatoys-0.12.1/debian/patches/07-build_with_0.14.patch 2012-04-07 17:10:22.000000000 +0000
+++ valatoys-0.12.1.new/debian/patches/07-build_with_0.14.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,70 +0,0 @@
-From: Andrea Del Signore <seje...@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}
- };
-
diff -urN valatoys-0.12.1/debian/patches/07-build_with_0.20.patch valatoys-0.12.1.new/debian/patches/07-build_with_0.20.patch
--- valatoys-0.12.1/debian/patches/07-build_with_0.20.patch 1970-01-01 00:00:00.000000000 +0000
+++ valatoys-0.12.1.new/debian/patches/07-build_with_0.20.patch 2013-08-20 19:25:49.000000000 +0000
@@ -0,0 +1,70 @@
+From: Andrea Del Signore <seje...@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.20)
+ 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.20
+ 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}
+ };
+
diff -urN valatoys-0.12.1/debian/patches/series valatoys-0.12.1.new/debian/patches/series
--- valatoys-0.12.1/debian/patches/series 2012-04-07 17:10:22.000000000 +0000
+++ valatoys-0.12.1.new/debian/patches/series 2013-08-20 19:24:50.000000000 +0000
@@ -6,5 +6,5 @@
05-fix_plugin_path.patch
06-disable_versioned_header.patch
#07-remove_versioned_headers.patch
-07-build_with_0.14.patch
+07-build_with_0.20.patch
08-dont_generate_version_number.patch
