From 23ea91976fcfab03f2aacbb6b8c41c2ea56c7b93 Mon Sep 17 00:00:00 2001
From: Colin Edwards <colin@recursivepenguin.com>
Date: Fri, 18 Aug 2017 15:52:04 -0500
Subject: [PATCH] Build with CEF 3112 on OSX

---
 .travis.yml                    | 2 +-
 CI/install-dependencies-osx.sh | 2 ++
 plugins/obs-browser            | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a61ade1b5..eed4dc229 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@ matrix:
     - os: osx
       env:
        - CMAKE_PREFIX_PATH=/usr/local/opt/qt5/lib/cmake
-       - CEF_BUILD_VERSION=3.2987.1588.g1952835
+       - CEF_BUILD_VERSION=3.3112.1656.g9ec3e42
       before_install: "./CI/install-dependencies-osx.sh"
       before_script: "./CI/before-script-osx.sh"
       before_deploy: "./CI/before-deploy-osx.sh"
diff --git a/CI/install-dependencies-osx.sh b/CI/install-dependencies-osx.sh
index 7e7ce68c2..a9720a76f 100755
--- a/CI/install-dependencies-osx.sh
+++ b/CI/install-dependencies-osx.sh
@@ -40,6 +40,8 @@ sudo cp -R ./sparkle/Sparkle.framework /Library/Frameworks/Sparkle.framework
 wget --retry-connrefused --waitretry=1 https://obs-nightly.s3-us-west-2.amazonaws.com/cef_binary_${CEF_BUILD_VERSION}_macosx64.tar.bz2
 tar -xf ./cef_binary_${CEF_BUILD_VERSION}_macosx64.tar.bz2
 cd ./cef_binary_${CEF_BUILD_VERSION}_macosx64
+# remove a broken test
+sed -i '.orig' '/add_subdirectory(tests\/ceftests)/d' ./CMakeLists.txt
 mkdir build
 cd ./build
 cmake -DCMAKE_CXX_FLAGS="-std=c++11 -stdlib=libc++" -DCMAKE_EXE_LINKER_FLAGS="-std=c++11 -stdlib=libc++" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 ..
diff --git a/plugins/obs-browser b/plugins/obs-browser
index 0e4c9e824..04bcdfeb4 160000
--- a/plugins/obs-browser
+++ b/plugins/obs-browser
@@ -1 +1 @@
-Subproject commit 0e4c9e824bdbe4c5f9b684968eb85963e19a52a3
+Subproject commit 04bcdfeb400a789dca59863f009e68a6375ab3b0