path: root/meta-application-manager/recipes-application-framework/app-core/files/0002-remove-efl-appcore-efl.patch

diff -ru a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt	2016-11-03 18:01:31.546096215 +0900
+++ b/CMakeLists.txt	2016-12-16 14:49:37.370894113 +0900
@@ -42,12 +42,12 @@
 SET(HEADERS_common appcore-common.h)
 
 INCLUDE(FindPkgConfig)
-SET(APPCORE_PKG_CHECK_MODULES "gio-2.0 vconf sensor aul dlog ecore")
+SET(APPCORE_PKG_CHECK_MODULES "gio-2.0 vconf sensor aul dlog")
 IF(_WITH_X11)
-       SET(APPCORE_PKG_CHECK_MODULES "${APPCORE_PKG_CHECK_MODULES} x11 eina ecore-x")
+       SET(APPCORE_PKG_CHECK_MODULES "${APPCORE_PKG_CHECK_MODULES} x11")
 ENDIF(_WITH_X11)
 IF(_WITH_WAYLAND)
-       SET(APPCORE_PKG_CHECK_MODULES "${APPCORE_PKG_CHECK_MODULES} ecore-wayland wayland-client tizen-extension-client wayland-tbm-client")
+       SET(APPCORE_PKG_CHECK_MODULES "${APPCORE_PKG_CHECK_MODULES} wayland-client tizen-extension-client wayland-tbm-client")
 ENDIF(_WITH_WAYLAND)
 
 
@@ -85,9 +85,9 @@
 SET(HEADERS_efl appcore-efl.h)
 
 INCLUDE(FindPkgConfig)
-SET(APPCORE_PKG_CHECK_MODULES2 "elementary dlog ecore gobject-2.0 glib-2.0 aul pkgmgr-info ttrace")
+SET(APPCORE_PKG_CHECK_MODULES2 "dlog gobject-2.0 glib-2.0 aul pkgmgr-info ttrace")
 IF(_WITH_X11)
-        SET(APPCORE_PKG_CHECK_MODULES2 "${APPCORE_PKG_CHECK_MODULES2} ecore-x")
+        SET(APPCORE_PKG_CHECK_MODULES2 "${APPCORE_PKG_CHECK_MODULES2}")
 ENDIF(_WITH_X11)
 
 pkg_check_modules(pkg_efl REQUIRED ${APPCORE_PKG_CHECK_MODULES2})
diff -ru a/TC/unit/utc_ApplicationFW_appcore_efl_main_func.c b/TC/unit/utc_ApplicationFW_appcore_efl_main_func.c
--- a/TC/unit/utc_ApplicationFW_appcore_efl_main_func.c	2016-11-03 18:01:31.546096215 +0900
+++ b/TC/unit/utc_ApplicationFW_appcore_efl_main_func.c	2016-12-16 14:50:24.074894725 +0900
@@ -19,7 +19,7 @@
  *
  */
 #include <tet_api.h>
-#include <Elementary.h>
+//#include <Elementary.h>
 #include <appcore-efl.h>
 
 static void startup(void);
@@ -52,7 +52,7 @@
 
 static int app_reset(bundle *b, void *data)
 {
-	elm_exit();
+//	elm_exit();
 	return 0;
 }
 
diff -ru a/appcore-efl.pc.in b/appcore-efl.pc.in
--- a/appcore-efl.pc.in	2016-11-03 18:01:31.546096215 +0900
+++ b/appcore-efl.pc.in	2016-12-16 14:51:12.290895357 +0900
@@ -8,7 +8,7 @@
 Name: app-core-efl
 Description: SAMSUNG Linux platform efl application library
 Version: @VERSION@
-Requires.private: elementary dlog
+Requires.private: dlog
 Requires: appcore-common
 Libs: -L${libdir} -lappcore-efl
 Cflags: -I${includedir} -I${includedir}/appcore
diff -ru a/src/appcore-efl.c b/src/appcore-efl.c
--- a/src/appcore-efl.c	2016-12-16 14:54:33.602897995 +0900
+++ b/src/appcore-efl.c	2016-12-16 14:44:35.214890154 +0900
@@ -25,20 +25,22 @@
 #include <stdlib.h>
 
 #if defined(WAYLAND)
-#include <Ecore_Wayland.h>
+//#include <Ecore_Wayland.h>
 #include <wayland-client.h>
 #include <wayland-tbm-client.h>
 #include <tizen-extension-client-protocol.h>
 #elif defined(X11)
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
-#include <Ecore_X.h>
+//#include <Ecore_X.h>
 #endif
 
