[qt5] update qt to 5.15 and make ports depend on qt5-base[core]. (#11596)

* [qt5] update qt to 5.15 and make ports depend on qt5-base[core].

* [qt5] update and remove patches

* [baseline] skip qt5-canvas3d due to deprecation

* [qwt] update to 6.1.4 and fix build issues

* [qt5-webengine] remove old patches

* [qwt] fix static patch

* [qt5-location] add a message that the port has a sprious failure

* [qt5-webengine] fix filename of patch

* [qt5-webengine] add build.patch (ci is probably fast than me in checking for more errors)

* [qt5-winextras] depend on qt5-base[core]

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>

* [qt5-base] update latest feature (latest=core)

* [baseline] remove qt5-webengine for nonstatic windows since CI can handle it now

* [qt5-base] make qt5-base fail to get logs.

* [angle] include missing egl sources.

* [qt5-base] patch egl detection logic.

* [baseline] remove qt-x11extras:x64-linux=fail

* [qt5-base] need to be explicit about xcb to build qt5-x11extras

* [CI] add necessary system libraries to linux CI

* [qt5-base] remove comment to retry on linux

* [qt5-base] add static_init patch for MSVC

* [qt5-base] refined workaround to not regress linux and osx due to

* [paraview] remove unnecessary patches with newer qt versions

* [vcpkg/baseline] add webengine back to skip

* [vtk] fix missing include regression using patch from upstream

* [vtk] fix patch

* [qt5-base] replace with patch from upstream

* [paraview] use hdf5 1.10 api.

* [paraview] bump control

* Add more packages to Linux machines.

* [qt5-base] forgot to add the patch

* Delete 6943.diff

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>

7 files changed, 20 insertions, 37 deletions

diff --git a/ports/qt5-webengine/CONTROL b/ports/qt5-webengine/CONTROL
index d4a334946..8dc1dc5a9 100644
--- a/ports/qt5-webengine/CONTROL
+++ b/ports/qt5-webengine/CONTROL
@@ -1,5 +1,5 @@
 Source: qt5-webengine

-Version: 5.12.8

+Version: 5.15.0

 Description: Qt5 webengine Module; 

-Build-Depends:  qt5-base, qt5-declarative, qt5-location, qt5-quickcontrols, qt5-quickcontrols2, qt5-tools, qt5-webchannel, atlmfc (windows), ffmpeg[core] (!windows)

+Build-Depends:  qt5-base[core], qt5-declarative, qt5-location, qt5-quickcontrols, qt5-quickcontrols2, qt5-tools, qt5-webchannel, atlmfc (windows), ffmpeg[core] (!windows)

 Supports: !static

diff --git a/ports/qt5-webengine/build.patch b/ports/qt5-webengine/build.patch
new file mode 100644
index 000000000..ec13b2d14
--- /dev/null
+++ b/ports/qt5-webengine/build.patch
@@ -0,0 +1,12 @@
+diff --git a/src/3rdparty/chromium/net/cert/x509_certificate_net_log_param.h b/src/3rdparty/chromium/net/cert/x509_certificate_net_log_param.h
+index 22dd9cc14..910149936 100644
+--- a/src/3rdparty/chromium/net/cert/x509_certificate_net_log_param.h	
++++ b/src/3rdparty/chromium/net/cert/x509_certificate_net_log_param.h
+@@ -6,6 +6,7 @@
+ #define NET_CERT_X509_CERTIFICATE_NET_LOG_PARAM_H_
+ 
+ #include <memory>
++#include <string>
+ 
+ #include "net/base/net_export.h"
+ 
diff --git a/ports/qt5-webengine/common.pri.latest.patch b/ports/qt5-webengine/common.pri.latest.patch
deleted file mode 100644
index ad58ab9e1..000000000
--- a/ports/qt5-webengine/common.pri.latest.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/buildtools/config/common.pri b/src/buildtools/config/common.pri
-#latest diff --git a/src/buildtools/config/common.pri b/src/buildtools/config/common.pri
-index 97d39535c..dc09da43a 100644
---- a/src/buildtools/config/common.pri	
-+++ b/src/buildtools/config/common.pri
-@@ -57,5 +57,5 @@
- precompile_header {
--    gn_args += enable_precompiled_headers=true
-+    gn_args += enable_precompiled_headers=false
- } else {
-     gn_args += enable_precompiled_headers=false
- }
diff --git a/ports/qt5-webengine/common.pri.patch b/ports/qt5-webengine/common.pri.patch
index 0af081035..ad58ab9e1 100644
--- a/ports/qt5-webengine/common.pri.patch
+++ b/ports/qt5-webengine/common.pri.patch
@@ -1,8 +1,8 @@
-diff --git a/src/core/config/common.pri b/src/core/config/common.pri
+diff --git a/src/buildtools/config/common.pri b/src/buildtools/config/common.pri
 #latest diff --git a/src/buildtools/config/common.pri b/src/buildtools/config/common.pri
 index 97d39535c..dc09da43a 100644
---- a/src/core/config/common.pri	
-+++ b/src/core/config/common.pri
+--- a/src/buildtools/config/common.pri	
++++ b/src/buildtools/config/common.pri
 @@ -57,5 +57,5 @@
  precompile_header {
 -    gn_args += enable_precompiled_headers=true
diff --git a/ports/qt5-webengine/gl.latest.patch b/ports/qt5-webengine/gl.latest.patch
deleted file mode 100644
index a48ddf6c3..000000000
--- a/ports/qt5-webengine/gl.latest.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/3rdparty/chromium/ui/gl/gl_bindings_autogen_gl.h b/src/3rdparty/chromium/ui/gl/gl_bindings_autogen_gl.h
-index d54583e8b..1921185f8 100644
---- a/src/3rdparty/chromium/ui/gl/gl_bindings_autogen_gl.h	
-+++ b/src/3rdparty/chromium/ui/gl/gl_bindings_autogen_gl.h
-@@ -16,7 +16,7 @@
- namespace gl {
- 
- class GLContext;
--
-+typedef void *GLeglImageOES;
- typedef void(GL_BINDING_CALL* glActiveShaderProgramProc)(GLuint pipeline,
-                                                          GLuint program);
- typedef void(GL_BINDING_CALL* glActiveTextureProc)(GLenum texture);
diff --git a/ports/qt5-webengine/gl.patch b/ports/qt5-webengine/gl.patch
index e581113e0..a48ddf6c3 100644
--- a/ports/qt5-webengine/gl.patch
+++ b/ports/qt5-webengine/gl.patch
@@ -8,6 +8,6 @@ index d54583e8b..1921185f8 100644
  class GLContext;
 -
 +typedef void *GLeglImageOES;
+ typedef void(GL_BINDING_CALL* glActiveShaderProgramProc)(GLuint pipeline,
+                                                          GLuint program);
  typedef void(GL_BINDING_CALL* glActiveTextureProc)(GLenum texture);
- typedef void(GL_BINDING_CALL* glApplyFramebufferAttachmentCMAAINTELProc)(void);
- typedef void(GL_BINDING_CALL* glAttachShaderProc)(GLuint program,
diff --git a/ports/qt5-webengine/portfile.cmake b/ports/qt5-webengine/portfile.cmake
index 27e4f8e2d..9da6797ca 100644
--- a/ports/qt5-webengine/portfile.cmake
+++ b/ports/qt5-webengine/portfile.cmake
@@ -38,11 +38,7 @@ vcpkg_add_to_path(PREPEND "${PYTHON2_DIR}")
 vcpkg_add_to_path(PREPEND "${GPERF_DIR}")
 vcpkg_add_to_path(PREPEND "${NINJA_DIR}")
 
-if(QT_MAJOR_MINOR_VER STREQUAL "5.14")
-    set(PATCHES common.pri.latest.patch gl.latest.patch)
-else()
-    set(PATCHES common.pri.patch gl.patch)
-endif()
+set(PATCHES common.pri.patch gl.patch build.patch)
 
 if(NOT VCPKG_TARGET_IS_WINDOWS)
     list(APPEND CORE_OPTIONS "BUILD_OPTIONS" "-webengine-system-libwebp" "-webengine-system-ffmpeg" "-webengine-system-icu")