From 396fb40533d6862343a7c7123a9466dff389ede4 Mon Sep 17 00:00:00 2001 From: Xavier Roche Date: Wed, 11 Jun 2014 17:40:12 +0200 Subject: [PATCH] Removing unused patch for aul Change-Id: I6a37e545fcff316ab5d8e89292843a5e5b27b394 Signed-off-by: Xavier Roche --- .../Fix-in-CMakeLists-depedencies-syntax.patch | 639 --------------------- 1 file changed, 639 deletions(-) delete mode 100644 recipes-tizen/aul-1/aul-1/Fix-in-CMakeLists-depedencies-syntax.patch diff --git a/recipes-tizen/aul-1/aul-1/Fix-in-CMakeLists-depedencies-syntax.patch b/recipes-tizen/aul-1/aul-1/Fix-in-CMakeLists-depedencies-syntax.patch deleted file mode 100644 index 1c7db83..0000000 --- a/recipes-tizen/aul-1/aul-1/Fix-in-CMakeLists-depedencies-syntax.patch +++ /dev/null @@ -1,639 +0,0 @@ -From 0226aba92100865f36294c4d55ce6137f494e1bf Mon Sep 17 00:00:00 2001 -From: Xavier Roche -Date: Wed, 11 Jun 2014 15:47:13 +0200 -Subject: [PATCH] Fix in CMakeLists depedencies syntax - -Signed-off-by: Xavier Roche ---- - CMakeLists.txt | 2 +- - ...Ecore-or-EFL-related-packages-depedencies.patch | 578 +++++++++++++++++++- - 2 files changed, 566 insertions(+), 14 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 883c812..7cfa3ad 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -19,7 +19,7 @@ MESSAGE("Build type: ${CMAKE_BUILD_TYPE}") - - # Set required packages - INCLUDE(FindPkgConfig) --SET(AUL-1_PKG_CHECK_MODULES dlog libprivilege-control app-checker rua glib-2.0 vconf pkgmgr-info privacy-manager-client) -+SET(AUL-1_PKG_CHECK_MODULES dlog privilege-control app-checker librua glib-2.0 vconf pkgmgr-info privacy-manager-client) - OPTION(WITH_WAYLAND "Build with wayland" OFF) - #IF(WITH_WAYLAND) - # ADD_DEFINITIONS("-DWAYLAND") -diff --git a/Removing-Ecore-or-EFL-related-packages-depedencies.patch b/Removing-Ecore-or-EFL-related-packages-depedencies.patch -index fcf0296..cf686c2 100644 ---- a/Removing-Ecore-or-EFL-related-packages-depedencies.patch -+++ b/Removing-Ecore-or-EFL-related-packages-depedencies.patch -@@ -1,20 +1,22 @@ --From da49d86455f7a0cd6702f9f77b97ed9b3afed2f8 Mon Sep 17 00:00:00 2001 -+From 42925af16f4eba85db83c33849d4195362bd6d0a Mon Sep 17 00:00:00 2001 - From: Xavier Roche --Date: Wed, 11 Jun 2014 15:36:32 +0200 -+Date: Wed, 11 Jun 2014 15:40:27 +0200 - Subject: [PATCH] Removing Ecore or EFL related packages depedencies - - Signed-off-by: Xavier Roche - --- -- CMakeLists.txt | 16 ++++++++-------- -- am_daemon/amd_key.c | 40 ++++++++++++++++++++-------------------- -- am_daemon/amd_main.c | 32 ++++++++++++++++---------------- -- am_daemon/amd_status.c | 6 +++--- -- include/SLP_AUL_PG.h | 6 +++--- -- test/app_test.c | 10 +++++----- -- test/aul_test.c | 24 ++++++++++++------------ -- test/launch_app.c | 16 ++++++++-------- -- test/open_app.c | 18 +++++++++--------- -- 9 files changed, 84 insertions(+), 84 deletions(-) -+ CMakeLists.txt | 16 +- -+ ...Ecore-or-EFL-related-packages-depedencies.patch | 526 ++++++++++++++++++++ -+ am_daemon/amd_key.c | 40 +- -+ am_daemon/amd_main.c | 32 +- -+ am_daemon/amd_status.c | 10 +- -+ include/SLP_AUL_PG.h | 6 +- -+ test/app_test.c | 10 +- -+ test/aul_test.c | 24 +- -+ test/launch_app.c | 16 +- -+ test/open_app.c | 18 +- -+ 10 files changed, 612 insertions(+), 86 deletions(-) -+ create mode 100644 Removing-Ecore-or-EFL-related-packages-depedencies.patch - - diff --git a/CMakeLists.txt b/CMakeLists.txt - index af23cb0..883c812 100644 -@@ -44,6 +46,538 @@ index af23cb0..883c812 100644 - - pkg_check_modules(libpkgs REQUIRED dlog bundle dbus-glib-1 ail xdgmime app-checker libtzplatform-config) - PKG_CHECK_MODULES(PKGS REQUIRED glib-2.0 gio-2.0 dlog bundle) -+diff --git a/Removing-Ecore-or-EFL-related-packages-depedencies.patch b/Removing-Ecore-or-EFL-related-packages-depedencies.patch -+new file mode 100644 -+index 0000000..fcf0296 -+--- /dev/null -++++ b/Removing-Ecore-or-EFL-related-packages-depedencies.patch -+@@ -0,0 +1,526 @@ -++From da49d86455f7a0cd6702f9f77b97ed9b3afed2f8 Mon Sep 17 00:00:00 2001 -++From: Xavier Roche -++Date: Wed, 11 Jun 2014 15:36:32 +0200 -++Subject: [PATCH] Removing Ecore or EFL related packages depedencies -++ -++Signed-off-by: Xavier Roche -++--- -++ CMakeLists.txt | 16 ++++++++-------- -++ am_daemon/amd_key.c | 40 ++++++++++++++++++++-------------------- -++ am_daemon/amd_main.c | 32 ++++++++++++++++---------------- -++ am_daemon/amd_status.c | 6 +++--- -++ include/SLP_AUL_PG.h | 6 +++--- -++ test/app_test.c | 10 +++++----- -++ test/aul_test.c | 24 ++++++++++++------------ -++ test/launch_app.c | 16 ++++++++-------- -++ test/open_app.c | 18 +++++++++--------- -++ 9 files changed, 84 insertions(+), 84 deletions(-) -++ -++diff --git a/CMakeLists.txt b/CMakeLists.txt -++index af23cb0..883c812 100644 -++--- a/CMakeLists.txt -+++++ b/CMakeLists.txt -++@@ -19,15 +19,15 @@ MESSAGE("Build type: ${CMAKE_BUILD_TYPE}") -++ -++ # Set required packages -++ INCLUDE(FindPkgConfig) -++-SET(AUL-1_PKG_CHECK_MODULES dlog ecore libprivilege-control app-checker rua glib-2.0 ecore-input evas vconf pkgmgr-info privacy-manager-client) -+++SET(AUL-1_PKG_CHECK_MODULES dlog libprivilege-control app-checker rua glib-2.0 vconf pkgmgr-info privacy-manager-client) -++ OPTION(WITH_WAYLAND "Build with wayland" OFF) -++-IF(WITH_WAYLAND) -++- ADD_DEFINITIONS("-DWAYLAND") -++- pkg_check_modules(pkgs REQUIRED ${AUL-1_PKG_CHECK_MODULES} ecore-wayland) -++-ELSE(WITH_WAYLAND) -++- ADD_DEFINITIONS("-DX11") -++- pkg_check_modules(pkgs REQUIRED ${AUL-1_PKG_CHECK_MODULES} x11 ecore-x) -++-ENDIF(WITH_WAYLAND) -+++#IF(WITH_WAYLAND) -+++# ADD_DEFINITIONS("-DWAYLAND") -+++# pkg_check_modules(pkgs REQUIRED ${AUL-1_PKG_CHECK_MODULES} ecore-wayland) -+++#ELSE(WITH_WAYLAND) -+++# ADD_DEFINITIONS("-DX11") -+++# pkg_check_modules(pkgs REQUIRED ${AUL-1_PKG_CHECK_MODULES} x11 ecore-x) -+++#ENDIF(WITH_WAYLAND) -++ -++ pkg_check_modules(libpkgs REQUIRED dlog bundle dbus-glib-1 ail xdgmime app-checker libtzplatform-config) -++ PKG_CHECK_MODULES(PKGS REQUIRED glib-2.0 gio-2.0 dlog bundle) -++diff --git a/am_daemon/amd_key.c b/am_daemon/amd_key.c -++index 4725889..3943b70 100755 -++--- a/am_daemon/amd_key.c -+++++ b/am_daemon/amd_key.c -++@@ -19,16 +19,16 @@ -++ * -++ */ -++ -++-#include -++-#include -++-#include -++-#ifdef X11 -++-#include -++-#include -++-#endif -++-#ifdef WAYLAND -++-#include -++-#endif -+++//#include -+++//#include -+++//#include -+++//#ifdef X11 -+++//#include -+++//#include -+++//#endif -+++//#ifdef WAYLAND -+++//#include -+++//#endif -++ #include -++ #include -++ -++@@ -37,7 +37,7 @@ -++ #include "app_sock.h" -++ #include "launch.h" -++ -++-static struct { -+++/*static struct { -++ Evas_Object *win; -++ Ecore_Event_Handler *key_up; -++ Ecore_Event_Handler *key_down; -++@@ -45,14 +45,14 @@ static struct { -++ .win = NULL, -++ .key_up = NULL, -++ .key_down = NULL, -++-}; -+++};*/ -++ -++ GSList *key_pid_list = NULL; -++ -++-static Eina_Bool __key_release_cb(void *data, int type, void *event); -++-static Eina_Bool __key_press_cb(void *data, int type, void *event); -+++//static Eina_Bool __key_release_cb(void *data, int type, void *event); -+++//static Eina_Bool __key_press_cb(void *data, int type, void *event); -++ -++-static Eina_Bool __key_release_cb(void *data, int type, void *event) -+++/*static Eina_Bool __key_release_cb(void *data, int type, void *event) -++ { -++ Evas_Event_Key_Up *ev = event; -++ int ret; -++@@ -83,10 +83,10 @@ static Eina_Bool __key_release_cb(void *data, int type, void *event) -++ } -++ -++ return ECORE_CALLBACK_RENEW; -++-} -+++}*/ -++ -++ -++-static Eina_Bool __key_press_cb(void *data, int type, void *event) -+++/*static Eina_Bool __key_press_cb(void *data, int type, void *event) -++ { -++ Evas_Event_Key_Down *ev = event; -++ int ret; -++@@ -117,7 +117,7 @@ static Eina_Bool __key_press_cb(void *data, int type, void *event) -++ } -++ -++ return ECORE_CALLBACK_RENEW; -++-} -+++}*/ -++ -++ int _register_key_event(int pid) -++ { -++@@ -171,7 +171,7 @@ int _unregister_key_event(int pid) -++ -++ int _key_init() -++ { -++-#ifdef X11 -+++/*#ifdef X11 -++ key_info.win = ecore_x_window_input_new(0, 0, 0, 1, 1); -++ if (!key_info.win) { -++ _D("Failed to create hidden window"); -++@@ -198,7 +198,7 @@ int _key_init() -++ if (!key_info.key_down) { -++ _D("Failed to register a key down event handler"); -++ } -++-#endif // X11 -+++#endif // X11*/ -++ -++ return 0; -++ } -++diff --git a/am_daemon/amd_main.c b/am_daemon/amd_main.c -++index 4b29192..8c60700 100755 -++--- a/am_daemon/amd_main.c -+++++ b/am_daemon/amd_main.c -++@@ -23,16 +23,16 @@ -++ #include -++ #include -++ #include -++-#include -++-#include -++-#include -++-#ifdef X11 -++-#include -++-#include -++-#endif -++-#ifdef WAYLAND -++-#include -++-#endif -+++//#include -+++//#include -+++//#include -+++//#ifdef X11 -+++//#include -+++//#include -+++//#endif -+++//#ifdef WAYLAND -+++//#include -+++//#endif -++ #include -++ #include -++ #include -++@@ -258,16 +258,16 @@ static int __init() -++ -++ int ret; -++ -++- ecore_init(); -++- evas_init(); -++- ecore_event_init(); -++-#ifdef X11 -+++ //ecore_init(); -+++ //evas_init(); -+++ //ecore_event_init(); -+++/*#ifdef X11 -++ ret = ecore_x_init(NULL); -++ _D("ecore_x_init initialized %d times\n", ret); -++ #endif -++ #ifdef WAYLAND -++ ecore_wl_init(NULL); -++-#endif -+++#endif*/ -++ -++ appinfo_init(&amd.af); -++ cgutil_create(MOUNT_PATH, AGENT_PATH, &amd.cg); -++@@ -312,7 +312,7 @@ int main(int argc, char *argv[]) -++ -++ g_idle_add(__amd_ready, NULL); -++ -++- ecore_main_loop_begin(); -+++ //ecore_main_loop_begin(); -++ -++ return 0; -++ } -++diff --git a/am_daemon/amd_status.c b/am_daemon/amd_status.c -++index d1e70f0..8b96b3d 100755 -++--- a/am_daemon/amd_status.c -+++++ b/am_daemon/amd_status.c -++@@ -24,7 +24,7 @@ -++ #include -++ #include -++ #include -++-#include -+++//#include -++ -++ #include "amd_config.h" -++ #include "amd_status.h" -++@@ -93,10 +93,10 @@ int _status_update_app_info_list(int pid, int status) -++ info_t = (app_status_info_t *)iter->data; -++ if(pid == info_t->pid) { -++ info_t->status = status; -++- if(status == STATUS_DYING) { -+++ /*if(status == STATUS_DYING) { -++ if(info_t->pad_pid != DEBUG_LAUNCHPAD_PID) -++ ecore_timer_add(2, __app_terminate_timer_cb, info_t->pid); -++- } -+++ }*/ -++ break; -++ } -++ } -++diff --git a/include/SLP_AUL_PG.h b/include/SLP_AUL_PG.h -++index 60fe408..8166b7d 100755 -++--- a/include/SLP_AUL_PG.h -+++++ b/include/SLP_AUL_PG.h -++@@ -211,7 +211,7 @@ int main(int argc, char *argv[]) -++ // Callee application -++ #include -++ #include -++-#include -+++//#include -++ -++ static int aul_handler(aul_type type, bundle *kb,void* data) -++ { -++@@ -234,13 +234,13 @@ static int aul_handler(aul_type type, bundle *kb,void* data) -++ -++ int main(int argc, char** argv) -++ { -++- ecore_init(); -+++ //ecore_init(); -++ -++ aul_launch_init(aul_handler,NULL); -++ // enable this if you want to handle at aul_handler when launch -++ aul_launch_argv_handler(argc, argv); -++ -++- ecore_main_loop_begin(); // You must need ecore or glib mainloop -+++ //ecore_main_loop_begin(); // You must need ecore or glib mainloop -++ return 0; -++ } -++ @endcode -++diff --git a/test/app_test.c b/test/app_test.c -++index d92da2a..8517305 100755 -++--- a/test/app_test.c -+++++ b/test/app_test.c -++@@ -26,7 +26,7 @@ -++ -++ /* ecore-glib integration */ -++ -++-#include -+++//#include -++ -++ extern int aul_listen_app_dead_signal(int (*func) (int, void *), void *data); -++ -++@@ -44,7 +44,7 @@ void do_resume() -++ printf("=================================\n"); -++ } -++ -++-static Eina_Bool send_result(void *data) -+++static int send_result(void *data) -++ { -++ bundle *kb; -++ bundle *res_b; -++@@ -94,7 +94,7 @@ int do_start(void *data) -++ -++ bundle_iterate(kb, prt_bundle, NULL); -++ -++- ecore_timer_add(5, send_result, bundle_dup(kb)); -+++ //ecore_timer_add(5, send_result, bundle_dup(kb)); -++ -++ return 0; -++ } -++@@ -134,7 +134,7 @@ int app_launch_handler(int pid, void *data) -++ __attribute__ ((visibility("default"))) -++ int main(int argc, char **argv) -++ { -++- ecore_init(); -+++ //ecore_init(); -++ -++ do_create(); -++ -++@@ -152,7 +152,7 @@ int main(int argc, char **argv) -++ exit(0); -++ } -++ -++- ecore_main_loop_begin(); -+++ //ecore_main_loop_begin(); -++ return 0; -++ } -++ -++diff --git a/test/aul_test.c b/test/aul_test.c -++index c912951..ef40ab7 100755 -++--- a/test/aul_test.c -+++++ b/test/aul_test.c -++@@ -24,7 +24,7 @@ -++ #include -++ #include -++ #include -++-#include -+++//#include -++ -++ #include "menu_db_util.h" -++ #include "aul.h" -++@@ -121,9 +121,9 @@ static void cb_func(bundle *kb, int is_cancel, void *data) -++ bundle_iterate(kb, prt_recvd_bundle, NULL); -++ } -++ -++- if ((strcmp(cmd, "launch_res") == 0) -+++ /*if ((strcmp(cmd, "launch_res") == 0) -++ || (strcmp(cmd, "open_svc_res") == 0)) -++- ecore_main_loop_quit(); -+++ ecore_main_loop_quit();*/ -++ } -++ -++ int open_test() -++@@ -175,14 +175,14 @@ static test_func_t scn_func[] = { -++ {"n", launch_test, "launch_test", ""} -++ }; -++ -++-static Eina_Bool run_all_test(void *data) -+++static int run_all_test(void *data) -++ { -++ static int pos = 0; -++ int ret; -++ -++ if (pos > sizeof(scn_func) / sizeof(test_func_t) - 1) { -++ printf("all internal test done\n"); -++- ecore_main_loop_quit(); -+++ //ecore_main_loop_quit(); -++ return 0; -++ } -++ -++@@ -204,7 +204,7 @@ static Eina_Bool run_all_test(void *data) -++ -++ int all_test() -++ { -++- ecore_timer_add(2, run_all_test, NULL); -+++ //ecore_timer_add(2, run_all_test, NULL); -++ return 0; -++ } -++ -++@@ -661,7 +661,7 @@ void print_usage(char *progname) -++ "cmd is internal purpose\n"); -++ } -++ -++-static Eina_Bool run_func(void *data) -+++static int run_func(void *data) -++ { -++ callfunc(cmd); -++ -++@@ -669,8 +669,8 @@ static Eina_Bool run_func(void *data) -++ || strcmp(cmd, "dbuslaunch") == 0 -++ || strcmp(cmd, "open_svc_res") == 0) -++ return 0; -++- else -++- ecore_main_loop_quit(); -+++ /*else -+++ ecore_main_loop_quit();*/ -++ -++ return 0; -++ } -++@@ -682,7 +682,7 @@ int main(int argc, char **argv) -++ exit(0); -++ } -++ -++- ecore_init(); -+++ //ecore_init(); -++ -++ cmd = argv[1]; -++ gargc = argc; -++@@ -694,9 +694,9 @@ int main(int argc, char **argv) -++ /*aul_listen_app_dead_signal(dead_tracker,NULL); */ -++ /*aul_listen_app_dead_signal(NULL,NULL); */ -++ -++- ecore_idler_add(run_func, NULL); -+++ /*ecore_idler_add(run_func, NULL); -++ -++- ecore_main_loop_begin(); -+++ ecore_main_loop_begin();*/ -++ -++ return 0; -++ } -++diff --git a/test/launch_app.c b/test/launch_app.c -++index 47b9b2d..6cd1cfe 100755 -++--- a/test/launch_app.c -+++++ b/test/launch_app.c -++@@ -24,7 +24,7 @@ -++ #include -++ #include -++ -++-#include -+++//#include -++ #include "aul.h" -++ -++ #define ROOT_UID 0 -++@@ -110,7 +110,7 @@ static int __launch_app_dead_handler(int pid, void *data) -++ return 0; -++ } -++ -++-static Eina_Bool run_func(void *data) -+++static int run_func(void *data) -++ { -++ int pid = -1; -++ char *str = NULL; -++@@ -121,12 +121,12 @@ static Eina_Bool run_func(void *data) -++ -++ if( str && strcmp(str, "SYNC") == 0 ) { -++ aul_listen_app_dead_signal(__launch_app_dead_handler, pid); -++- } else { -+++ } /*else { -++ ecore_main_loop_quit(); -++- } -+++ }*/ -++ } else { -++ printf("... launch failed\n"); -++- ecore_main_loop_quit(); -+++ //ecore_main_loop_quit(); -++ } -++ -++ if (kb) { -++@@ -145,16 +145,16 @@ int main(int argc, char **argv) -++ exit(EXIT_FAILURE); -++ } -++ -++- ecore_init(); -+++ //ecore_init(); -++ -++ gargc = argc; -++ gargv = argv; -++ -++ aul_launch_init(NULL, NULL); -++ -++- ecore_idler_add(run_func, NULL); -+++ //ecore_idler_add(run_func, NULL); -++ -++- ecore_main_loop_begin(); -+++ //ecore_main_loop_begin(); -++ -++ return 0; -++ } -++diff --git a/test/open_app.c b/test/open_app.c -++index d9b677c..49eb4f5 100755 -++--- a/test/open_app.c -+++++ b/test/open_app.c -++@@ -24,7 +24,7 @@ -++ #include -++ #include -++ -++-#include -+++//#include -++ #include "aul.h" -++ -++ #define ROOT_UID 0 -++@@ -104,13 +104,13 @@ static int __launch_app_dead_handler(int pid, void *data) -++ { -++ int listen_pid = (int) data; -++ -++- if(listen_pid == pid) -++- ecore_main_loop_quit(); -+++ /*if(listen_pid == pid) -+++ ecore_main_loop_quit();*/ -++ -++ return 0; -++ } -++ -++-static Eina_Bool run_func(void *data) -+++static int run_func(void *data) -++ { -++ int pid = -1; -++ char *str = NULL; -++@@ -124,9 +124,9 @@ static Eina_Bool run_func(void *data) -++ -++ if( str && strcmp(str, "SYNC") == 0 ) { -++ aul_listen_app_dead_signal(__launch_app_dead_handler, pid); -++- } else { -+++ } /*else { -++ ecore_main_loop_quit(); -++- } -+++ }*/ -++ -++ if (kb) { -++ bundle_free(kb); -++@@ -143,16 +143,16 @@ int main(int argc, char **argv) -++ exit(EXIT_FAILURE); -++ } -++ -++- ecore_init(); -+++ //ecore_init(); -++ -++ gargc = argc; -++ gargv = argv; -++ -++ aul_launch_init(NULL, NULL); -++ -++- ecore_idler_add(run_func, NULL); -+++ //ecore_idler_add(run_func, NULL); -++ -++- ecore_main_loop_begin(); -+++ //ecore_main_loop_begin(); -++ -++ return 0; -++ } -++-- -++1.7.9.5 -++ - diff --git a/am_daemon/amd_key.c b/am_daemon/amd_key.c - index 4725889..3943b70 100755 - --- a/am_daemon/amd_key.c -@@ -206,7 +740,7 @@ index 4b29192..8c60700 100755 - return 0; - } - diff --git a/am_daemon/amd_status.c b/am_daemon/amd_status.c --index d1e70f0..8b96b3d 100755 -+index d1e70f0..551139a 100755 - --- a/am_daemon/amd_status.c - +++ b/am_daemon/amd_status.c - @@ -24,7 +24,7 @@ -@@ -218,6 +752,24 @@ index d1e70f0..8b96b3d 100755 - - #include "amd_config.h" - #include "amd_status.h" -+@@ -69,7 +69,7 @@ int _status_add_app_info_list(char *appid, char *app_path, int pid, int pad_pid) -+ return 0; -+ } -+ -+-static Eina_Bool __app_terminate_timer_cb(void *data) -++static int __app_terminate_timer_cb(void *data) -+ { -+ int pid = (int)data; -+ int ret = 0; -+@@ -80,7 +80,7 @@ static Eina_Bool __app_terminate_timer_cb(void *data) -+ if (ret == -1) -+ _D("send SIGKILL: %s", strerror(errno)); -+ -+- return ECORE_CALLBACK_CANCEL; -++ return ret; -+ } -+ -+ int _status_update_app_info_list(int pid, int status) - @@ -93,10 +93,10 @@ int _status_update_app_info_list(int pid, int status) - info_t = (app_status_info_t *)iter->data; - if(pid == info_t->pid) { --- -1.7.9.5 - -- 2.7.4