+/*
 #include <Ecore.h>
 #include <Ecore_Evas.h>
 #include <Ecore_Input_Evas.h>
 #include <Elementary.h>
+*/
 #include <glib-object.h>
 #include <malloc.h>
 #include <glib.h>
@@ -60,15 +62,15 @@
 	const char *name;
 	enum app_state state;
 
-	Ecore_Event_Handler *hshow;
-	Ecore_Event_Handler *hhide;
-	Ecore_Event_Handler *hvchange;
+//	Ecore_Event_Handler *hshow;
+//	Ecore_Event_Handler *hhide;
+//	Ecore_Event_Handler *hvchange;
 #if defined(WAYLAND)
-	Ecore_Event_Handler *hlower;
+//	Ecore_Event_Handler *hlower;
 #endif
-	Ecore_Event_Handler *hcmsg; /* WM_ROTATE */
+//	Ecore_Event_Handler *hcmsg; /* WM_ROTATE */
 
-	Ecore_Timer *mftimer; /* Ecore Timer for memory flushing */
+//	Ecore_Timer *mftimer; /* Ecore Timer for memory flushing */
 
 #ifdef _APPFW_FEATURE_BACKGROUND_MANAGEMENT
 	struct appcore *app_core;
@@ -111,7 +111,7 @@ static const char *_as_name[] = {
 	[AS_DYING] = "DYING",
 };
 
