chore(linux): Fix build

# Keyman Conventional Commit suggestions:
# - Consider appending the text ". Fixes #5613" to your commit message.
This commit is contained in:
Eberhard Beilharz 2021-11-04 10:00:07 +01:00
parent cdee19e953
commit 2caaffd4e5
No known key found for this signature in database
GPG key ID: 64A39A9E98B53105
3 changed files with 15 additions and 9 deletions

View file

@ -0,0 +1 @@
usr/libexec/ibus-keyman-tests

View file

@ -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 = \

View file

@ -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);