Update app-svc

from: 859ec161b49125408a7c74cacc29e78ad27d9a3c
to  : 1c984aefbe371d3d04709aaff514c6ed10a62292

[NOTE]
This commit have been checked compiling
but the command of pkgmgr is not existed,
so it is necessary that alternative command is added.

Change-Id: Id5d3278467f900a199ca34ae32012000a5e09305
Signed-off-by: Yuta Doi <yuta-d@witz-inc.co.jp>

3 files changed, 54 insertions, 130 deletions

diff --git a/meta-application-manager/recipes-application-framework/app-svc/app-svc.inc b/meta-application-manager/recipes-application-framework/app-svc/app-svc.inc
index 778eaba..b29ffea 100644
--- a/meta-application-manager/recipes-application-framework/app-svc/app-svc.inc
+++ b/meta-application-manager/recipes-application-framework/app-svc/app-svc.inc
@@ -32,27 +32,17 @@ RDEPENDS_${PN}-dev += "app-svc"
 
 DEPENDS = ""
 #DEPENDS of app-svc
-DEPENDS += "pkgmgr-info"
-DEPENDS += "libsoup-2.4"
 inherit tizen_cmake
-DEPENDS += "iniparser"
-DEPENDS += "tizen-platform-config"
 inherit pkgconfig
 DEPENDS += "dlog"
 DEPENDS += "aul"
-DEPENDS += "xdgmime"
-DEPENDS += "ail"
 DEPENDS += "bundle"
-DEPENDS += "sqlite3"
-DEPENDS += "libprivilege-control"
-DEPENDS += "glib-2.0"
-DEPENDS += "dbus-glib"
+
 
 do_prep() {
  cd ${S}
  chmod -Rf a+rX,u+w,g-w,o-w ${S}
  #setup -q
- sed -i ${S}/packaging/app-svc.manifest -e "s|TZ_SYS_DB|${prefix}/dbspace|g"
  cp ${S}/packaging/app-svc.manifest .
  
  
@@ -111,10 +101,6 @@ do_install() {
    find ${D} -regex ".*\.la$" | xargs rm -f -- 
    find ${D} -regex ".*\.a$" | xargs rm -f --
  
- # Create database
- mkdir -p ${D}${prefix}/dbspace
- sqlite3 ${D}${prefix}/dbspace/.appsvc.db < data/appsvc_db.sql
- 
  
 }
 
@@ -135,8 +121,6 @@ PACKAGES += " app-svc "
 PACKAGES += " app-svc-dev "
 
 app-svc_files = ""
-app-svc_files += "%verify(not md5 mtime size) %attr(664,root,users) ${prefix}/dbspace/.appsvc.db"
-app-svc_files += "%verify(not md5 mtime size) %attr(664,root,users) ${prefix}/dbspace/.appsvc.db-journal"
 app-svc_files += "${prefix}/bin/appsvc_test"
 app-svc_files += "${prefix}/lib/libappsvc.so.0"
 app-svc_files += "${prefix}/lib/libappsvc.so.0.1.0"
diff --git a/meta-application-manager/recipes-application-framework/app-svc/app-svc_git.bb b/meta-application-manager/recipes-application-framework/app-svc/app-svc_git.bb
index 66651b1..0e713e3 100644
--- a/meta-application-manager/recipes-application-framework/app-svc/app-svc_git.bb
+++ b/meta-application-manager/recipes-application-framework/app-svc/app-svc_git.bb
@@ -4,7 +4,7 @@ PRIORITY = "10"
 
 LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
-SRC_URI += "git://review.tizen.org/platform/core/appfw/app-svc;tag=859ec161b49125408a7c74cacc29e78ad27d9a3c;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/core/appfw/app-svc;tag=1c984aefbe371d3d04709aaff514c6ed10a62292;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
diff --git a/meta-application-manager/recipes-application-framework/app-svc/files/0001_remove-ecore-related-functions.patch b/meta-application-manager/recipes-application-framework/app-svc/files/0001_remove-ecore-related-functions.patch
index 4f34421..fd8b2c2 100644
--- a/meta-application-manager/recipes-application-framework/app-svc/files/0001_remove-ecore-related-functions.patch
+++ b/meta-application-manager/recipes-application-framework/app-svc/files/0001_remove-ecore-related-functions.patch
@@ -1,104 +1,57 @@
-diff --git a/app-svc/src/appsvc.c b/app-svc/src/appsvc.c
-index f6d6766..a3e393a 100644
---- a/src/appsvc.c
-+++ b/src/appsvc.c
-@@ -30,10 +30,10 @@
- #include <libsoup/soup.h>
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ef06907..7c9b589 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -21,10 +21,10 @@ MESSAGE("Build type: ${CMAKE_BUILD_TYPE}")
+ # Set required packages
+ INCLUDE(FindPkgConfig)
  
- #ifndef WAYLAND
--#include <Ecore_X.h>
-+//#include <Ecore_X.h>
- #endif
+-SET(APPSVC_LIBPKGS_CHECK_MODULES "dlog bundle aul ecore")
++SET(APPSVC_LIBPKGS_CHECK_MODULES "dlog bundle aul")
+ 
+ IF (with_x)
+-pkg_check_modules(libpkgs REQUIRED ${APPSVC_LIBPKGS_CHECK_MODULES} ecore-x)
++pkg_check_modules(libpkgs REQUIRED ${APPSVC_LIBPKGS_CHECK_MODULES})
+ ENDIF(with_x)
  
+ IF (with_wayland)
+diff --git a/src/appsvc.c b/src/appsvc.c
+index ff95f43..7956bf0 100644
+--- a/src/appsvc.c
++++ b/src/appsvc.c
+@@ -19,10 +19,10 @@
+ #include <glib.h>
+ #include <aul.h>
+ #include <aul_svc.h>
 -#include <Ecore.h>
 +//#include <Ecore.h>
- #include <iniparser.h>
- #include <pkgmgr-info.h>
- 
-@@ -1073,7 +1073,7 @@
- 	appsvc_host_res_fn cb_func;
  
  #ifndef WAYLAND
--	Ecore_X_Window win_id;
-+	//Ecore_X_Window win_id;
+-#include <Ecore_X.h>
++//#include <Ecore_X.h>
  #endif
  
- 	void *data;
-@@ -1079,6 +1079,9 @@ typedef struct _appsvc_transient_cb_info_t{
- 	void *data;
- }appsvc_transient_cb_info_t;
+ #include "appsvc.h"
+@@ -183,7 +183,7 @@ SLPAPI int appsvc_data_is_array(bundle *b, const char *key)
+ }
  
