[After apply the EFL patch, can merge it]

For EFL upgrad patch

[ Problem ] Tizen 5.0 EFL upgrade to opensource EFL1.20 version
[ Solution ] Defrecated ecore-wayland use ecore-wl2

Change-Id: Ib7fb31f327cedd16bd3e23b8cba2268aff6d5c1b
Signed-off-by: cookie <cookie@samsung.com>

diff --git a/core/Config/Config.cpp b/core/Config/Config.cpp
index b7a328a..9a0e94e 100755 (executable)
--- a/core/Config/Config.cpp
+++ b/core/Config/Config.cpp
@@ -17,7 +17,6 @@
 #include "browser_config.h"
 #include "Config.h"
 #include "BrowserLogger.h"
-#include "Ecore_Wayland.h"
 #include "Tools/SettingsEnums.h"
 #include <Elementary.h>
 #include <app_common.h>

diff --git a/packaging/org.tizen.browser.spec b/packaging/org.tizen.browser.spec
index ad53e0f..134a0bb 100755 (executable)
--- a/packaging/org.tizen.browser.spec
+++ b/packaging/org.tizen.browser.spec
@@ -12,7 +12,7 @@ Group:      Applications/Web
 Source0:    %{name}-%{version}.tar.gz
 
 %if "%{?_with_wayland}" == "1"
-BuildRequires: pkgconfig(ecore-wayland)
+BuildRequires: pkgconfig(ecore-wl2)
 %else
 BuildRequires:  pkgconfig(ecore-x)
 BuildRequires:  pkgconfig(utilX)

diff --git a/services/SimpleUI/SimpleUI.cpp b/services/SimpleUI/SimpleUI.cpp
index b462af1..47c6bdd 100755 (executable)
--- a/services/SimpleUI/SimpleUI.cpp
+++ b/services/SimpleUI/SimpleUI.cpp
@@ -21,7 +21,6 @@
 #include <algorithm>
 #include <Elementary.h>
 #include <Ecore.h>
-#include <Ecore_Wayland.h>
 #include <Edje.h>
 #include <app.h>
 #include <appcore-common.h>

diff --git a/services/SimpleUI/ViewManager.cpp b/services/SimpleUI/ViewManager.cpp
index 8855772..1fa2daf 100755 (executable)
--- a/services/SimpleUI/ViewManager.cpp
+++ b/services/SimpleUI/ViewManager.cpp
@@ -23,9 +23,7 @@
 
 #include <Elementary.h>
 #include <Ecore.h>
-#include <Ecore_Wayland.h>
 #include <string>
-
 #include "ViewManager.h"
 #include "core/BrowserLogger.h"
 #include "core/ServiceManager/Debug/BrowserAssert.h"
@@ -51,7 +49,7 @@ void ViewManager::init(Evas_Object* parentWindow)
 
     m_conformant = elm_conformant_add(parentWindow);
     if (!elm_layout_file_set(m_conformant, edjFilePath.c_str(), "elm/conformant/custom_conformant"))
-        BROWSER_LOGD("[%s:%d] elm_layout_file_set falied !!!",__PRETTY_FUNCTION__, __LINE__);
+        BROWSER_LOGD("[%s:%d] elm_layout_file_set falied !!!", __PRETTY_FUNCTION__, __LINE__);
     evas_object_size_hint_weight_set(m_conformant, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 
     Evas_Object *bg = elm_bg_add(m_conformant);
@@ -71,12 +69,12 @@ void ViewManager::init(Evas_Object* parentWindow)
 
     m_mainLayout = elm_layout_add(bx);
     evas_object_size_hint_weight_set(m_mainLayout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-    evas_object_size_hint_align_set (m_mainLayout, EVAS_HINT_FILL, EVAS_HINT_FILL);
+    evas_object_size_hint_align_set(m_mainLayout, EVAS_HINT_FILL, EVAS_HINT_FILL);
     evas_object_show(m_mainLayout);
     elm_box_pack_end(bx, m_mainLayout);
 
     if (!elm_layout_file_set(m_mainLayout, edjFilePath.c_str(), "main_layout"))
-        BROWSER_LOGD("[%s:%d] elm_layout_file_set falied !!!",__PRETTY_FUNCTION__, __LINE__);
+        BROWSER_LOGD("[%s:%d] elm_layout_file_set falied !!!", __PRETTY_FUNCTION__, __LINE__);
 
     elm_object_content_set(m_conformant, bx);
 }
@@ -150,7 +148,7 @@ void ViewManager::updateLayout(const sAUI& previousView)
 
         topOfStack()->showUI();
     } else {
-        BROWSER_LOGD("[%s:%d] Stack is empty!!!",__PRETTY_FUNCTION__, __LINE__);
+        BROWSER_LOGD("[%s:%d] Stack is empty!!!", __PRETTY_FUNCTION__, __LINE__);
         elm_layout_content_unset(m_mainLayout, "content");
         if (previousView) {
              previousView->hideUI();