EFL_UPGRADE: remove ecore-wayland dependency

Change-Id: I8bea2155962aa18a661cad3bb5e000cfc4b3c6b3
Signed-off-by: Semun Lee <semun.lee@samsung.com>

diff --git a/packaging/syspopup.spec b/packaging/syspopup.spec
index c8d1c6c..4ee5110 100644 (file)
--- a/packaging/syspopup.spec
+++ b/packaging/syspopup.spec
@@ -16,7 +16,7 @@ BuildRequires:  pkgconfig(bundle)
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gio-2.0)
-BuildRequires:  pkgconfig(ecore-wayland)
+BuildRequires:  pkgconfig(ecore-wl2)
 BuildRequires:  pkgconfig(capi-ui-efl-util)
 BuildRequires:  pkgconfig(evas)
 BuildRequires:  pkgconfig(elementary)
@@ -61,7 +61,7 @@ syspopup-caller development package for popup
 cp %{SOURCE1001} %{SOURCE1002} %{SOURCE1003} %{SOURCE1004} .
 
 %build
-
+export CFLAGS+=" -DEFL_BETA_API_SUPPORT "
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 %cmake -DTZ_SYS_RO_PACKAGES=%{TZ_SYS_RO_PACKAGES} \
        -DTZ_SYS_RO_SHARE=%{TZ_SYS_RO_SHARE} \

diff --git a/syspopup/CMakeLists.txt b/syspopup/CMakeLists.txt
index 7945013..84ab739 100644 (file)
--- a/syspopup/CMakeLists.txt
+++ b/syspopup/CMakeLists.txt
@@ -18,7 +18,7 @@ MESSAGE("Build type: ${CMAKE_BUILD_TYPE}")
 # Set required packages
 INCLUDE(FindPkgConfig)
 
-SET(SYSPOPUP_CHECK_MODULES "dlog bundle sqlite3 glib-2.0 gio-2.0 evas elementary ecore ecore-input libtzplatform-config ecore-wayland capi-ui-efl-util")
+SET(SYSPOPUP_CHECK_MODULES "dlog bundle sqlite3 glib-2.0 gio-2.0 evas elementary ecore ecore-input libtzplatform-config ecore-wl2 capi-ui-efl-util")
 SET(pc_requires "bundle elementary")
 
 PKG_CHECK_MODULES(SP_PKGS REQUIRED ${SYSPOPUP_CHECK_MODULES})

diff --git a/syspopup/syspopup_wayland.c b/syspopup/syspopup_wayland.c
index d06f795..2fca593 100644 (file)
--- a/syspopup/syspopup_wayland.c
+++ b/syspopup/syspopup_wayland.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <Ecore_Wayland.h>
+#include <Ecore_Wl2.h>
 #include <efl_util.h>
 #include <Ecore.h>
 
@@ -39,7 +39,7 @@ static void __wl_syspopup_term_handler(gpointer data, gpointer user_data)
        case SYSPOPUP_HIDE:
                if (sp->def_term_fn)
                        sp->def_term_fn(sp->dupped_bundle, sp->user_data);
-               ecore_wl_window_hide((Ecore_Wl_Window *)sp->internal_data);
+               ecore_wl2_window_hide((Ecore_Wl2_Window *)sp->internal_data);
                break;
        default:
                _D("term action IGNORED: %s", sp->name);
@@ -69,7 +69,7 @@ static void __wl_rotation_set(syspopup *sp)
 {
        int rots[] = {0, 90, 180, 270};
 
-       ecore_wl_window_class_name_set(sp->internal_data, WIN_PROP_NAME);
+       ecore_wl2_window_class_set(sp->internal_data, WIN_PROP_NAME);
        if (elm_win_wm_rotation_supported_get(sp->win))
                elm_win_wm_rotation_available_rotations_set(sp->win, rots, 4);
        else
@@ -94,20 +94,20 @@ static efl_util_notification_level_e __wl_syspopup_get_notification_level(int pr
 
 int wl_syspopup_init(syspopup *sp, syspopup_info_t *info)
 {
-       Ecore_Wl_Window *wl_win;
+       Ecore_Wl2_Window *wl_win;
        efl_util_notification_level_e level;
 
        if (_syspopup_init(__wl_syspopup_term_handler,
                                __wl_syspopup_timeout_handler) < 0)
                return -1;
 
-       wl_win = (Ecore_Wl_Window *)sp->internal_data;
-       ecore_wl_window_type_set(wl_win, ECORE_WL_WINDOW_TYPE_NOTIFICATION);
+       wl_win = (Ecore_Wl2_Window *)sp->internal_data;
+       ecore_wl2_window_type_set(wl_win, ECORE_WL2_WINDOW_TYPE_NOTIFICATION);
 
        level = __wl_syspopup_get_notification_level(info->prio);
        efl_util_set_notification_window_level(sp->win, level);
        if (info->focus)
-               ecore_wl_window_focus_skip_set(wl_win, EINA_TRUE);
+               ecore_wl2_window_focus_skip_set(wl_win, EINA_TRUE);
 
        __wl_rotation_set(sp);
 
@@ -119,7 +119,7 @@ int wl_syspopup_reset(bundle *b)
        const char *popup_name;
        syspopup_info_t *info;
        syspopup *sp;
-       Ecore_Wl_Window *wl_win;
+       Ecore_Wl2_Window *wl_win;
        efl_util_notification_level_e level;
        int ret;
 
@@ -141,8 +141,8 @@ int wl_syspopup_reset(bundle *b)
 
        sp->dupped_bundle = bundle_dup(b);
 
-       wl_win = (Ecore_Wl_Window *)sp->internal_data;
-       ecore_wl_window_type_set(wl_win, ECORE_WL_WINDOW_TYPE_NOTIFICATION);
+       wl_win = (Ecore_Wl2_Window *)sp->internal_data;
+       ecore_wl2_window_type_set(wl_win, ECORE_WL2_WINDOW_TYPE_NOTIFICATION);
 
        level = __wl_syspopup_get_notification_level(info->prio);
        ret = efl_util_set_notification_window_level(sp->win, level);
@@ -152,7 +152,7 @@ int wl_syspopup_reset(bundle *b)
        }
 
        if (info->focus)
-               ecore_wl_window_focus_skip_set(wl_win, EINA_TRUE);
+               ecore_wl2_window_focus_skip_set(wl_win, EINA_TRUE);
 
        __wl_rotation_set(sp);
 
@@ -185,7 +185,7 @@ int wl_syspopup_process_keypress(int id, const char *keyname)
                if (sp->def_term_fn)
                        sp->def_term_fn(sp->dupped_bundle, sp->user_data);
 
-               ecore_wl_window_hide((Ecore_Wl_Window *)sp->internal_data);
+               ecore_wl2_window_hide((Ecore_Wl2_Window *)sp->internal_data);
        } else {
                _E("no find key down");
        }