-+/*
-+* cut callback function from efl main loop
-+*
- static Eina_Bool __transient_cb(void *data, int type, void *event)
- {
  #ifndef WAYLAND
-@@ -1095,7 +1098,7 @@ static Eina_Bool __transient_cb(void *data, int type, void *event)
- #endif
- 	return ECORE_CALLBACK_RENEW;
- }
--
-+*/
- int __aul_subapp_cb(void *data)
+-SLPAPI int appsvc_allow_transient_app(bundle *b, Ecore_X_Window id)
++SLPAPI int appsvc_allow_transient_app(bundle *b, unsigned int id)
  {
- 	appsvc_transient_cb_info_t*  cb_info;
-@@ -1106,7 +1106,7 @@
- 	cb_info = (appsvc_transient_cb_info_t*) data;
- 
- 	cb_info->cb_func(cb_info->data);
--	ecore_main_loop_quit();
-+	//ecore_main_loop_quit();
- 
- 	return 0;
+ 	return aul_svc_allow_transient_app(b, id);
  }
-@@ -1107,7 +1110,7 @@ int __aul_subapp_cb(void *data)
+@@ -195,7 +195,7 @@ SLPAPI int appsvc_allow_transient_app(bundle *b, unsigned int id)
+ #endif
  
- 	return 0;
- }
--
-+/*
  #ifndef WAYLAND
- SLPAPI int appsvc_allow_transient_app(bundle *b, Ecore_X_Window id)
+-SLPAPI int appsvc_request_transient_app(bundle *b, Ecore_X_Window callee_id, appsvc_host_res_fn cbfunc, void *data)
++SLPAPI int appsvc_request_transient_app(bundle *b, unsigned int callee_id, appsvc_host_res_fn cbfunc, void *data)
  {
-@@ -1155,7 +1158,7 @@ SLPAPI int appsvc_request_transient_app(bundle *b, Ecore_X_Window callee_id, app
- 	info->cb_func = cbfunc;
- 	info->data = data;
- 
--	ecore_event_handler_add(ECORE_X_EVENT_WINDOW_DESTROY, __transient_cb, info);
-+	//ecore_event_handler_add(ECORE_X_EVENT_WINDOW_DESTROY, __transient_cb, info);
- 	aul_set_subapp(__aul_subapp_cb, info);
- 
- 	return 0;
-@@ -1166,7 +1169,7 @@ SLPAPI int appsvc_request_transient_app(bundle *b, unsigned int callee_id, appsv
- 	return 0;
+ 	return aul_svc_request_transient_app(b, callee_id, (aul_svc_host_res_fn)cbfunc, data);
  }
- #endif
--
-+*/
- SLPAPI int appsvc_subapp_terminate_request_pid(int pid)
- {
- 	return aul_subapp_terminate_request_pid(pid);
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -22,12 +22,12 @@
- # Set required packages
- INCLUDE(FindPkgConfig)
- 
--SET(APPSVC_PKGS_CHECK_MODULES "dlog ecore libprivilege-control aul")
--SET(APPSVC_LIBPKGS_CHECK_MODULES "dlog bundle dbus-glib-1 ail xdgmime aul glib-2.0 ecore libsoup-2.4 iniparser pkgmgr-info libtzplatform-config")
-+SET(APPSVC_PKGS_CHECK_MODULES "dlog libprivilege-control aul")
-+SET(APPSVC_LIBPKGS_CHECK_MODULES "dlog bundle dbus-glib-1 ail xdgmime aul glib-2.0 libsoup-2.4 iniparser pkgmgr-info libtzplatform-config")
- 
- IF (with_x)
- pkg_check_modules(pkgs REQUIRED ${APPSVC_PKGS_CHECK_MODULES} x11)
--pkg_check_modules(libpkgs REQUIRED ${APPSVC_LIBPKGS_CHECK_MODULES} ecore-x)
-+pkg_check_modules(libpkgs REQUIRED ${APPSVC_LIBPKGS_CHECK_MODULES})
- ENDIF(with_x)
- 
- IF (with_wayland)
-
+diff --git a/test/appsvc_test.c b/test/appsvc_test.c
+index cb4a62f..0e13d9f 100755
 --- a/test/appsvc_test.c
 +++ b/test/appsvc_test.c
 @@ -23,7 +23,7 @@
@@ -110,7 +63,7 @@ index f6d6766..a3e393a 100644
  #include <aul.h>
  
  #include "appsvc.h"
-@@ -197,7 +197,7 @@
+@@ -197,7 +197,7 @@ static void cb_func(bundle *kb, int request_code, appsvc_result_val result, void
  
  	if(strcmp(cmd,"run_svc_res")==0){
  		printf("==== end of appsvc_run() ====\n");
@@ -119,38 +72,25 @@ index f6d6766..a3e393a 100644
  	}
  }
  
-@@ -292,18 +292,18 @@
- }
+@@ -291,7 +291,7 @@ void print_usage(char* progname)
  
