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

1 files changed, 0 insertions, 77 deletions

diff --git a/ports/paraview/qt_static_plugins.patch b/ports/paraview/qt_static_plugins.patch
deleted file mode 100644
index e95685e60..000000000
--- a/ports/paraview/qt_static_plugins.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff --git a/CMake/ParaViewClient.cmake b/CMake/ParaViewClient.cmake
-index 31beb7e20..d4bb36844 100644
---- a/CMake/ParaViewClient.cmake
-+++ b/CMake/ParaViewClient.cmake
-@@ -263,7 +263,11 @@ IDI_ICON1 ICON \"${_paraview_client_APPLICATION_ICON}\"\n")
-   endif ()

- 

-   include("${_ParaViewClient_cmake_dir}/paraview-find-package-helpers.cmake" OPTIONAL)

--  find_package(Qt5 REQUIRED QUIET COMPONENTS Core Widgets)

-+  find_package(Qt5 REQUIRED QUIET COMPONENTS Core Widgets Svg Network Sql DBus OpenGL OpenGLExtensions)
-+  if(UNIX AND NOT APPLE)
-+    find_package(Qt5 REQUIRED QUIET COMPONENTS X11Extras)
-+    list(APPEND qt_additional_libs Qt5::X11Extras)
-+  endif()

- 

-   # CMake 3.13 started using Qt5's version variables to detect what version

-   # of Qt's tools to run for autorcc. However, they are looked up using the

-@@ -322,11 +322,36 @@ IDI_ICON1 ICON \"${_paraview_client_APPLICATION_ICON}\"\n")
-       FILES

-         ${_paraview_client_resource_files})

-   endif ()

-+  

-+  if(NOT PARAVIEW_BUILD_SHARED_LIBS) # Should be a check if Qt is built statically and not ParaView

-+    list(APPEND qt_components Svg Widgets Gui OpenGL OpenGLExtensions) # added due to svg rescources, sql due to VTK::GUISupportQtSQL 

-+    set(qt_plugin_list)

-+    foreach(qt_component ${qt_components})
-+        message(STATUS "Qt5${qt_component}_PLUGINS: ${Qt5${qt_component}_PLUGINS}")

-+        list(APPEND qt_plugin_list ${Qt5${qt_component}_PLUGINS})

-+        message(STATUS "QtPlugin List: ${qt_plugin_list}")

-+    endforeach()

-+    set(qt_plugin_source "${CMAKE_CURRENT_BINARY_DIR}/qt_static_plugins.cxx")

-+    if(EXISTS "${qt_plugin_source}")

-+        file(REMOVE "${qt_plugin_source}")

-+    endif()

-+    set(qt_source_text "#include <QtPlugin>\n")

-+    string(APPEND qt_source_text "#ifdef QT_STATIC\n")

-+    foreach(qt_plugin ${qt_plugin_list})

-+        STRING(REGEX REPLACE "[^:]+::" "" qt_plugin_name "${qt_plugin}")

-+        message(STATUS "RAW PLUGIN NAME: ${qt_plugin_name}")

-+        string(APPEND qt_source_text "  Q_IMPORT_PLUGIN(${qt_plugin_name})\n")

-+    endforeach()

-+    string(APPEND qt_source_text "#endif\n")

-+    file(WRITE "${qt_plugin_source}" "${qt_source_text}")

-+  endif()

-+  

-   add_executable("${_paraview_client_NAME}" ${_paraview_client_executable_flags}

-     ${_paraview_client_SOURCES}

-     ${_paraview_client_resource_files}

-     ${_paraview_client_source_files}

--    ${_paraview_client_extra_sources})

-+    ${_paraview_client_extra_sources}

-+    ${qt_plugin_source})

-   if (DEFINED _paraview_client_NAMESPACE)

-     add_executable("${_paraview_client_NAMESPACE}::${_paraview_client_NAME}" ALIAS "${_paraview_client_NAME}")

-   endif ()

-@@ -338,9 +362,20 @@ IDI_ICON1 ICON \"${_paraview_client_APPLICATION_ICON}\"\n")
-       "$<TARGET_PROPERTY:VTK::vtksys,INTERFACE_INCLUDE_DIRECTORIES>")
-   target_link_libraries("${_paraview_client_NAME}"
-     PRIVATE

-+      ${qt_plugin_list}
-+      Qt5::Svg  ## added
-+      Qt5::Sql ## added
-+      Qt5::Network ## added
-+      Qt5::Gui ## added
-+      Qt5::OpenGL
-+      Qt5::OpenGLExtensions
-+      Qt5::DBus ##added
-+      ${qt_additional_libs}
-+      Qt5::Core # needed in VCPKG due to the extra Wrapper 

-       ParaView::pqApplicationComponents
-       Qt5::Widgets
--      VTK::vtksys)

-+      VTK::vtksys

-+      )

- 
-   set(_paraview_client_export)
-   if (DEFINED _paraview_client_EXPORT)