summarylogtreecommitdiffstats
path: root/0008-Link-against-ANGLE-even-if-Qt-is-configured-not-to.patch
diff options
context:
space:
mode:
authorMartchus2016-12-09 08:13:36 +0100
committerMartchus2016-12-09 08:13:36 +0100
commit9a80c510256e336c3fc871a8d3890438356aeb00 (patch)
tree7ca2e4cf03b16f60e30c2ea52cdcb31c373d789f /0008-Link-against-ANGLE-even-if-Qt-is-configured-not-to.patch
parent6b651f77658909ef1f6626413c70d79f5f9538ee (diff)
downloadaur-9a80c510256e336c3fc871a8d3890438356aeb00.tar.gz
Update to 5.7.0
Diffstat (limited to '0008-Link-against-ANGLE-even-if-Qt-is-configured-not-to.patch')
-rw-r--r--0008-Link-against-ANGLE-even-if-Qt-is-configured-not-to.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/0008-Link-against-ANGLE-even-if-Qt-is-configured-not-to.patch b/0008-Link-against-ANGLE-even-if-Qt-is-configured-not-to.patch
new file mode 100644
index 000000000000..49240918681f
--- /dev/null
+++ b/0008-Link-against-ANGLE-even-if-Qt-is-configured-not-to.patch
@@ -0,0 +1,36 @@
+From 4ab08227b87a186d18f9e1806a2405099ac109ed Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Sat, 5 Nov 2016 12:46:27 +0100
+Subject: [PATCH 8/9] Link against ANGLE even if Qt is configured not to
+
+---
+ Source/WebCore/WebCore.pri | 12 ++++--------
+ 1 file changed, 4 insertions(+), 8 deletions(-)
+
+diff --git a/Source/WebCore/WebCore.pri b/Source/WebCore/WebCore.pri
+index ddad897..f69e224 100644
+--- a/Source/WebCore/WebCore.pri
++++ b/Source/WebCore/WebCore.pri
+@@ -215,15 +215,11 @@ enable?(WEB_AUDIO) {
+ use?(3D_GRAPHICS) {
+ win32: {
+ mingw: {
+- # Make sure OpenGL libs are after the webcore lib so MinGW can resolve symbols
+- contains(QT_CONFIG, opengles2) {
+- CONFIG(debug, debug|release):contains(QT_CONFIG, angle) {
+- LIBS += $$QMAKE_LIBS_OPENGL_ES2_DEBUG
+- } else {
+- LIBS += $$QMAKE_LIBS_OPENGL_ES2
+- }
++ # Always link against ANGLE
++ CONFIG(debug, debug|release):contains(QT_CONFIG, angle) {
++ LIBS += $$QMAKE_LIBS_OPENGL_ES2_DEBUG
+ } else {
+- LIBS += $$QMAKE_LIBS_OPENGL
++ LIBS += $$QMAKE_LIBS_OPENGL_ES2
+ }
+ }
+ } else {
+--
+2.10.2
+