summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorZeno Albisser <zeno.albisser@digia.com>2013-05-23 11:15:07 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2013-05-31 10:55:47 +0200
commit7b7c87188c0bf871a9f4427217f8e298b163900b (patch)
tree310a83c70960085c089c1c64e47bdbee919b4448 /patches
parentb53b1b1fc31d1e93f7044b189cadcc1b72f53780 (diff)
add patch to remove render_widget_host_view_gtk / web_contents_gtk from build.
Diffstat (limited to 'patches')
-rw-r--r--patches/0001-remove-render_widget_host_view_gtk-and-web_contents_.patch34
-rwxr-xr-xpatches/update-and-patch-chromium.sh1
2 files changed, 35 insertions, 0 deletions
diff --git a/patches/0001-remove-render_widget_host_view_gtk-and-web_contents_.patch b/patches/0001-remove-render_widget_host_view_gtk-and-web_contents_.patch
new file mode 100644
index 000000000..1c8836e54
--- /dev/null
+++ b/patches/0001-remove-render_widget_host_view_gtk-and-web_contents_.patch
@@ -0,0 +1,34 @@
+From 180ed0eb6e8bf0605116596836ab5cd8376387e5 Mon Sep 17 00:00:00 2001
+From: Zeno Albisser <zeno@webkit.org>
+Date: Thu, 23 May 2013 11:12:26 +0200
+Subject: [PATCH] remove render_widget_host_view_gtk and web_contents_view_gtk
+
+---
+ content/content_browser.gypi | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/content/content_browser.gypi b/content/content_browser.gypi
+index 92798b9..9085fc9 100644
+--- a/content/content_browser.gypi
++++ b/content/content_browser.gypi
+@@ -832,8 +832,6 @@
+ 'browser/renderer_host/render_widget_host_view_aura.h',
+ 'browser/renderer_host/render_widget_host_view_base.cc',
+ 'browser/renderer_host/render_widget_host_view_base.h',
+- 'browser/renderer_host/render_widget_host_view_gtk.cc',
+- 'browser/renderer_host/render_widget_host_view_gtk.h',
+ 'browser/renderer_host/render_widget_host_view_guest.cc',
+ 'browser/renderer_host/render_widget_host_view_guest.h',
+ 'browser/renderer_host/render_widget_host_view_mac_editcommand_helper.h',
+@@ -992,8 +990,6 @@
+ 'browser/web_contents/web_contents_view_android.h',
+ 'browser/web_contents/web_contents_view_aura.cc',
+ 'browser/web_contents/web_contents_view_aura.h',
+- 'browser/web_contents/web_contents_view_gtk.cc',
+- 'browser/web_contents/web_contents_view_gtk.h',
+ 'browser/web_contents/web_contents_view_guest.cc',
+ 'browser/web_contents/web_contents_view_guest.h',
+ 'browser/web_contents/web_contents_view_mac.h',
+--
+1.8.1.2
+
diff --git a/patches/update-and-patch-chromium.sh b/patches/update-and-patch-chromium.sh
index 8295d6b62..98c6ac5f3 100755
--- a/patches/update-and-patch-chromium.sh
+++ b/patches/update-and-patch-chromium.sh
@@ -17,6 +17,7 @@ $DEPOT_TOOLS/gclient sync
echo "Applying patches..."
git am $PATCH_DIR/0001-My-local-fixes.patch
git am $PATCH_DIR/0001-Temporary-patch-add-some-Qt-member-functions-to-Rend.patch
+git am $PATCH_DIR/0001-remove-render_widget_host_view_gtk-and-web_contents_.patch
cd tools/gyp
echo "Entering $PWD"