From f3166e12bfdd6356a15ceb57be8c89a9e09ab0bb Mon Sep 17 00:00:00 2001
From: Santosh Mahto <santosh.mahto@collabora.co.uk>
Date: Wed, 24 Jan 2018 20:35:45 +0530
Subject: [PATCH] CEF rebased with buildfix for yocto integration
---
BUILD.gn | 1 +
libcef/browser/osr/render_widget_host_view_osr_linux.cc | 2 ++
patch/patch.cfg | 7 -------
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/BUILD.gn b/BUILD.gn
index 86dae5557..dbbddf38c 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1204,6 +1204,7 @@ grit("cef_resources") {
"grit/cef_resources.h",
"cef_resources.pak",
]
+ deps = [ ":catalog" ]
}
# Generate cef.pak.
diff --git a/libcef/browser/osr/render_widget_host_view_osr_linux.cc b/libcef/browser/osr/render_widget_host_view_osr_linux.cc
index 732eb6e04..5c3f1dc5e 100644
--- a/libcef/browser/osr/render_widget_host_view_osr_linux.cc
+++ b/libcef/browser/osr/render_widget_host_view_osr_linux.cc
@@ -5,8 +5,10 @@
#include "libcef/browser/osr/render_widget_host_view_osr.h"
+#if 0
#include <X11/Xlib.h>
#include <X11/cursorfont.h>
+#endif
#undef Status // Avoid conflicts with url_request_status.h
#include "libcef/browser/native/window_x11.h"
diff --git a/patch/patch.cfg b/patch/patch.cfg
index 475f1bf79..391dd5916 100644
--- a/patch/patch.cfg
+++ b/patch/patch.cfg
@@ -22,11 +22,4 @@ patches = [
'name': 'angle_697758',
'path': 'third_party/angle/',
},
- {
- # Fix crash while printing on Windows by properly initializing V8 in the PDF
- # module.
- # https://bugs.chromium.org/p/chromium/issues/detail?id=549365#c17
- 'name': 'pdfium_print_549365',
- 'path': 'third_party/pdfium/',
- },
]
--
GitLab