00012bf9d5
The build was broken in 5.6.2 and was disabled. It compiles fine since 5.6.3. The two additional patches are useful at run-time. The first one avoid the need to specify the path to the SSL certificate directory (using an additional environment variable). The second one is the same used in 5.9.x (plus resolved conflicts). It uses the process's context to get handles on EGL and GLESv2 libraries. Those libraries are linked to Qt WebEngine at compile time. The patch is particularly usefull for RPI boards since the raspberrypi userland package does not provide the libEGLv2.so.2 and libGLES.so.1 symlinks. Both library paths are hardcoded in Qt WebEngine. Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
From fc41c0f572ff347142cca4bf5d82b87782bb5906 Mon Sep 17 00:00:00 2001
|
|
From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@savoirfairelinux.com>
|
|
Date: Thu, 23 Nov 2017 16:18:06 -0500
|
|
Subject: [PATCH] Change default SSL directory
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=utf-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Change the default SSL directory, as buildroot ca-cert package is
|
|
installed at /etc/ssl. That way, we don't have to use the SSL_CERT_DIR
|
|
environment at runtime.
|
|
|
|
Upstream-Status: Inappropriate
|
|
Signed-off-by: Damien Riegel <damien.riegel@savoirfairelinux.com>
|
|
Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>
|
|
---
|
|
src/core/qtwebengine_extras.gypi | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/core/qtwebengine_extras.gypi b/src/core/qtwebengine_extras.gypi
|
|
index 229421ef..3b2386c0 100644
|
|
--- a/src/core/qtwebengine_extras.gypi
|
|
+++ b/src/core/qtwebengine_extras.gypi
|
|
@@ -96,7 +96,7 @@
|
|
'GL_GLEXT_PROTOTYPES',
|
|
'EGL_EGLEXT_PROTOTYPES',
|
|
# At runtime the env variable SSL_CERT_DIR can be used to override this
|
|
- 'OPENSSLDIR="/usr/lib/ssl"',
|
|
+ 'OPENSSLDIR="/etc/ssl"',
|
|
'OPENSSL_LOAD_CONF',
|
|
'EGL_API_FB=1',
|
|
'LINUX=1',
|
|
--
|
|
2.15.0
|
|
|