From 363ce7231af21f14017c4c59da9aa90249f36f4e Mon Sep 17 00:00:00 2001
From: Zeno Albisser <zeno.albisser@digia.com>
Date: Thu, 25 Sep 2014 08:16:00 -0700
Subject: [PATCH] Update build configuration for eLinux after update to
Chromium 37.
The build configuration requires the following changes:
- toolkit_views=1: for native_theme_aura, as otherwise
nine_image_painter_factory.cc would be excluded.
- use_system_harfbuzz=0: we do not want to rely on this
being provided on the system, therefore being explicit.
- want_separate_host_toolset=1: assures that icuuc gyp
target will be available.
The file gl_surface_ozone.cc must be added to the exclusion
list to avoid duplicate symbols with gl_surface_at.cpp.
The defines EGL_API_FB and LINUX must be set to 1,
to explicitly define that we are using EGL and are building
for a linux target.
Change-Id: If6722ecbfd0655fe7852d52a606f27c18304f717
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
---
src/3rdparty | 2 +-
src/core/config/embedded_linux.pri | 4 +++-
src/core/qtwebengine_extras.gypi | 3 +++
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/3rdparty b/src/3rdparty
index cae02d31f..2c3ccc799 160000
--- a/src/3rdparty
+++ b/src/3rdparty
@@ -1 +1 @@
-Subproject commit cae02d31f1b15b139af822aa7559c5157780dbbe
+Subproject commit 2c3ccc7994980d954ec0188ea3fa3d27424ef32e
diff --git a/src/core/config/embedded_linux.pri b/src/core/config/embedded_linux.pri
index 88af144ba..dc6a5f612 100644
--- a/src/core/config/embedded_linux.pri
+++ b/src/core/config/embedded_linux.pri
@@ -29,6 +29,7 @@ GYP_CONFIG += \
p2p_apis=0 \
safe_browsing=0 \
toolkit_uses_gtk=0 \
+ toolkit_views=1 \
use_ash=0 \
use_aura=1 \
use_cairo=0 \
@@ -43,8 +44,9 @@ GYP_CONFIG += \
use_ozone=1 \
use_pango=0 \
use_pulseaudio=0 \
+ use_system_harfbuzz=0 \
use_system_icu=1 \
use_x11=0 \
v8_use_snapshot=false \
- want_separate_host_toolset=0 \
+ want_separate_host_toolset=1 \
diff --git a/src/core/qtwebengine_extras.gypi b/src/core/qtwebengine_extras.gypi
index 916dd4195..f30c16401 100644
--- a/src/core/qtwebengine_extras.gypi
+++ b/src/core/qtwebengine_extras.gypi
@@ -50,6 +50,7 @@
['exclude', 'gl_surface_glx\\.cc$'],
['exclude', 'gl_surface_x11\\.cc$'],
['exclude', 'gl_surface_win\\.cc$'],
+ ['exclude', 'gl_surface_ozone\\.cc$'],
# Avoid the ATL dependency to allow building with VS Express
['exclude', 'browser/accessibility/accessibility_tree_formatter\\.(cc|h)$',],
['exclude', 'browser/accessibility/accessibility_tree_formatter_android\\.(cc|h)$',],
@@ -78,6 +79,8 @@
# At runtime the env variable SSL_CERT_DIR can be used to override this
'OPENSSLDIR="/usr/lib/ssl"',
'OPENSSL_LOAD_CONF',
+ 'EGL_API_FB=1',
+ 'LINUX=1',
],
'defines!': [
'OPENSSLDIR="/etc/ssl"',
--
GitLab