summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorPierre Rossi <pierre.rossi@digia.com>2013-06-02 22:39:52 +0200
committerPierre Rossi <pierre.rossi@digia.com>2013-06-03 17:52:23 +0200
commit6933621d6967a516f4800f27a71d45f088af3089 (patch)
treecc346a54582b09bc0dd64013e8d3d553e1f326a0 /patches
parent3513626dbd2f4d3a4bccf801cae5c9f8f005ba13 (diff)
Allow excluding source files from the chromium build
Use a gypi files for that with target defaults with our file exclusion patterns. Another patch bites the dust !
Diffstat (limited to 'patches')
-rw-r--r--patches/0001-Exclude-some-Gtk-files-from-the-chromium-build.patch38
-rwxr-xr-xpatches/patch-chromium.sh1
2 files changed, 0 insertions, 39 deletions
diff --git a/patches/0001-Exclude-some-Gtk-files-from-the-chromium-build.patch b/patches/0001-Exclude-some-Gtk-files-from-the-chromium-build.patch
deleted file mode 100644
index 5edc125a6..000000000
--- a/patches/0001-Exclude-some-Gtk-files-from-the-chromium-build.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From d3fe2537f911599cdddb8ffc31bdcf8e2a0bad9d Mon Sep 17 00:00:00 2001
-From: Zeno Albisser <zeno@webkit.org>
-Date: Tue, 14 May 2013 10:52:58 +0200
-Subject: [PATCH] Exclude some Gtk files from the chromium build.
-
----
- content/content_browser.gypi | 2 --
- content/content_shell.gypi | 1 -
- 2 files changed, 3 deletions(-)
-
-diff --git a/content/content_browser.gypi b/content/content_browser.gypi
-index 4627a4e..49eefe7 100644
---- a/content/content_browser.gypi
-+++ b/content/content_browser.gypi
-@@ -831,8 +831,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',
-diff --git a/content/content_shell.gypi b/content/content_shell.gypi
-index 122e56b..e8271b6 100644
---- a/content/content_shell.gypi
-+++ b/content/content_shell.gypi
-@@ -94,7 +94,6 @@
- 'shell/shell.h',
- 'shell/shell_android.cc',
- 'shell/shell_aura.cc',
-- 'shell/shell_gtk.cc',
- 'shell/shell_mac.mm',
- 'shell/shell_win.cc',
- 'shell/shell_application_mac.h',
---
-1.8.1.2
-
diff --git a/patches/patch-chromium.sh b/patches/patch-chromium.sh
index ce8a6c716..cb74fecc1 100755
--- a/patches/patch-chromium.sh
+++ b/patches/patch-chromium.sh
@@ -21,7 +21,6 @@ fi
echo "Applying patches..."
git am $PATCH_DIR/0001-My-local-fixes.patch
-git am $PATCH_DIR/0001-Exclude-some-Gtk-files-from-the-chromium-build.patch
cd tools/gyp
echo "Entering $PWD"