Fix patches and update build instructions

cztomczak · cztomczak · commit 691a0f6ac2fc · 2018-05-23T11:29:07.000+02:00
diff --git a/docs/Build-instructions.md b/docs/Build-instructions.md
@@ -194,7 +194,7 @@ requirements common for all platforms.
 * Install packages: `sudo apt-get install cmake g++ libgtk2.0-dev libgtkglext1-dev`
 * If building CEF from sources:
     * Official binaries are built on Ubuntu 14.04 (cmake 2.8.12, g++ 4.8.4)
-    * Download [ninja](http://martine.github.io/ninja/) 1.7.1 or later
+    * Download [ninja](https://github.com/ninja-build/ninja/releases) 1.7.1 or later
       and copy it to /usr/bin and chmod 755.
     * Install/upgrade required packages using one of the three methods below
       (these packages should be upgraded each time you update to newer CEF):
@@ -223,7 +223,6 @@ requirements common for all platforms.
 * Download [cmake](https://cmake.org/download/) and add it to PATH.
 
 
-
 ### All platforms
 
 * Install/update dependencies for the tools by executing:
diff --git a/patches/issue231.patch b/patches/issue231.patch
@@ -115,7 +115,7 @@ index 15026ab5..a3d21052 100644
 --- libcef_dll/wrapper/libcef_dll_wrapper.cc
 +++ libcef_dll/wrapper/libcef_dll_wrapper.cc
 @@ -880,6 +880,23 @@ CEF_GLOBAL bool CefGetPath(PathKey key, CefString& path) {
-   return _retval?true:false;
+   return _retval ? true : false;
  }
  
 +CEF_GLOBAL bool CefOverridePath(PathKey key, const CefString& path) {
diff --git a/patches/patch.py b/patches/patch.py
@@ -1,6 +1,6 @@
 # CEF Python patches to Chromium and CEF.
 # See upstream cef/patch/patch.cfg for how patching works in CEF.
-# Current working directory is cef_build_dir/chromium/cef/ .
+# Current working directory is cef_build_dir/chromium/src/ .
 # See also docs/Build-instructions.md and tools/automate.py .
 
 import platform
@@ -12,11 +12,11 @@
 # ALL PLATFORMS
 # noinspection PyUnresolvedReferences
 patches.extend([
-    {
-        # (Disabled) Fixes HTTPS cache problems with private certificates
-        # 'name': 'issue125',
-        # 'path': '../net/http/'
-    },
+    #{
+    #    # (Disabled) Fixes HTTPS cache problems with private certificates
+    #    'name': 'issue125',
+    #    'path': 'net/http/'
+    #},
 ])
 
 # LINUX
@@ -26,6 +26,6 @@
         {
             # Discovery of the "icudtl.dat" file fails on Linux.
             'name': 'issue231',
-            'path': './'
+            'path': 'cef/'
         },
     ])

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ index 15026ab5..a3d21052 100644`
`115`	`115`	`--- libcef_dll/wrapper/libcef_dll_wrapper.cc`
`116`	`116`	`+++ libcef_dll/wrapper/libcef_dll_wrapper.cc`
`117`	`117`	`@@ -880,6 +880,23 @@ CEF_GLOBAL bool CefGetPath(PathKey key, CefString& path) {`
`118`		`- return _retval?true:false;`
	`118`	`+ return _retval ? true : false;`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`+CEF_GLOBAL bool CefOverridePath(PathKey key, const CefString& path) {`