From 980de8b60bb59fe741dc73688b0818fec8cf6202 Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jbi...@ubuntu.com>
Date: Sat, 17 Jun 2017 21:21:26 -0400
Subject: [PATCH] Fix build with vala 0.36

Closes: #871187
---
 debian/patches/Build-with-vala-0.36.patch          | 23 ++++++++++++++++++++++
 .../patches/Don-t-translate-generated-file.patch   | 16 +++++++++++++++
 debian/patches/series                              |  2 ++
 3 files changed, 41 insertions(+)
 create mode 100644 debian/patches/Build-with-vala-0.36.patch
 create mode 100644 debian/patches/Don-t-translate-generated-file.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..36c3e62
--- /dev/null
+++ b/debian/patches/Build-with-vala-0.36.patch
@@ -0,0 +1,23 @@
+From: Daiki Ueno <u...@gnu.org>
+Date: Tue, 28 Mar 2017 14:57:47 +0200
+Subject: build: Fix compile error with Vala 0.36
+
+With this commit: https://git.gnome.org/browse/vala/commit/?id=73b9e4b4
+Vala introduced a stricter checks for constructor chain-ups.
+---
+ libkkc/key-event.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libkkc/key-event.vala b/libkkc/key-event.vala
+index 0baa85c..6e28aa6 100644
+--- a/libkkc/key-event.vala
++++ b/libkkc/key-event.vala
+@@ -148,7 +148,7 @@ namespace Kkc {
+                     throw new KeyEventFormatError.PARSE_FAILED (
+                         "unknown keyval %s", _name);
+             }
+-            from_x_event (_keyval, 0, _modifiers);
++            this.from_x_event (_keyval, 0, _modifiers);
+         }
+ 
+         /**
diff --git a/debian/patches/Don-t-translate-generated-file.patch b/debian/patches/Don-t-translate-generated-file.patch
new file mode 100644
index 0000000..5022fa1
--- /dev/null
+++ b/debian/patches/Don-t-translate-generated-file.patch
@@ -0,0 +1,16 @@
+From: Jeremy Bicha <jbi...@ubuntu.com>
+Date: Sat, 17 Jun 2017 21:26:03 -0400
+Subject: Don't translate generated file
+
+---
+ po/POTFILES.skip | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/po/POTFILES.skip b/po/POTFILES.skip
+index f8f1315..bf03c46 100644
+--- a/po/POTFILES.skip
++++ b/po/POTFILES.skip
+@@ -1,2 +1,3 @@
+ tools/kkc.c
+ tools/server.c
++libkkc/keymap.c
diff --git a/debian/patches/series b/debian/patches/series
index 75457ac..e9320d1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 okuri-gana.patch
+Build-with-vala-0.36.patch
+Don-t-translate-generated-file.patch
-- 
2.11.0

Reply via email to