+ }
  
--static Eina_Bool run_func(void *data)
--{
--	callfunc(cmd);
 -
--	if(strcmp(cmd,"run_svc_res") == 0 )
--		return 0;
--	else
--		ecore_main_loop_quit();
--
--	return 0;
--}
++/*
+ static Eina_Bool run_func(void *data)
+ {
+ 	callfunc(cmd);
+@@ -303,7 +303,7 @@ static Eina_Bool run_func(void *data)
+ 
+ 	return 0;
+ }
 -
-+/* static Eina_Bool run_func(void *data)
-+ * {
-+ * 	callfunc(cmd);
-+ * 
-+ * 	if(strcmp(cmd,"run_svc_res") == 0 )
-+ * 		return 0;
-+ * 	else
-+ * 		ecore_main_loop_quit();
-+ * 
-+ * 	return 0;
-+ * }
-+ */
++*/
  
  int main(int argc, char** argv)
  {
-@@ -312,7 +312,7 @@
+@@ -312,7 +312,7 @@ int main(int argc, char** argv)
  		exit(0);
  	}
  	
@@ -159,7 +99,7 @@ index f6d6766..a3e393a 100644
  
  	cmd = argv[1];
  	gargc = argc;
-@@ -324,9 +324,9 @@
+@@ -324,9 +324,9 @@ int main(int argc, char** argv)
  	//aul_listen_app_dead_signal(dead_tracker,NULL);
  	//aul_listen_app_dead_signal(NULL,NULL);