1 files changed, 26 insertions, 9 deletions
diff --git a/patches/0001-Build-files-necessary-for-touch-and-gestures.patch b/patches/0001-Build-files-necessary-for-touch-and-gestures.patch
index 8243b97dc..a7d8541ce 100644
--- a/patches/0001-Build-files-necessary-for-touch-and-gestures.patch
+++ b/patches/0001-Build-files-necessary-for-touch-and-gestures.patch
@@ -7,14 +7,15 @@ Also guard the use of MessagePumpAuraX11 in events_x.cc. We need to
 build it to get symbols depending on base::NativeEvent.
 ---
  content/content_browser.gypi | 2 +-
+ ui/base/x/events_x.cc        | 4 ++++
  ui/ui.gyp                    | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
+ 3 files changed, 7 insertions(+), 3 deletions(-)
 
 diff --git a/content/content_browser.gypi b/content/content_browser.gypi
-index 1e3485c..c2e5f18 100644
+index b3751ac..3597da6 100644
 --- a/content/content_browser.gypi
 +++ b/content/content_browser.gypi
-@@ -1479,7 +1479,7 @@
+@@ -1441,7 +1441,7 @@
          ['exclude', '^browser/geolocation/wifi_data_provider_linux\\.cc$'],
        ],
      }],
@@ -23,11 +24,27 @@ index 1e3485c..c2e5f18 100644
        'sources!': [
          'browser/renderer_host/input/touchscreen_tap_suppression_controller.cc',
          'browser/renderer_host/ui_events_helper.cc',
+diff --git a/ui/base/x/events_x.cc b/ui/base/x/events_x.cc
+index 03d4ae2..5152168 100644
+--- a/ui/base/x/events_x.cc
++++ b/ui/base/x/events_x.cc
+@@ -275,7 +275,11 @@ double GetTouchParamFromXEvent(XEvent* xev,
+ 
+ Atom GetNoopEventAtom() {
+   return XInternAtom(
++#if defined(USE_AURA)
+       base::MessagePumpAuraX11::GetDefaultXDisplay(),
++#else
++      XOpenDisplay(NULL),
++#endif
+       "noop", False);
+ }
+ 
 diff --git a/ui/ui.gyp b/ui/ui.gyp
-index 09c011c..4716f6c 100644
+index e17d242..d4897cc 100644
 --- a/ui/ui.gyp
 +++ b/ui/ui.gyp
-@@ -708,7 +708,7 @@
+@@ -694,7 +694,7 @@
              ['exclude', 'base/dragdrop/drag_utils_aura.cc'],
            ],
          }],
@@ -36,15 +53,15 @@ index 09c011c..4716f6c 100644
            'sources/': [
              ['exclude', '^base/gestures/*'],
            ]
-@@ -886,7 +886,7 @@
+@@ -866,7 +866,7 @@
              'base/cursor/cursor_loader_null.h',
            ],
          }],
 -        ['toolkit_views==0', {
 +        ['use_qt==0 and toolkit_views==0', {
            'sources!': [
-             'base/x/events_x.cc',
-             'events/event.cc',
+             'base/events/event.cc',
+             'base/events/event.h',
 -- 
-1.8.4.2
+1.7.12.4 (Apple Git-37)