From 55fb93d46bfc8e1c8e672404d2e6c702c7c2a28b Mon Sep 17 00:00:00 2001 From: subhransu mohanty Date: Wed, 24 Jul 2019 16:52:25 +0900 Subject: [PATCH] remove unnecessary dependancy from elementary module to keep it same as upstream. Change-Id: I9ad0d8f5b872fee4e8a1b252cb0563e2ab8a2222 --- src/lib/elementary/efl_ui_win.c | 2 - src/lib/elementary/elm_module_helper.h | 65 ---------------------- src/lib/elementary/meson.build | 30 +++++----- src/modules/elementary/access_output/meson.build | 2 +- src/modules/elementary/access_output/mod.c | 1 + .../clock_input_ctxpopup/clock_input_ctxpopup.c | 1 + .../elementary/clock_input_ctxpopup/meson.build | 2 +- src/modules/elementary/meson.build | 8 ++- src/modules/elementary/prefs/meson.build | 24 +------- src/modules/elementary/prefs/prefs_iface.c | 1 + src/modules/elementary/test_entry/meson.build | 2 +- src/modules/elementary/test_entry/mod.c | 1 + src/modules/elementary/test_map/meson.build | 2 +- src/modules/elementary/test_map/mod.c | 1 + src/modules/elementary/web/none/elm_web_none.c | 1 + src/modules/elementary/web/none/meson.build | 2 +- 16 files changed, 33 insertions(+), 112 deletions(-) diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index 643d67f..11ac816 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -9998,8 +9998,6 @@ elm_win_main_menu_get(Evas_Object *obj) _elm_menu_menu_bar_set(sd->main_menu, EINA_TRUE); #ifdef HAVE_ELEMENTARY_X - Eina_Bool use_dbus = EINA_FALSE; - if (!_elm_config->disable_external_menu && sd->x.xwin) use_dbus = EINA_TRUE; if (use_dbus && _elm_dbus_menu_register(sd->main_menu)) diff --git a/src/lib/elementary/elm_module_helper.h b/src/lib/elementary/elm_module_helper.h index 1e085f8..eba3237 100644 --- a/src/lib/elementary/elm_module_helper.h +++ b/src/lib/elementary/elm_module_helper.h @@ -5,8 +5,6 @@ #ifndef ELM_MODULE_HELPER_H #define ELM_MODULE_HELPER_H -#include "elm_priv.h" - #ifdef EAPI # undef EAPI #endif @@ -42,67 +40,4 @@ #define EWAPI EAPI EAPI_WEAK -/************************************************************* - * TIZEN_ONLY_FEATURE : Tizen Copy & Paste feature with CBHM * - *************************************************************/ - -typedef void (*cpfunc)(void *data, Evas_Object *obj, void *event_info); - -struct _Elm_Entry_Extension_data -{ - Evas_Object *popup; - Evas_Object *ent; - Evas_Object *caller; - Eina_Rectangle *viewport_rect; - Evas_Coord_Rectangle selection_rect; - Eina_List *items; - cpfunc select; - cpfunc copy; - cpfunc cut; - cpfunc paste; - cpfunc cancel; - cpfunc selectall; - cpfunc cnpinit; - cpfunc keep_selection; - cpfunc paste_translation; - cpfunc is_selected_all; - Elm_Config *_elm_config; - Eina_Bool password : 1; - Eina_Bool editable : 1; - Eina_Bool have_selection: 1; - Eina_Bool selmode : 1; - Eina_Bool context_menu : 1; - Elm_Cnp_Mode cnp_mode : 2; - Eina_Bool popup_showing : 1; - Eina_Bool mouse_up : 1; - Eina_Bool mouse_move : 1; - Eina_Bool mouse_down : 1; - Eina_Bool entry_move : 1; - Eina_Bool popup_clicked : 1; - Eina_Bool cursor_handler_shown : 1; - Eina_Bool ent_scroll : 1; - Evas_Object *ctx_par; - Evas_Object *start_handler; - Evas_Object *end_handler; - Evas_Object *cursor_handler; - Ecore_Timer *show_timer; - char *source_text; - char *target_text; -#ifdef HAVE_ELEMENTARY_WL2 - Eldbus_Proxy *cbhm_proxy; -#endif - /* For setting color class parent relation to copypaste popup */ - Evas_Object *entry_edje; - - /* For checking wearable profile */ - char profile_wear; -}; - -typedef struct _Elm_Entry_Extension_data Elm_Entry_Extension_data; - -void elm_entry_extension_module_data_get(Evas_Object *obj,Elm_Entry_Extension_data *ext_mod); -/******* - * END * - *******/ - #endif diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build index ab76232..b47f44f 100644 --- a/src/lib/elementary/meson.build +++ b/src/lib/elementary/meson.build @@ -1133,18 +1133,20 @@ elementary_config_dir = include_directories('.') package_pc_variables = ['themes='+join_paths(dir_data, package_name, 'themes')] -elementary_tizen_lib = library('elementary_t', - elementary_src_tizen, pub_eo_file_target, priv_eo_file_target, c, - dependencies: elementary_pub_deps + elementary_deps, - include_directories : config_dir + [include_directories('.')] + [include_directories(join_paths('..', '..', '..'))] + [ecore_evas_wayland_engine_include_dir], - install: true, - c_args : elm_package_c_args, - version : '1.22.100', -) +if get_option('tizen') + elementary_tizen_lib = library('elementary_t', + elementary_src_tizen, pub_eo_file_target, priv_eo_file_target, c, + dependencies: elementary_pub_deps + elementary_deps, + include_directories : config_dir + [include_directories('.')] + [include_directories(join_paths('..', '..', '..'))] + [ecore_evas_wayland_engine_include_dir], + install: true, + c_args : elm_package_c_args, + version : '1.22.100', + ) -elementary_tizen = declare_dependency( - include_directories: [include_directories('.')], - link_with: elementary_tizen_lib, - sources : pub_eo_file_target + priv_eo_file_target, - dependencies: elementary_pub_deps, -) + elementary_tizen = declare_dependency( + include_directories: [include_directories('.')], + link_with: elementary_tizen_lib, + sources : pub_eo_file_target + priv_eo_file_target, + dependencies: elementary_pub_deps, + ) +endif diff --git a/src/modules/elementary/access_output/meson.build b/src/modules/elementary/access_output/meson.build index cde9d31..178ab16 100644 --- a/src/modules/elementary/access_output/meson.build +++ b/src/modules/elementary/access_output/meson.build @@ -4,7 +4,7 @@ src = files([ shared_module(mod, src, - dependencies: [elementary, eio], + dependencies: [elementary], install: true, install_dir : mod_install_dir ) diff --git a/src/modules/elementary/access_output/mod.c b/src/modules/elementary/access_output/mod.c index 41a518f..f51b512 100644 --- a/src/modules/elementary/access_output/mod.c +++ b/src/modules/elementary/access_output/mod.c @@ -7,6 +7,7 @@ #ifndef EFL_BUILD # define EFL_BUILD #endif +#undef ELM_MODULE_HELPER_H #include "elm_module_helper.h" /* to enable this module diff --git a/src/modules/elementary/clock_input_ctxpopup/clock_input_ctxpopup.c b/src/modules/elementary/clock_input_ctxpopup/clock_input_ctxpopup.c index 75d030b..03b5a7f 100644 --- a/src/modules/elementary/clock_input_ctxpopup/clock_input_ctxpopup.c +++ b/src/modules/elementary/clock_input_ctxpopup/clock_input_ctxpopup.c @@ -12,6 +12,7 @@ #ifndef EFL_BUILD # define EFL_BUILD #endif +#undef ELM_MODULE_HELPER_H #include "elm_module_helper.h" #define CLOCK_FIELD_COUNT 8 diff --git a/src/modules/elementary/clock_input_ctxpopup/meson.build b/src/modules/elementary/clock_input_ctxpopup/meson.build index 9c3265e..0443577 100644 --- a/src/modules/elementary/clock_input_ctxpopup/meson.build +++ b/src/modules/elementary/clock_input_ctxpopup/meson.build @@ -4,7 +4,7 @@ src = files([ shared_module(mod, src, - dependencies: [elementary, eio], + dependencies: [elementary], install: true, install_dir : mod_install_dir ) diff --git a/src/modules/elementary/meson.build b/src/modules/elementary/meson.build index b9261d6..66804b9 100644 --- a/src/modules/elementary/meson.build +++ b/src/modules/elementary/meson.build @@ -7,9 +7,11 @@ mods = [ join_paths('web', 'none') ] -mods += [ - 'copypasteUI_ctxpopup', -] +if (get_option('tizen')) + mods += [ + 'copypasteUI_ctxpopup', + ] +endif foreach mod : mods mod_install_dir = join_paths(dir_lib, 'elementary', 'modules', mod, version_name) diff --git a/src/modules/elementary/prefs/meson.build b/src/modules/elementary/prefs/meson.build index 3784e37..9ec2c9a 100644 --- a/src/modules/elementary/prefs/meson.build +++ b/src/modules/elementary/prefs/meson.build @@ -16,31 +16,9 @@ src = files([ 'elm_horizontal_frame.c' ]) -edc_files = [ - 'elm_prefs_swallow.edc', -] - -foreach edc_file : edc_files - custom_target('edje_cc_' + edc_file, - input : edc_file, - output : '@BASENAME@.edj', - command : edje_cc_exe + [ '-beta', '-fastcomp', - '-id', meson.current_source_dir(), - '-fd', meson.current_source_dir(), - '-sd', meson.current_source_dir(), - '-vd', meson.current_source_dir(), - '-dd', meson.current_source_dir(), - '-md', meson.current_source_dir(), - '-td', meson.current_source_dir(), - '@INPUT@', '@OUTPUT@'], - depends : edje_cc, - install: true, - install_dir : mod_install_dir) -endforeach - shared_module(mod, src, - dependencies: [elementary, eio], + dependencies: [elementary], install: true, install_dir : mod_install_dir ) diff --git a/src/modules/elementary/prefs/prefs_iface.c b/src/modules/elementary/prefs/prefs_iface.c index 14ed9f3..d09658a 100644 --- a/src/modules/elementary/prefs/prefs_iface.c +++ b/src/modules/elementary/prefs/prefs_iface.c @@ -7,6 +7,7 @@ #ifndef EFL_BUILD # define EFL_BUILD #endif +#undef ELM_MODULE_HELPER_H #include "private.h" /* including declaration of each prefs item implementation iface struct */ diff --git a/src/modules/elementary/test_entry/meson.build b/src/modules/elementary/test_entry/meson.build index cde9d31..178ab16 100644 --- a/src/modules/elementary/test_entry/meson.build +++ b/src/modules/elementary/test_entry/meson.build @@ -4,7 +4,7 @@ src = files([ shared_module(mod, src, - dependencies: [elementary, eio], + dependencies: [elementary], install: true, install_dir : mod_install_dir ) diff --git a/src/modules/elementary/test_entry/mod.c b/src/modules/elementary/test_entry/mod.c index f8abbef..b80cb18 100644 --- a/src/modules/elementary/test_entry/mod.c +++ b/src/modules/elementary/test_entry/mod.c @@ -7,6 +7,7 @@ #ifndef EFL_BUILD # define EFL_BUILD #endif +#undef ELM_MODULE_HELPER_H #include "elm_module_helper.h" // module api funcs needed diff --git a/src/modules/elementary/test_map/meson.build b/src/modules/elementary/test_map/meson.build index cde9d31..178ab16 100644 --- a/src/modules/elementary/test_map/meson.build +++ b/src/modules/elementary/test_map/meson.build @@ -4,7 +4,7 @@ src = files([ shared_module(mod, src, - dependencies: [elementary, eio], + dependencies: [elementary], install: true, install_dir : mod_install_dir ) diff --git a/src/modules/elementary/test_map/mod.c b/src/modules/elementary/test_map/mod.c index 85e6e52..15c4ff3 100644 --- a/src/modules/elementary/test_map/mod.c +++ b/src/modules/elementary/test_map/mod.c @@ -9,6 +9,7 @@ #ifndef EFL_BUILD # define EFL_BUILD #endif +#undef ELM_MODULE_HELPER_H #include "elm_module_helper.h" EAPI Eina_Stringshare * diff --git a/src/modules/elementary/web/none/elm_web_none.c b/src/modules/elementary/web/none/elm_web_none.c index bfbc00c..8821846 100644 --- a/src/modules/elementary/web/none/elm_web_none.c +++ b/src/modules/elementary/web/none/elm_web_none.c @@ -12,6 +12,7 @@ #ifndef EFL_BUILD # define EFL_BUILD #endif +#undef ELM_MODULE_HELPER_H #include "elm_module_helper.h" #include "elm_web_none_eo.h" diff --git a/src/modules/elementary/web/none/meson.build b/src/modules/elementary/web/none/meson.build index 5de174c..632bca3 100644 --- a/src/modules/elementary/web/none/meson.build +++ b/src/modules/elementary/web/none/meson.build @@ -4,7 +4,7 @@ src = files([ shared_module('none', src, - dependencies: [elementary, elementary_deps, eio], + dependencies: [elementary, elementary_deps], install: true, install_dir : mod_install_dir ) -- 2.7.4