From 1dfea3ac5fe6ae5f186b9d669d6a334efb20694d Mon Sep 17 00:00:00 2001
From: Oliver Hamlet <oliver.hamlet@gmail.com>
Date: Tue, 10 Jan 2017 20:51:34 +0000
Subject: [PATCH] Update to CEF 3.2840.1517.gd7afec5

---
 CMakeLists.txt                    | 10 +++++-----
 scripts/archive.js                |  1 +
 scripts/cmake/configure_cef.cmake |  1 +
 scripts/installer.iss             |  2 ++
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ce9e6964..afb64f21 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -124,13 +124,13 @@ set(YAML_CPP_INCLUDE_DIRS "${SOURCE_DIR}/include")
 set(YAML_CPP_LIBRARIES "${BINARY_DIR}/${CMAKE_CFG_INTDIR}/libyaml-cpp${CMAKE_STATIC_LIBRARY_SUFFIX}")
 
 IF (CMAKE_SYSTEM_NAME MATCHES "Windows")
-    set(CEF_URL "http://opensource.spotify.com/cefbuilds/cef_binary_3.2840.1517.gd7afec5_windows32_minimal.tar.bz2")
-    set(CEF_URL_HASH "7c876b68a5795468012553c1fd1ea773441a7084")
-    set(CEF_PRECOMPILED_BINARIES "libcef.dll" "natives_blob.bin" "snapshot_blob.bin" "d3dcompiler_47.dll" "libEGL.dll" "libGLESv2.dll")
+    set(CEF_URL "http://opensource.spotify.com/cefbuilds/cef_binary_3.2883.1540.gedbfb20_windows32_minimal.tar.bz2")
+    set(CEF_URL_HASH "1101ec1286e726766fad114e87b02beeec8c59ea")
+    set(CEF_PRECOMPILED_BINARIES "libcef.dll" "natives_blob.bin" "snapshot_blob.bin" "d3dcompiler_47.dll" "libEGL.dll" "libGLESv2.dll" "chrome_elf.dll")
     set(CEF_LIB libcef${CMAKE_STATIC_LIBRARY_SUFFIX})
 ELSE ()
-    set(CEF_URL "http://opensource.spotify.com/cefbuilds/cef_binary_3.2840.1517.gd7afec5_linux64_minimal.tar.bz2")
-    set(CEF_URL_HASH "7fab22e1fc4c84833dea823787ad48a273daa1a1")
+    set(CEF_URL "http://opensource.spotify.com/cefbuilds/cef_binary_3.2883.1540.gedbfb20_linux64_minimal.tar.bz2")
+    set(CEF_URL_HASH "e859b34ff3143240690d66f4f0af8d4720a5e6f1")
     set(CEF_PRECOMPILED_BINARIES "libcef.so" "natives_blob.bin" "snapshot_blob.bin" "chrome-sandbox")
     set(CEF_LIB libcef${CMAKE_SHARED_LIBRARY_SUFFIX})
 ENDIF()
diff --git a/scripts/archive.js b/scripts/archive.js
index 4b97d535..7808d6a9 100644
--- a/scripts/archive.js
+++ b/scripts/archive.js
@@ -91,6 +91,7 @@ function createAppArchive(rootPath, releasePath, tempPath, destPath) {
   if (os.platform() === 'win32') {
     binaries = [
       'LOOT.exe',
+      'chrome_elf.dll',
       'd3dcompiler_47.dll',
       'libEGL.dll',
       'libGLESv2.dll',
diff --git a/scripts/cmake/configure_cef.cmake b/scripts/cmake/configure_cef.cmake
index 60eb57ad..339b41ed 100644
--- a/scripts/cmake/configure_cef.cmake
+++ b/scripts/cmake/configure_cef.cmake
@@ -8,6 +8,7 @@ file(READ ${CEF_CMAKELISTS_PATH} CEF_CMAKELISTS)
 
 string(REPLACE "add_subdirectory(cefclient)" "" CEF_CMAKELISTS ${CEF_CMAKELISTS})
 string(REPLACE "add_subdirectory(cefsimple)" "" CEF_CMAKELISTS ${CEF_CMAKELISTS})
+string(REGEX REPLACE "add_subdirectory\\(tests/.+\\)" "" CEF_CMAKELISTS ${CEF_CMAKELISTS})
 
 file(WRITE ${CEF_CMAKELISTS_PATH} ${CEF_CMAKELISTS})
 
diff --git a/scripts/installer.iss b/scripts/installer.iss
index 927c81f9..1cf491c2 100644
--- a/scripts/installer.iss
+++ b/scripts/installer.iss
@@ -89,6 +89,8 @@ Source: "{#buildir}\Release\devtools_resources.pak"; \
 DestDir: "{app}"; Flags: ignoreversion
 Source: "{#buildir}\Release\icudtl.dat"; \
 DestDir: "{app}"; Flags: ignoreversion
+Source: "{#buildir}\Release\chrome_elf.dll"; \
+DestDir: "{app}"; Flags: ignoreversion
 Source: "{#buildir}\Release\libcef.dll"; \
 DestDir: "{app}"; Flags: ignoreversion
 Source: "{#buildir}\Release\libEGL.dll"; \