-static bool b_active = FALSE;
+//static bool b_active = FALSE;
 static bool first_launch = TRUE;
 
 struct win_node {
@@ -123,7 +125,7 @@
 #if defined(X11)
 static struct ui_wm_rotate wm_rotate;
 #endif
-static Eina_Bool __visibility_cb(void *data, int type, void *event);
+//static Eina_Bool __visibility_cb(void *data, int type, void *event);
 static GSList *g_winnode_list;
 
 static struct wl_display *dsp;
@@ -257,6 +259,7 @@
 #endif
 
 #if defined(MEMORY_FLUSH_ACTIVATE)
+/*
 static Eina_Bool __appcore_memory_flush_cb(void *data)
 {
 	struct ui_priv *ui = (struct ui_priv *)data;
@@ -274,6 +277,7 @@
 
 	return ECORE_CALLBACK_CANCEL;
 }
+*/
 
 static int __appcore_low_memory_post_cb(struct ui_priv *ui)
 {
@@ -287,15 +291,17 @@
 
 static void __appcore_timer_add(struct ui_priv *ui)
 {
-	ui->mftimer = ecore_timer_add(5, __appcore_memory_flush_cb, ui);
+//	ui->mftimer = ecore_timer_add(5, __appcore_memory_flush_cb, ui);
 }
 
 static void __appcore_timer_del(struct ui_priv *ui)
 {
+/*
 	if (ui->mftimer) {
 		ecore_timer_del(ui->mftimer);
 		ui->mftimer = NULL;
 	}
+*/
 }
 
 #else
@@ -313,25 +319,27 @@
 
 #endif
 
+#if 0
 static void __appcore_efl_memory_flush_cb(void)
 {
 	_DBG("[APP %d]   __appcore_efl_memory_flush_cb()", _pid);
 	elm_cache_all_flush();
 }
+#endif
 #if defined(WAYLAND)
 static void wl_raise_win(void)
 {
-	Ecore_Wl_Window *win;
+//	Ecore_Wl_Window *win;
 	unsigned int win_id = appcore_get_main_window();
 
 	_DBG("Raise window: %d", win_id);
-	win = ecore_wl_window_find(win_id);
-	ecore_wl_window_activate(win);
+//	win = ecore_wl_window_find(win_id);
+//	ecore_wl_window_activate(win);
 }
 
 static void wl_pause_win(void)
 {
-	Ecore_Wl_Window *win;
+//	Ecore_Wl_Window *win;
 	GSList *wlist = g_winnode_list;
 	struct win_node *entry = NULL;
 
@@ -338,8 +344,8 @@
 		entry = wlist->data;
 
 		_DBG("Pause window: %d", entry->win);
-		win = ecore_wl_window_find(entry->win);
-		ecore_wl_window_iconified_set(win, EINA_TRUE);
+//		win = ecore_wl_window_find(entry->win);
+//		ecore_wl_window_iconified_set(win, EINA_TRUE);
 
 		wlist = wlist->next;
 	}
@@ -379,7 +385,7 @@
 
 	if (event == AE_TERMINATE) {
 		_DBG("[APP %d] TERMINATE", _pid);
-		elm_exit();
+//		elm_exit();
 		aul_status_update(STATUS_DYING);
 		return;
 	}
@@ -532,7 +534,7 @@ static void __do_app(enum app_event event, void *data, bundle * b)
 			_DBG("[APP %d] is paused. TERMINATE", _pid);
 			ui->state = AS_DYING;
 			aul_status_update(STATUS_DYING);
-			elm_exit();
+//			elm_exit();
 		} else if (ui->state == AS_RUNNING) {
 			_DBG("[APP %d] is running.", _pid);
 		} else {
@@ -550,6 +554,7 @@ static struct ui_ops efl_ops = {
 	.cb_app = __do_app,
 };
 
+#if 0
 static bool __check_visible(void)
 {
 	GSList *iter = NULL;
@@ -709,8 +716,10 @@ static bool __update_win(unsigned int win, unsigned int surf, bool bfobscured)
 	return TRUE;
 }
 #endif
+#endif
 
 /* WM_ROTATE */
+#if 0 /* remove-efl */
 #ifdef X11
 static Ecore_X_Atom _WM_WINDOW_ROTATION_SUPPORTED = 0;
 static Ecore_X_Atom _WM_WINDOW_ROTATION_CHANGE_REQUEST = 0;
@@ -931,6 +938,7 @@
 	return ECORE_CALLBACK_PASS_ON;
 }
 #endif
+#endif /* remove-efl */
 
 static void __add_climsg_cb(struct ui_priv *ui)
 {
@@ -949,6 +957,7 @@
 				__lower_cb, ui);
 */
 #elif defined(X11)
+#if 0 /* remove-efl */
 	ui->hshow =
 		ecore_event_handler_add(ECORE_X_EVENT_WINDOW_SHOW, __show_cb, ui);
 	ui->hhide =
@@ -956,11 +965,14 @@
 	ui->hvchange =
 		ecore_event_handler_add(ECORE_X_EVENT_WINDOW_VISIBILITY_CHANGE,
 				__visibility_cb, ui);
+#endif /* remove-efl */
 
 	/* Add client message callback for WM_ROTATE */
 	if (!__check_wm_rotation_support()) {
+#if 0 /* remove-efl */
 		ui->hcmsg = ecore_event_handler_add(ECORE_X_EVENT_CLIENT_MESSAGE,
 				__cmsg_cb, ui);
+#endif /* remove-efl */
 		ui->wm_rot_supported = 1;
 		appcore_set_wm_rotation(&wm_rotate);
 	}
@@ -986,19 +998,19 @@
 #if !(GLIB_CHECK_VERSION(2, 36, 0))
 	g_type_init();
 #endif
-	elm_init(*argc, *argv);
+//	elm_init(*argc, *argv);
 
 	hwacc = getenv("HWACC");
 	if (hwacc == NULL) {
-		_DBG("elm_config_accel_preference_set is not called");
+//		_DBG("elm_config_accel_preference_set is not called");
 	} else if (strcmp(hwacc, "USE") == 0) {
-		elm_config_accel_preference_set("hw");
-		_DBG("elm_config_accel_preference_set : hw");
+//		elm_config_accel_preference_set("hw");
+//		_DBG("elm_config_accel_preference_set : hw");
 	} else if (strcmp(hwacc, "NOT_USE") == 0) {
-		elm_config_accel_preference_set("none");
-		_DBG("elm_config_accel_preference_set : none");
+//		elm_config_accel_preference_set("none");
+//		_DBG("elm_config_accel_preference_set : none");
 	} else {
-		_DBG("elm_config_accel_preference_set is not called");
+//		_DBG("elm_config_accel_preference_set is not called");
 	}
 
 	r = appcore_init(ui->name, &efl_ops, *argc, *argv);
@@ -1069,21 +1081,21 @@
 
 	ui->state = AS_DYING;
 
-	if (ui->hshow)
-		ecore_event_handler_del(ui->hshow);
-	if (ui->hhide)
-		ecore_event_handler_del(ui->hhide);
-	if (ui->hvchange)
-		ecore_event_handler_del(ui->hvchange);
+//	if (ui->hshow)
+//		ecore_event_handler_del(ui->hshow);
+//	if (ui->hhide)
+//		ecore_event_handler_del(ui->hhide);
+//	if (ui->hvchange)
+//		ecore_event_handler_del(ui->hvchange);
 #if defined(WAYLAND)
-	if (ui->hlower)
-		ecore_event_handler_del(ui->hlower);
+//	if (ui->hlower)
+//		ecore_event_handler_del(ui->hlower);
 #endif
 
 	__appcore_timer_del(ui);
 
 	/* Check the launchpad-loader case */
-	while (elm_shutdown() > 0);
+//	while (elm_shutdown() > 0);
 }
 
 static int __set_data(struct ui_priv *ui, const char *name,
@@ -1111,7 +1123,7 @@
 	_retv_if(ui->name == NULL, -1);
 
 	ui->ops = ops;
-	ui->mfcb = __appcore_efl_memory_flush_cb;
+//	ui->mfcb = __appcore_efl_memory_flush_cb;
 	_pid = getpid();
 
 	/* WM_ROTATE */
@@ -1123,8 +1135,8 @@
 
 #ifdef  _APPFW_FEATURE_BACKGROUND_MANAGEMENT
 	ui->app_core = NULL;
-	ui->prepare_to_suspend = __appcore_efl_prepare_to_suspend;
-	ui->exit_from_suspend = __appcore_efl_exit_from_suspend;
+//	ui->prepare_to_suspend = __appcore_efl_prepare_to_suspend;
+//	ui->exit_from_suspend = __appcore_efl_exit_from_suspend;
 #endif
 
 	return 0;
@@ -1247,7 +1259,7 @@
 	r = appcore_efl_init(name, argc, argv, ops);
 	_retv_if(r == -1, -1);
 
-	elm_run();
+//	elm_run();
 
 	appcore_efl_fini();
 
@@ -1272,27 +1284,31 @@ EXPORT_API int appcore_set_preinit_window_name(const char *win_name)
 EXPORT_API int appcore_set_preinit_window_name(const char *win_name)
 {
 	int ret = -1;
-	void *preinit_window = NULL;
-	const Evas *e = NULL;
+//	void *preinit_window = NULL;
+//	const Evas *e = NULL;
 
 	if (!win_name) {
 		_ERR("invalid parameter");
 		return ret;
 	}
 
+/*
 	preinit_window = elm_win_precreated_object_get();
 	if (!preinit_window) {
 		_ERR("Failed to get preinit window");
 		return ret;
 	}
+*/
 
+/*
 	e = evas_object_evas_get((const Evas_Object *)preinit_window);
 	if (e) {
 		Ecore_Evas *ee = ecore_evas_ecore_evas_get(e);
 		if (ee) {
 			ecore_evas_name_class_set(ee, win_name, win_name);
 			ret = 0;
 		}
 	}
+*/
 
 	return ret;
diff --git a/src/appcore-group.c b/src/appcore-group.c
index dcdcb6f..915264d 100644
--- a/src/appcore-group.c
+++ b/src/appcore-group.c
@@ -1,4 +1,4 @@
-#include <Elementary.h>
+//#include <Elementary.h>
 #include <stdio.h>
 #include <glib.h>
 #include <aul.h>
@@ -37,6 +37,6 @@ void appcore_group_lower()
 	aul_app_group_lower(&exit);
 	if (exit) {
 		_DBG("appcore_group_lower : sub-app!");
-		elm_exit();
+//		elm_exit();
 	}
 }
diff -ru a/src/appcore-rotation.c b/src/appcore-rotation.c
--- a/src/appcore-rotation.c	2016-11-03 18:01:31.550096215 +0900
+++ b/src/appcore-rotation.c	2016-12-16 14:47:09.954892182 +0900
@@ -26,20 +26,22 @@
 
 #include <sensor_internal.h>
 #include <vconf.h>
-#include <Ecore.h>
+//#include <Ecore.h>
 #include "appcore-internal.h"
 
 #ifdef X11
-#include <Ecore_X.h>
+//#include <Ecore_X.h>
 #include <X11/Xlib.h>
 
 /* Fixme: to be added for wayland works */
 #define _MAKE_ATOM(a, s)				\
+/*
 	do {						\
 		a = ecore_x_atom_get(s);		\
 		if (!a)					\
 			_ERR("##s creation failed.\n");	\
 	} while (0)
+*/
 
 #define STR_ATOM_ROTATION_LOCK "_E_ROTATION_LOCK"
 
@@ -246,8 +248,10 @@
 
 #ifdef X11
 		_MAKE_ATOM(ATOM_ROTATION_LOCK, STR_ATOM_ROTATION_LOCK);
+/*
 		root =  ecore_x_window_root_first_get();
 		XSelectInput(ecore_x_display_get(), root, PropertyChangeMask);
+*/
 #endif
 	}
 	return 0;