s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: Remove libeekboard dependency

Browse Source
This commit is contained in:
Dorota Czaplejewicz
2019-03-14 18:03:10 +00:00
parent a243fce1ae
commit 5803222e68
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
eekboard/eekboard-context-service.c
View File

@ -170,7 +170,8 @@ eekboard_context_service_real_create_keyboard (EekboardContextService *self,
eekboard_xkl_config_rec_from_string (&keyboard_type[4]); eekboard_xkl_config_rec_from_string (&keyboard_type[4]);
if (display == NULL) if (display == NULL)
display = XOpenDisplay (NULL); //display = XOpenDisplay (NULL);
return NULL; // FIXME: replace with wl display
error = NULL; error = NULL;
layout = eek_xkl_layout_new (display, &error); layout = eek_xkl_layout_new (display, &error);

10
src/meson.build
View File

@ -2,21 +2,27 @@ sources = [
'server-service.c', 'server-service.c',
'server-context-service.c', 'server-context-service.c',
'server-main.c', 'server-main.c',
'../eekboard/eekboard-service.c',
'../eekboard/eekboard-context-service.c',
# $(srcdir)/eekboard-client.c \
# $(srcdir)/eekboard-context.c \
'../eekboard/eekboard-xklutil.c',
] ]
deps = [ deps = [
# dependency('glib-2.0', version: '>=2.26.0'), # dependency('glib-2.0', version: '>=2.26.0'),
dependency('gio-2.0', version: '>=2.26.0'), dependency('gio-2.0', version: '>=2.26.0'),
dependency('gtk+-3.0', version: '>=3.0'), dependency('gtk+-3.0', version: '>=3.0'),
dependency('eekboard-0.90'),
dependency('eek-gtk-0.90'), dependency('eek-gtk-0.90'),
dependency('libxklavier'), # FIXME remove
] ]
# Replacement for eekboard-server # Replacement for eekboard-server
squeekboard = executable('squeekboard', squeekboard = executable('squeekboard',
sources, sources,
include_directories: [include_directories('..')],
dependencies: deps, dependencies: deps,
install: true, install: true,
c_args: '-DTHEMESDIR="' + pkgdatadir + '/themes"', c_args: ['-DTHEMESDIR="' + pkgdatadir + '/themes"', '-DEEKBOARD_COMPILATION=1'],
) )