You can find a build log from Ubuntu 17.10 Alpha at
https://launchpad.net/~jbicha/+archive/ubuntu/vala36/+build/12762529
From 8e794ef1aafd8a7d3bb9464494b0f850cbd41218 Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jbi...@ubuntu.com>
Date: Sat, 17 Jun 2017 20:43:53 -0400
Subject: [PATCH] Fix build with vala 0.36

Closes: #871185
---
 debian/patches/Build-with-vala-0.36.patch | 48 +++++++++++++++++++++++++++++++
 debian/patches/series                     |  1 +
 2 files changed, 49 insertions(+)
 create mode 100644 debian/patches/Build-with-vala-0.36.patch

diff --git a/debian/patches/Build-with-vala-0.36.patch b/debian/patches/Build-with-vala-0.36.patch
new file mode 100644
index 0000000..cc63c52
--- /dev/null
+++ b/debian/patches/Build-with-vala-0.36.patch
@@ -0,0 +1,48 @@
+From: Jeremy Bicha <jbi...@ubuntu.com>
+Date: Sat, 17 Jun 2017 20:43:18 -0400
+Subject: Build with vala 0.36
+
+---
+ src/setup.vala | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/setup.vala b/src/setup.vala
+index 88b72ce..18f9ca1 100644
+--- a/src/setup.vala
++++ b/src/setup.vala
+@@ -392,7 +392,11 @@ class Setup : Object {
+             } catch (Error e) {
+                 warning ("can't write shortcut: %s", e.message);
+             }
++#if VALA_0_36
++            model.remove (ref iter);
++#else
+             model.remove (iter);
++#endif
+         }
+     }
+ 
+@@ -429,7 +433,11 @@ class Setup : Object {
+                         continue;
+                     keymap.set (old_event, null);
+                 }
++#if VALA_0_36
++                ((Gtk.ListStore)model).remove (ref iter);
++#else
+                 ((Gtk.ListStore)model).remove (iter);
++#endif
+             }
+         }
+         try {
+@@ -557,7 +565,11 @@ class Setup : Object {
+         foreach (var row in rows) {
+             Gtk.TreeIter iter;
+             if (model.get_iter (out iter, row))
++#if VALA_0_36
++                ((Gtk.ListStore)model).remove (ref iter);
++#else
+                 ((Gtk.ListStore)model).remove (iter);
++#endif
+         }
+         save_dictionaries ("system_dictionaries");
+     }
diff --git a/debian/patches/series b/debian/patches/series
index a706715..ec5f1ff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 ibus-kkc-content-type.patch
+Build-with-vala-0.36.patch
-- 
2.11.0

Reply via email to