From: Carsten Haitzler (Rasterman) <raster@rasterman.com>
Date: Fri, 6 Dec 2019 20:51:26 +0000 (+0000)
Subject: imf - make xim+scim the defaults not xim+ibus due to ibus being broken
X-Git-Tag: accepted/tizen/unified/20191209.144131~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=90ca1c600ce85a77cd2ad101ac4430e02d313741;p=platform%2Fupstream%2Fefl.git

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. :)
---

diff --git a/meson_options.txt b/meson_options.txt
index 478ead8..a6bb3b8 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -109,7 +109,7 @@ option('crypto',
 
 option('glib',
   type : 'boolean',
-  value : true,
+  value : false,
   description : 'Main loop integration for glib in efl'
 )
 
@@ -197,7 +197,7 @@ option('ecore-imf-loaders-disabler',
   type : 'array',
   description : 'List of input methods to disable in efl',
   choices : ['xim', 'ibus', 'scim'],
-  value : ['scim']
+  value : ['ibus']
 )
 
 option('emotion-loaders-disabler',
diff --git a/src/modules/ecore_imf/meson.build b/src/modules/ecore_imf/meson.build
index b8a495a..72154d5 100644
--- a/src/modules/ecore_imf/meson.build
+++ b/src/modules/ecore_imf/meson.build
@@ -16,6 +16,11 @@ foreach mod_name : mods
   mod_deps = []
 
   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)
     subdir(mod_name)
     module_files += join_paths(mod_install_dir, 'lib'+mod_name+'.'+sys_mod_extension)