aboutsummaryrefslogtreecommitdiff
path: root/ports/paraview/qt_plugin.patch
diff options
context:
space:
mode:
authorAlexander Neumann <30894796+Neumann-A@users.noreply.github.com>2020-07-09 00:34:35 +0200
committerGitHub <noreply@github.com>2020-07-08 15:34:35 -0700
commit3bffe1c0493c1220d3db2803a53c79add20d63d2 (patch)
tree9f4b7fe02f0bc01f529ba2a626318373f1839cc9 /ports/paraview/qt_plugin.patch
parent6d4606fb795667ef58da5367dee867d6a350fff5 (diff)
downloadvcpkg-3bffe1c0493c1220d3db2803a53c79add20d63d2.tar.gz
vcpkg-3bffe1c0493c1220d3db2803a53c79add20d63d2.zip
[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>
Diffstat (limited to 'ports/paraview/qt_plugin.patch')
-rw-r--r--ports/paraview/qt_plugin.patch50
1 files changed, 0 insertions, 50 deletions
diff --git a/ports/paraview/qt_plugin.patch b/ports/paraview/qt_plugin.patch
deleted file mode 100644
index 2f4763c49..000000000
--- a/ports/paraview/qt_plugin.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/Qt/Widgets/CMakeLists.txt b/Qt/Widgets/CMakeLists.txt
-index 93000c493..5f2a06752 100644
---- a/Qt/Widgets/CMakeLists.txt
-+++ b/Qt/Widgets/CMakeLists.txt
-@@ -139,17 +139,43 @@ set(CMAKE_AUTORCC 1)
- set(CMAKE_AUTOUIC 1)
- set(CMAKE_AUTOUIC_SEARCH_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/Resources/UI")
-
-+##
-+if(NOT PARAVIEW_BUILD_SHARED_LIBS) # Should be a check if Qt is built statically and not ParaView
-+ list(APPEND qt_components Svg Sql) # added due to svg rescources, sql due to VTK::GUISupportQtSQL
-+ set(qt_plugin_list)
-+ foreach(qt_component ${qt_components})
-+ 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")
-+ set(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()
-+##
-+
- vtk_module_add_module(ParaView::pqWidgets
- CLASSES ${classes}
- SOURCES ${ui_files}
-- ${resource_files})
-+ ${resource_files}
-+ ${qt_plugin_source})
- vtk_module_link(ParaView::pqWidgets
- PUBLIC
- Qt5::Core
- Qt5::Gui
- Qt5::Widgets
- PRIVATE
-- Qt5::Network)
-+ Qt5::Network
-+ ${qt_plugin_list})
-
- if (APPLE)
- vtk_module_link(ParaView::pqWidgets