kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

imf - make xim+scim the defaults not xim+ibus due to ibus being broken 

at leats ibus seems to just not work for me on arch at least  - even
with gtk apps, but scim does, so maybe make scim the main thing again?
also allows glib to be off by default. :)
This commit is contained in:
Carsten Haitzler 2019-12-06 20:51:26 +00:00
parent fd6d03025a
commit 19f6be78c4
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meson_options.txt
View File

@ -109,7 +109,7 @@ option('crypto',
option('glib', option('glib',
type : 'boolean', type : 'boolean',
value : true, value : false,
description : 'Main loop integration for glib in efl' description : 'Main loop integration for glib in efl'
) )
@ -197,7 +197,7 @@ option('ecore-imf-loaders-disabler',
type : 'array', type : 'array',
description : 'List of input methods to disable in efl', description : 'List of input methods to disable in efl',
choices : ['xim', 'ibus', 'scim'], choices : ['xim', 'ibus', 'scim'],
value : ['scim'] value : ['ibus']
) )
option('emotion-loaders-disabler', option('emotion-loaders-disabler',

5
src/modules/ecore_imf/meson.build
View File

@ -16,6 +16,11 @@ foreach mod_name : mods
mod_deps = [] mod_deps = []
if loader_disabler.contains(mod_name) == false if loader_disabler.contains(mod_name) == false
if mod_name == 'ibus'
if get_option('glib') == false
error('Need glib enabled if ibus is enabled')
endif
endif
mod_install_dir = join_paths(dir_package_modules, mod_name, version_name) mod_install_dir = join_paths(dir_package_modules, mod_name, version_name)
subdir(mod_name) subdir(mod_name)
module_files += join_paths(mod_install_dir, 'lib'+mod_name+'.'+sys_mod_extension) module_files += join_paths(mod_install_dir, 'lib'+mod_name+'.'+sys_mod_extension)