From 2caaffd4e5ca332f9d208a4c438befda53d0cd30 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 4 Nov 2021 10:00:07 +0100
Subject: [PATCH] chore(linux): Fix build

# Keyman Conventional Commit suggestions:
# - Consider appending the text ". Fixes #5613" to your commit message.
---
 linux/debian/not-installed              |  1 +
 linux/ibus-keyman/tests/Makefile.am     | 22 ++++++++++++++--------
 linux/ibus-keyman/tests/ibusimcontext.c |  1 -
 3 files changed, 15 insertions(+), 9 deletions(-)
 create mode 100644 linux/debian/not-installed

diff --git a/linux/debian/not-installed b/linux/debian/not-installed
new file mode 100644
index 0000000000..10c5ed2fe4
--- /dev/null
+++ b/linux/debian/not-installed
@@ -0,0 +1 @@
+usr/libexec/ibus-keyman-tests
diff --git a/linux/ibus-keyman/tests/Makefile.am b/linux/ibus-keyman/tests/Makefile.am
index 41a2bbbd3b..f31cf48b92 100644
--- a/linux/ibus-keyman/tests/Makefile.am
+++ b/linux/ibus-keyman/tests/Makefile.am
@@ -39,6 +39,11 @@ AM_LDFLAGS = \
 
 libexec_PROGRAMS = ibus-keyman-tests
 
+# Note: don't use $(top_srcdir) here for the first `..` - automake <= 1.15 (Ubuntu 18.04)
+# has a bug where it doesn't resolve the variable and so stores some files in the wrong
+# location and can't find them later. https://debbugs.gnu.org/cgi/bugreport.cgi?bug=13928
+# Once we drop support for Ubuntu 18.04 Bionic we change this.
+
 ibus_keyman_tests_SOURCES = \
   ibusimcontext.c \
   ibusimcontext.h \
@@ -75,6 +80,7 @@ ibus_keyman_tests_SOURCES = \
   ../../../common/core/desktop/src/utfcodec.cpp \
   ../../../common/core/desktop/tests/unit/kmx/kmx_test_source.cpp \
   ../../../common/core/desktop/tests/unit/kmx/kmx_test_source.hpp \
+  ../src/keycodes.h \
   $(NULL)
 
 ibus_keyman_tests_CFLAGS = \
@@ -84,10 +90,10 @@ ibus_keyman_tests_CFLAGS = \
   @JSON_GLIB_CFLAGS@ \
   @KEYMAN_PROC_CFLAGS@ \
   -DPKGDATADIR=\"$(pkgdatadir)\" \
-  -I../../../common/core/desktop/src \
-  -I../../../common/core/desktop/src/kmx \
-  -I../../../common/core/desktop/tests/unit/kmx \
-  -I../src \
+  -I$(top_srcdir)/../../common/core/desktop/src \
+  -I$(top_srcdir)/../../common/core/desktop/src/kmx \
+  -I$(top_srcdir)/../../common/core/desktop/tests/unit/kmx \
+  -I$(top_srcdir)/src \
   $(NULL)
 
 ibus_keyman_tests_CPPFLAGS = \
@@ -97,10 +103,10 @@ ibus_keyman_tests_CPPFLAGS = \
   @JSON_GLIB_CFLAGS@ \
   @KEYMAN_PROC_CFLAGS@ \
   -DPKGDATADIR=\"$(pkgdatadir)\" \
-  -I../../../common/core/desktop/src \
-  -I../../../common/core/desktop/src/kmx \
-  -I../../../common/core/desktop/tests/unit/kmx \
-  -I../src \
+  -I$(top_srcdir)/../../common/core/desktop/src \
+  -I$(top_srcdir)/../../common/core/desktop/src/kmx \
+  -I$(top_srcdir)/../../common/core/desktop/tests/unit/kmx \
+  -I$(top_srcdir)/src \
   $(NULL)
 
 ibus_keyman_tests_LDFLAGS = \
diff --git a/linux/ibus-keyman/tests/ibusimcontext.c b/linux/ibus-keyman/tests/ibusimcontext.c
index 5d3cf4a6bd..28e7428a29 100644
--- a/linux/ibus-keyman/tests/ibusimcontext.c
+++ b/linux/ibus-keyman/tests/ibusimcontext.c
@@ -1347,7 +1347,6 @@ _create_input_context(IBusIMContext *ibusimcontext) {
   if (context == NULL) {
     g_warning("Create input context failed.");
   } else {
-    ibus_input_context_set_client_commit_preedit(context, TRUE);
     ibusimcontext->ibuscontext = context;
 
     g_signal_connect(ibusimcontext->ibuscontext, "commit-text", G_CALLBACK(_ibus_context_commit_text_cb), ibusimcontext);