From 07ff5044e925acacfe146074da10595700f269a8 Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Fri, 6 Apr 2018 11:14:17 +0200
Subject: [PATCH 1/3] qt5: Enable Qt WebEngine

The build failure reported in commit 663c3b36 (qt5: Do not build
QtWebengine as it fails to build) cannot be reproduced anymore, so
build Qt WebEngine again.

RStudio 1.2 was ported from Qt WebKit to Qt WebEngine, so prepare MarIuX
to support that.
---
 qt5.be0 | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/qt5.be0 b/qt5.be0
index 9e5fa7fbd..7b06f5535 100755
--- a/qt5.be0
+++ b/qt5.be0
@@ -1,6 +1,6 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION qt5-5.10.1-0
+# BEE_VERSION qt5-5.10.1-1
 
 SRCURL[0]="https://download.qt.io/archive/qt/${PKGVERSION[2]}/${PKGVERSION}/single/qt-everywhere-src-${PKGVERSION}.tar.xz"
 
@@ -19,8 +19,7 @@ mee_configure() {
         -sysconfdir ${SYSCONFDIR} \
         -nomake examples \
         -opensource \
-        -confirm-license \
-        -skip qtwebengine
+        -confirm-license
 }
 
 mee_build() {

From 8052318179b3cb00370df64a1ec986e67828ccfd Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Fri, 6 Apr 2018 11:19:22 +0200
Subject: [PATCH 2/3] qt5: Do not strip binary files

Keep the debug symbols in the binary files to make debugging easier, and
stack traces more meaningful. The size increase is not so big, so
install it everywhere.
---
 qt5.be0 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qt5.be0 b/qt5.be0
index 7b06f5535..97b7f1f49 100755
--- a/qt5.be0
+++ b/qt5.be0
@@ -19,7 +19,8 @@ mee_configure() {
         -sysconfdir ${SYSCONFDIR} \
         -nomake examples \
         -opensource \
-        -confirm-license
+        -confirm-license \
+        -no-strip
 }
 
 mee_build() {

From d9dbd8847e8b99c7abed1ae6b3e9475b51e22582 Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Mon, 9 Apr 2018 15:46:29 +0200
Subject: [PATCH 3/3] qt5: Build in source directory to get private includes

Building Qt 5 outside the source directory, several variables are not
set, causing the Qt WebKit build to fail [1].

    set(Qt5Gui_PRIVATE_INCLUDE_DIRS "")

[1] https://bugreports.qt.io/browse/QTBUG-37417
---
 qt5.be0 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qt5.be0 b/qt5.be0
index 97b7f1f49..3d3252410 100755
--- a/qt5.be0
+++ b/qt5.be0
@@ -6,7 +6,8 @@ SRCURL[0]="https://download.qt.io/archive/qt/${PKGVERSION[2]}/${PKGVERSION}/sing
 
 PREFIX=/usr/local/qt5
 
-# build_in_sourcedir
+# https://bugreports.qt.io/browse/QTBUG-37417
+build_in_sourcedir
 
 # BEE_MAKEFLAGS=-j1