[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>

4 files changed, 144 insertions, 8 deletions

diff --git a/ports/qwt/CONTROL b/ports/qwt/CONTROL
index 54c1c88bb..4a2407b34 100644
--- a/ports/qwt/CONTROL
+++ b/ports/qwt/CONTROL
@@ -1,5 +1,5 @@
 Source: qwt
-Version: 6.1.3-12
+Version: 6.1.4
 Homepage: https://sourceforge.net/projects/qwt
 Description: Qt widgets library for technical applications
-Build-Depends: qt5-base, qt5-svg, qt5-tools
+Build-Depends: qt5-base[core], qt5-svg, qt5-tools
diff --git a/ports/qwt/build.patch b/ports/qwt/build.patch
new file mode 100644
index 000000000..8b36bb833
--- /dev/null
+++ b/ports/qwt/build.patch
@@ -0,0 +1,135 @@
+diff --git a/src/qwt_compass_rose.cpp b/src/qwt_compass_rose.cpp
+index 8acb045c2..b7b676712 100644
+--- a/src/qwt_compass_rose.cpp	
++++ b/src/qwt_compass_rose.cpp
+@@ -11,6 +11,7 @@
+ #include "qwt_point_polar.h"

+ #include "qwt_painter.h"

+ #include <qpainter.h>

++#include <QPainterPath>

+ 

+ static QPointF qwtIntersection(

+     QPointF p11, QPointF p12, QPointF p21, QPointF p22 )

+diff --git a/src/qwt_dial_needle.cpp b/src/qwt_dial_needle.cpp
+index 3589b011d..4f20aada1 100644
+--- a/src/qwt_dial_needle.cpp	
++++ b/src/qwt_dial_needle.cpp
+@@ -13,6 +13,7 @@
+ #include "qwt_painter.h"

+ #include <qapplication.h>

+ #include <qpainter.h>

++#include <QPainterPath>

+ 

+ #if QT_VERSION < 0x040601

+ #define qFastSin(x) qSin(x)

+diff --git a/src/qwt_null_paintdevice.cpp b/src/qwt_null_paintdevice.cpp
+index 21b97b0ad..545804b06 100644
+--- a/src/qwt_null_paintdevice.cpp	
++++ b/src/qwt_null_paintdevice.cpp
+@@ -10,6 +10,7 @@
+ #include "qwt_null_paintdevice.h"

+ #include <qpaintengine.h>

+ #include <qpixmap.h>

++#include <QPainterPath>

+ 

+ class QwtNullPaintDevice::PrivateData

+ {

+diff --git a/src/qwt_painter.cpp b/src/qwt_painter.cpp
+index 069e2ae42..824ddfc20 100644
+--- a/src/qwt_painter.cpp	
++++ b/src/qwt_painter.cpp
+@@ -27,6 +27,7 @@
+ #include <qpaintengine.h>

+ #include <qapplication.h>

+ #include <qdesktopwidget.h>

++#include <QPainterPath>

+ 

+ #if QT_VERSION >= 0x050000

+ #include <qwindow.h>

+diff --git a/src/qwt_painter_command.h b/src/qwt_painter_command.h
+index 032d0348b..13db43559 100644
+--- a/src/qwt_painter_command.h	
++++ b/src/qwt_painter_command.h
+@@ -15,8 +15,7 @@
+ #include <qpixmap.h>

+ #include <qimage.h>

+ #include <qpolygon.h>

+-

+-class QPainterPath;

++#include <QPainterPath>

+ 

+ /*!

+   QwtPainterCommand represents the attributes of a paint operation

+diff --git a/src/qwt_plot_glcanvas.cpp b/src/qwt_plot_glcanvas.cpp
+index 64b39b90e..414cb22c5 100644
+--- a/src/qwt_plot_glcanvas.cpp	
++++ b/src/qwt_plot_glcanvas.cpp
+@@ -15,6 +15,7 @@
+ #include <qdrawutil.h>

+ #include <qstyle.h>

+ #include <qstyleoption.h>

++#include <QPainterPath>

+ 

+ #define FIX_GL_TRANSLATION 0

+ 

+diff --git a/src/qwt_plot_glcanvas.h b/src/qwt_plot_glcanvas.h
+index 82770747f..be93232c4 100644
+--- a/src/qwt_plot_glcanvas.h	
++++ b/src/qwt_plot_glcanvas.h
+@@ -13,6 +13,7 @@
+ #include "qwt_global.h"

+ #include <qframe.h>

+ #include <qgl.h>

++#include <QPainterPath>

+ 

+ class QwtPlot;

+ 

+diff --git a/src/qwt_plot_panner.cpp b/src/qwt_plot_panner.cpp
+index bed4566dd..852998f01 100644
+--- a/src/qwt_plot_panner.cpp	
++++ b/src/qwt_plot_panner.cpp
+@@ -14,6 +14,7 @@
+ #include <qbitmap.h>

+ #include <qstyle.h>

+ #include <qstyleoption.h>

++#include <QPainterPath>

+ 

+ #if QT_VERSION >= 0x050000

+ #if QT_VERSION < 0x050100

+diff --git a/src/qwt_plot_renderer.cpp b/src/qwt_plot_renderer.cpp
+index b6c83447e..a309fe290 100644
+--- a/src/qwt_plot_renderer.cpp	
++++ b/src/qwt_plot_renderer.cpp
+@@ -26,6 +26,7 @@
+ #include <qfileinfo.h>

+ #include <qimagewriter.h>

+ #include <qvariant.h>

++#include <QPainterPath>

+ 

+ #ifndef QWT_NO_SVG

+ #ifdef QT_SVG_LIB

+diff --git a/src/qwt_widget_overlay.cpp b/src/qwt_widget_overlay.cpp
+index 79c46ce10..f64042ac8 100644
+--- a/src/qwt_widget_overlay.cpp	
++++ b/src/qwt_widget_overlay.cpp
+@@ -13,6 +13,7 @@
+ #include <qpaintengine.h>

+ #include <qimage.h>

+ #include <qevent.h>

++#include <QPainterPath>

+ 

+ static QImage::Format qwtMaskImageFormat()

+ {

+diff --git a/src/src.pri b/src/src.pri
+index 571870361..412636d5b 100644
+--- a/src/src.pri	
++++ b/src/src.pri
+@@ -7,7 +7,7 @@
+ # modify it under the terms of the Qwt License, Version 1.0

+ ################################################################

+ 

+-

++QT += gui

+ HEADERS += \

+     qwt.h \

+     qwt_abstract_scale_draw.h \

diff --git a/ports/qwt/fix-dynamic-static.patch b/ports/qwt/fix-dynamic-static.patch
index b608681f2..918934670 100644
--- a/ports/qwt/fix-dynamic-static.patch
+++ b/ports/qwt/fix-dynamic-static.patch
@@ -12,4 +12,4 @@ index 1fe6055..441c69b 100644
 +}
  
  ######################################################################
- # QwtPlot enables all classes, that are needed to use the QwtPlot 
+ # QwtPlot enables all classes, that are needed to use the QwtPlot
diff --git a/ports/qwt/portfile.cmake b/ports/qwt/portfile.cmake
index bd9c4e502..bbf03abc1 100644
--- a/ports/qwt/portfile.cmake
+++ b/ports/qwt/portfile.cmake
@@ -1,10 +1,11 @@
 vcpkg_from_sourceforge(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO qwt/qwt
-    REF 6.1.3
-    FILENAME "qwt-6.1.3.zip"
-    SHA512 8f249e23d50f71d14fca37776ea40d8d6931db14d9602e03a343bfb7a9bf55502202103135b77f583c3890a7924220e8a142a01c448dbde311860d89a3b10fc8
+    REF 6.1.4
+    FILENAME "qwt-6.1.4.zip"
+    SHA512 711256ec4d1d54d201650e9c63b584b17a61dbedde5a581e0b6227fdbee149cdbe2a889aa58f67777125b6471fc1fe248992ec845eb6481a2dfc2c4276701d7f
     PATCHES fix-dynamic-static.patch
+            build.patch
 )
 
 vcpkg_configure_qmake(
@@ -27,7 +28,7 @@ endif()
 
 #Install the header files
 file(GLOB HEADER_FILES ${SOURCE_PATH}/src/*.h)
-file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/qwt)
+file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT})
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file