Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / ozone / patches / 0002-Temporary-patch-to-fix-linking-issue.patch

diff --git a/src/ozone/patches/0002-Temporary-patch-to-fix-linking-issue.patch b/src/ozone/patches/0002-Temporary-patch-to-fix-linking-issue.patch
index cd2fc82..9fbcc88 100644 (file)
--- a/src/ozone/patches/0002-Temporary-patch-to-fix-linking-issue.patch
+++ b/src/ozone/patches/0002-Temporary-patch-to-fix-linking-issue.patch
@@ -1,25 +1,69 @@
-From 517f8d206d048c00aec0ab34caab1ffea24fe9b1 Mon Sep 17 00:00:00 2001
+From 2b5a26e2666579728da12b847228934ac5c630d7 Mon Sep 17 00:00:00 2001
 From: Kondapally Kalyan <kalyan.kondapally@intel.com>
 Date: Tue, 17 Jun 2014 19:13:41 +0300
-Subject: [PATCH 2/2] Temporary patch to fix linking issue.
+Subject: [PATCH] Temporary patch to fix linking issue.
 
 ---
  .../chrome_browser_main_extra_parts_metrics.cc     |    2 +-
- .../views/app_list/linux/app_list_service_linux.cc |    4 ++++
- 2 files changed, 5 insertions(+), 1 deletion(-)
+ chrome/browser/shell_integration_linux.cc          |    2 ++
+ ui/views/views.gyp                                 |    4 ++--
+ 3 files changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
-index bd9ccf2..458ef1c 100644
+index 93f0f46..394a50c 100644
 --- a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
 +++ b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
-@@ -124,7 +124,7 @@ void RecordLinuxGlibcVersion() {
+@@ -133,7 +133,7 @@ void RecordLinuxGlibcVersion() {
  }
-
+ 
  void RecordLinuxWindowManager() {
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#if defined(USE_X11) && !defined(OS_CHROMEOS)
    ui::WindowManagerName name = ui::GuessWindowManager();
    UMALinuxWindowManager uma_name = UMA_LINUX_WINDOW_MANAGER_OTHER;
    switch (name) {
+diff --git a/chrome/browser/shell_integration_linux.cc b/chrome/browser/shell_integration_linux.cc
+index 47a033e..a521610 100644
+--- a/chrome/browser/shell_integration_linux.cc
++++ b/chrome/browser/shell_integration_linux.cc
+@@ -260,6 +260,7 @@ void DeleteShortcutInApplicationsMenu(
+   LaunchXdgUtility(argv, &exit_code);
+ }
+ 
++#if defined(USE_GLIB)
+ // Quote a string such that it appears as one verbatim argument for the Exec
+ // key in a desktop file.
+ std::string QuoteArgForDesktopFileExec(const std::string& arg) {
+@@ -310,6 +311,7 @@ std::string QuoteCommandLineForDesktopFileExec(
+ const char kDesktopEntry[] = "Desktop Entry";
+ 
+ const char kXdgOpenShebang[] = "#!/usr/bin/env xdg-open";
++#endif
+ 
+ const char kXdgSettings[] = "xdg-settings";
+ const char kXdgSettingsDefaultBrowser[] = "default-web-browser";
+diff --git a/ui/views/views.gyp b/ui/views/views.gyp
+index 108d0e6..fa7f2eb 100644
+--- a/ui/views/views.gyp
++++ b/ui/views/views.gyp
+@@ -387,6 +387,8 @@
+       'widget/desktop_aura/desktop_capture_client.cc',
+       'widget/desktop_aura/desktop_capture_client.h',
+       'widget/desktop_aura/desktop_cursor_loader_updater.h',
++      'widget/desktop_aura/desktop_cursor_loader_updater_auralinux.cc',
++      'widget/desktop_aura/desktop_cursor_loader_updater_auralinux.h',
+       'widget/desktop_aura/desktop_dispatcher_client.cc',
+       'widget/desktop_aura/desktop_dispatcher_client.h',
+       'widget/desktop_aura/desktop_drop_target_win.cc',
+@@ -405,8 +407,6 @@
+       'widget/desktop_aura/desktop_screen_position_client.h',
+     ],
+     'views_desktop_aura_x11_sources': [
+-      'widget/desktop_aura/desktop_cursor_loader_updater_auralinux.cc',
+-      'widget/desktop_aura/desktop_cursor_loader_updater_auralinux.h',
+       'widget/desktop_aura/desktop_drag_drop_client_aurax11.cc',
+       'widget/desktop_aura/desktop_drag_drop_client_aurax11.h',
+       'widget/desktop_aura/desktop_window_tree_host_x11.cc',
+-- 
 1.7.9.5