[FIX] Build for Tizen 3.0

Change-Id: I460a01ab49e1ad8e2f06fc819dd6b228acd9459d

diff --git a/daemon/Makefile b/daemon/Makefile
index 7cb31c6..46f363b 100644 (file)
--- a/daemon/Makefile
+++ b/daemon/Makefile
@@ -104,7 +104,6 @@ SRC_C := \
        malloc_debug.c \
        target.c \
        thread.c \
-       wsi.c \
        ui_viewer.c
 
 SRC_CPP := \

diff --git a/packaging/swap-manager.spec b/packaging/swap-manager.spec
index 62de8fc..fb9c869 100644 (file)
--- a/packaging/swap-manager.spec
+++ b/packaging/swap-manager.spec
@@ -28,7 +28,6 @@ BuildRequires: app-core-efl
 BuildRequires: libwayland-egl
 BuildRequires:  evas-devel
 BuildRequires:  elementary-devel
-BuildRequires:  libXext-devel
 %if "%{TIZEN_PRODUCT_TV}" != "1"
 BuildRequires: app-core-efl-debuginfo
 %endif

diff --git a/scripts/gen_loader_header.sh b/scripts/gen_loader_header.sh
old mode 100644 (file)
new mode 100755 (executable)
index 2e82118..007d8ab
--- a/scripts/gen_loader_header.sh
+++ b/scripts/gen_loader_header.sh
@@ -4,7 +4,7 @@ loader_library_path="/lib/"
 loader_open_function="dlopen"
 linker_path="/lib/"
 linker_sym="_r_debug"
-test_bin="/usr/bin/WebProcess"
+test_bin="/bin/su"
 libc_pkg_name="glibc"
 libpthread_pkg_name="glibc"
 libsmack_pkg_name="smack"

diff --git a/ui_viewer/Makefile b/ui_viewer/Makefile
index 4fe0fc9..3c511b3 100644 (file)
--- a/ui_viewer/Makefile
+++ b/ui_viewer/Makefile
@@ -21,6 +21,7 @@ INCLUDE := \
        -I/usr/include/eina-1/eina \
        -I/usr/include/eet-1 \
        -I/usr/include/evas-1 \
+       -I/usr/include/emile-1 \
        -I/usr/include/eo-1 \
        -I/usr/include/ecore-1 \
        -I/usr/include/ecore-evas-1 \
@@ -79,7 +80,7 @@ SRC_C := \
        ui_viewer_lib.c \
        ui_viewer_utils.c \
        ui_viewer_data.c \
-       ui_viewer_screenshot.c
+#      ui_viewer_screenshot.c
 
 TARGET = da_ui_viewer.so
 

diff --git a/ui_viewer/ui_viewer_data.c b/ui_viewer/ui_viewer_data.c
index e6dbba1..1a5d1f2 100644 (file)
--- a/ui_viewer/ui_viewer_data.c
+++ b/ui_viewer/ui_viewer_data.c
@@ -1899,9 +1899,9 @@ char *pack_ui_obj_screenshot(char *to, Evas_Object *obj)
                win_id = _get_win_id(evas);
                win_focus = elm_win_focus_get(win_id);
 
-               if (win_focus || _get_shot_in_bg(obj))
-                       ui_viewer_capture_screen(screenshot, obj);
-               else
+               /* if (win_focus || _get_shot_in_bg(obj)) */
+               /*      ui_viewer_capture_screen(screenshot, obj); */
+               /* else */
                        err_code = ERR_UI_OBJ_SCREENSHOT_FAILED;
                evas_event_thaw(evas);
                evas_object_unref(obj);

diff --git a/ui_viewer/ui_viewer_utils.h b/ui_viewer/ui_viewer_utils.h
index 3a4fe0f..3a3d2e4 100644 (file)
--- a/ui_viewer/ui_viewer_utils.h
+++ b/ui_viewer/ui_viewer_utils.h
@@ -83,7 +83,7 @@ bool print_log_ui_obj_screenshot(Evas_Object *obj);
 bool printLog(log_t* log, int msgType);
 void raise_app_window(void);
 
-int ui_viewer_capture_screen(char *screenshot_path, Evas_Object *obj);
+/* int ui_viewer_capture_screen(char *screenshot_path, Evas_Object *obj); */
 
 void ui_viewer_clean_log(void);
 void ui_viewer_log(const char *format, ...);