EFL_UPGRADE: remove ecore-wayland dependency

Change-Id: I9978a6305ec66deb0396deaa680e709c4787d3de

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a665178..369fd82 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,7 +32,7 @@ pkg_check_modules(pkg_widget_base REQUIRED
        vconf-internal-keys
        widget_service
        capi-system-info
-       ecore-wayland
+       ecore-wl2
        capi-system-info
        screen_connector_provider
        appcore-multiwindow

diff --git a/include/widget_base.h b/include/widget_base.h
index 0358000..bf40ad3 100644 (file)
--- a/include/widget_base.h
+++ b/include/widget_base.h
@@ -113,7 +113,7 @@ void widget_base_fini(void);
 int widget_base_exit(void);
 int widget_base_context_window_bind(
                widget_base_instance_h instance_h, const char *id,
-               Ecore_Wl_Window *wl_win);
+               Ecore_Wl2_Window *wl_win);
 int widget_base_class_on_create(widget_base_instance_h instance_h,
                bundle *content, int w, int h);
 int widget_base_class_on_pause(widget_base_instance_h instance_h);

diff --git a/packaging/appcore-widget.spec b/packaging/appcore-widget.spec
index ef1179e..e96cfdc 100644 (file)
--- a/packaging/appcore-widget.spec
+++ b/packaging/appcore-widget.spec
@@ -15,7 +15,7 @@ BuildRequires:  pkgconfig(appcore-common)
 BuildRequires:  pkgconfig(capi-appfw-app-common)
 BuildRequires:  pkgconfig(widget_service)
 BuildRequires:  pkgconfig(capi-system-info)
-BuildRequires:  pkgconfig(ecore-wayland)
+BuildRequires:  pkgconfig(ecore-wl2)
 BuildRequires:  pkgconfig(appcore-multiwindow)
 BuildRequires:  pkgconfig(screen_connector_provider)
 BuildRequires:  cmake
@@ -54,6 +54,7 @@ widget application (development files)
 %setup -q
 
 %build
+export CFLAGS+=" -DEFL_BETA_API_SUPPORT "
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 %cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
 %__make %{?jobs:-j%jobs}

diff --git a/src/base/widget_base.c b/src/base/widget_base.c
index c732576..ce0f63b 100644 (file)
--- a/src/base/widget_base.c
+++ b/src/base/widget_base.c
@@ -29,7 +29,7 @@
 #include <widget_errno.h>
 #include <widget_instance.h>
 #include <aul_app_com.h>
-#include <Ecore_Wayland.h>
+#include <Ecore_Wl2.h>
 #include <system_info.h>
 #include <vconf.h>
 #include <vconf-internal-keys.h>
@@ -1263,11 +1263,11 @@ EXPORT_API void widget_base_fini(void)
 
 EXPORT_API int widget_base_context_window_bind(
                widget_base_instance_h instance_h, const char *id,
-               Ecore_Wl_Window *wl_win)
+               Ecore_Wl2_Window *wl_win)
 {
        struct wl_surface *surface;
 
-       surface = ecore_wl_window_surface_get(wl_win);
+       surface = ecore_wl2_window_surface_get(wl_win);
        if (surface == NULL) {
                LOGE("failed to get surface"); /* LCOV_EXCL_LINE */
                return WIDGET_BASE_ERROR_FAULT; /* LCOV_EXCL_LINE */

diff --git a/src/efl_base/widget_app.c b/src/efl_base/widget_app.c
index 83073b3..24dcb58 100644 (file)
--- a/src/efl_base/widget_app.c
+++ b/src/efl_base/widget_app.c
@@ -334,7 +334,7 @@ EXPORT_API int widget_app_get_elm_win(widget_context_h context,
                                        Evas_Object **win)
 {
        Evas_Object *ret_win = NULL;
-       Ecore_Wl_Window *wl_win;
+       Ecore_Wl2_Window *wl_win;
        struct instance_data *data;
        char buffer[256];
        int rots[3] = {0};
@@ -361,13 +361,13 @@ EXPORT_API int widget_app_get_elm_win(widget_context_h context,
        elm_win_wm_rotation_preferred_rotation_set(ret_win, -1);
        elm_win_wm_rotation_available_rotations_set(ret_win, rots, 1);
 
-       wl_win = elm_win_wl_window_get(ret_win);
+       wl_win = ecore_evas_wayland2_window_get(ecore_evas_ecore_evas_get(evas_object_evas_get(ret_win)));
        if (wl_win == NULL) {
                _E("failed to get wayland window"); /* LCOV_EXCL_LINE */
                goto fault;
        }
 
-       ecore_wl_window_class_name_set(wl_win, id);
+       ecore_wl2_window_class_set(wl_win, id);
        elm_win_aux_hint_add(ret_win, "wm.policy.win.user.geometry", "1");
        widget_base_context_window_bind((widget_base_instance_h)context,        id, wl_win);
 
@@ -376,7 +376,7 @@ EXPORT_API int widget_app_get_elm_win(widget_context_h context,
        evas_object_data_set(ret_win, "___PLUGID", strdup(buffer));
        evas_object_event_callback_add(ret_win, EVAS_CALLBACK_DEL, __win_del_cb, NULL);
 
-       win_id = ecore_wl_window_id_get(wl_win);
+       win_id = ecore_wl2_window_id_get(wl_win);
        _D("window created: %d", win_id);
 
        data = (struct instance_data *)widget_base_context_get_user_data(