Upstream version 6.34.115.0

Upstream commit-id 290dce5ffcae8cd467e697e9350bcd031bd90ab0

Change-Id: Ida182d813844b827c5f7d948f9bdfe13a5bd918f
Signed-off-by: Eurogiciel-BOT <eurogiciel.tizen@gmail.com>

diff --git a/packaging/crosswalk.spec b/packaging/crosswalk.spec
index 5a327fd..819cfe2 100644 (file)
--- a/packaging/crosswalk.spec
+++ b/packaging/crosswalk.spec
@@ -2,7 +2,7 @@
 %bcond_with wayland
 
 Name:           crosswalk
-Version:        6.34.113.0
+Version:        6.34.115.0
 Release:        0
 Summary:        Crosswalk is an app runtime based on Chromium
 License:        (BSD-3-Clause and LGPL-2.1+)
@@ -164,6 +164,7 @@ ${GYP_EXTRA_FLAGS} \
 -Duse_aura=1 \
 -Duse_cups=0 \
 -Duse_gconf=0 \
+-Duse_gnome_keyring=0 \
 -Duse_kerberos=0 \
 -Duse_system_bzip2=1 \
 -Duse_system_libexif=1 \

diff --git a/src/xwalk/VERSION b/src/xwalk/VERSION
index d2d743c..6c8aedc 100644 (file)
--- a/src/xwalk/VERSION
+++ b/src/xwalk/VERSION
@@ -1,4 +1,4 @@
 MAJOR=6
 MINOR=34
-BUILD=113
+BUILD=115
 PATCH=0

diff --git a/src/xwalk/dbus/dbus_manager_tizen.cc b/src/xwalk/dbus/dbus_manager_tizen.cc
index 5383e58..8f2a30b 100644 (file)
--- a/src/xwalk/dbus/dbus_manager_tizen.cc
+++ b/src/xwalk/dbus/dbus_manager_tizen.cc
@@ -4,7 +4,6 @@
 
 #include "xwalk/dbus/dbus_manager.h"
 
-#include <glib.h>
 #include <string>
 #include "base/bind.h"
 #include "base/strings/stringprintf.h"

diff --git a/src/xwalk/packaging/crosswalk.spec b/src/xwalk/packaging/crosswalk.spec
index 5a327fd..819cfe2 100644 (file)
--- a/src/xwalk/packaging/crosswalk.spec
+++ b/src/xwalk/packaging/crosswalk.spec
@@ -2,7 +2,7 @@
 %bcond_with wayland
 
 Name:           crosswalk
-Version:        6.34.113.0
+Version:        6.34.115.0
 Release:        0
 Summary:        Crosswalk is an app runtime based on Chromium
 License:        (BSD-3-Clause and LGPL-2.1+)
@@ -164,6 +164,7 @@ ${GYP_EXTRA_FLAGS} \
 -Duse_aura=1 \
 -Duse_cups=0 \
 -Duse_gconf=0 \
+-Duse_gnome_keyring=0 \
 -Duse_kerberos=0 \
 -Duse_system_bzip2=1 \
 -Duse_system_libexif=1 \

diff --git a/src/xwalk/runtime/browser/ui/native_app_window_tizen.cc b/src/xwalk/runtime/browser/ui/native_app_window_tizen.cc
index 2452dcd..c2bc3a0 100644 (file)
--- a/src/xwalk/runtime/browser/ui/native_app_window_tizen.cc
+++ b/src/xwalk/runtime/browser/ui/native_app_window_tizen.cc
@@ -6,7 +6,6 @@
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/transform.h"
 #include "ui/gfx/rect.h"

diff --git a/src/xwalk/xwalk.gyp b/src/xwalk/xwalk.gyp
index f739644..04557f3 100644 (file)
--- a/src/xwalk/xwalk.gyp
+++ b/src/xwalk/xwalk.gyp
@@ -28,6 +28,7 @@
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+        '../cc/cc.gyp:cc',
         '../components/components.gyp:visitedlink_browser',
         '../components/components.gyp:visitedlink_renderer',
         '../content/content.gyp:content',
@@ -52,6 +53,7 @@
         '../ui/ui.gyp:ui',
         '../url/url.gyp:url_lib',
         '../v8/tools/gyp/v8.gyp:v8',
+        '../webkit/common/webkit_common.gyp:webkit_common',
         '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
         '../webkit/child/webkit_child.gyp:webkit_child',
         '../webkit/webkit_resources.gyp:webkit_resources',
@@ -258,6 +260,7 @@
             'build/system.gyp:tizen_geolocation',
             'sysapps/sysapps_resources.gyp:xwalk_sysapps_resources',
             'tizen/xwalk_tizen.gypi:xwalk_tizen_lib',
+            '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
           ],
           'sources': [
             'runtime/browser/ui/screen_orientation.h',