summaryrefslogtreecommitdiffstats
path: root/patches/patch-chromium.sh
diff options
context:
space:
mode:
authorZeno Albisser <zeno.albisser@digia.com>2013-10-16 10:20:27 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-18 14:48:49 +0200
commitac95a438620f3ec7c72ae60396ee26b3778d38b2 (patch)
treef5d46ea605ebf53b2ccf1598d59c3e4dd9a65316 /patches/patch-chromium.sh
parent7642fabf5f62fbc583dc6bd9f349dbe1e45e805a (diff)
Add patch: Do not forward declare WebRtcVoiceChannelInfo.
This seems to be necessary to compile for OSX 10.7, and this is the OSX version we currently use in the CI system. Change-Id: I2363b48b66cd7fda603ff9783934ca44c1656723 Reviewed-by: Andras Becsi <andras.becsi@digia.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'patches/patch-chromium.sh')
-rwxr-xr-xpatches/patch-chromium.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/patches/patch-chromium.sh b/patches/patch-chromium.sh
index c917f87f5..0e709c82f 100755
--- a/patches/patch-chromium.sh
+++ b/patches/patch-chromium.sh
@@ -73,6 +73,11 @@ echo "Entering $PWD"
git am $PATCH_DIR/0001-Remove-leftovers-from-WebKitSystemInterface.patch
git am $PATCH_DIR/0001-Do-not-include-Assertions.h-within-namespace-WebKit.patch
+cd $CHROMIUM_SRC_DIR/third_party/libjingle/source/talk
+echo "Entering $PWD"
+
+git am 0001-Do-not-forward-declare-WebRtcVoiceChannelInfo.patch
+
cd $CHROMIUM_SRC_DIR/tools/gyp
echo "Entering $PWD"