microsoft · ras0219-msft · Jul 8, 2020 · May 26, 2020 · May 26, 2020 · May 26, 2020
diff --git a/ports/cgal/CONTROL b/ports/cgal/CONTROL
@@ -1,9 +1,9 @@
 Source: cgal
-Version: 5.0.2-1
+Version: 5.0.2-2
 Build-Depends: mpfr, mpir, zlib, boost-format, boost-container, boost-ptr-container, boost-iterator, boost-variant, boost-any, boost-unordered, boost-random, boost-foreach, boost-graph, boost-heap, boost-logic, boost-multiprecision, boost-interval
 Homepage: https://github.com/CGAL/cgal
 Description: The Computational Geometry Algorithms Library (CGAL) is a C++ library that aims to provide easy access to efficient and reliable algorithms in computational geometry.
 
 Feature: qt
-Build-Depends: qt5-base, qt5-3d, qt5-svg, qt5-xmlpatterns, qt5-script, eigen3
+Build-Depends: qt5-base[core], qt5-3d, qt5-svg, qt5-xmlpatterns, qt5-script, eigen3
 Description: Qt GUI support for CGAL
diff --git a/ports/cutelyst2/CONTROL b/ports/cutelyst2/CONTROL
@@ -1,4 +1,4 @@
 Source: cutelyst2
-Version: 2.9.0
+Version: 2.9.0-1
 Description: A C++ Web Framework built on top of Qt, using the simple approach of Catalyst (Perl) framework
-Build-Depends: qt5-base
+Build-Depends: qt5-base[core]
diff --git a/ports/kd-soap/CONTROL b/ports/kd-soap/CONTROL
@@ -1,5 +1,5 @@
 Source: kd-soap
-Version: 1.8.0-1
+Version: 1.8.0-2
 Description: A Qt-based client-side and server-side SOAP component
 Homepage: https://www.kdab.com/products/kd-soap
-Build-Depends: qt5-base
+Build-Depends: qt5-base[core]
diff --git a/ports/kf5archive/CONTROL b/ports/kf5archive/CONTROL
@@ -1,4 +1,4 @@
 Source: kf5archive
-Version: 5.64.0
+Version: 5.64.0-1
 Description: File compression
-Build-Depends: ecm, qt5-base, zlib, bzip2
+Build-Depends: ecm, qt5-base[core], zlib, bzip2
diff --git a/ports/kf5holidays/CONTROL b/ports/kf5holidays/CONTROL
@@ -1,4 +1,4 @@
 Source: kf5holidays
-Version: 5.64.0
+Version: 5.64.0-1
 Description: Holiday calculation library
-Build-Depends: ecm, qt5-base, qt5-tools
+Build-Depends: ecm, qt5-base[core], qt5-tools
diff --git a/ports/kf5plotting/CONTROL b/ports/kf5plotting/CONTROL
@@ -1,5 +1,5 @@
 Source: kf5plotting
-Version: 5.64.0
+Version: 5.64.0-1
 Homepage: https://api.kde.org/frameworks/kplotting/html/index.html
 Description: Lightweight plotting framework
-Build-Depends: ecm, qt5-base, qt5-tools
+Build-Depends: ecm, qt5-base[core], qt5-tools
diff --git a/ports/kf5syntaxhighlighting/CONTROL b/ports/kf5syntaxhighlighting/CONTROL
@@ -1,5 +1,5 @@
 Source: kf5syntaxhighlighting
-Version: 5.64.0
+Version: 5.64.0-1
 Homepage: https://github.com/KDE/syntax-highlighting
 Description: Syntax highlighting engine for Kate syntax definitions
-Build-Depends: ecm, qt5-base, qt5-tools, qt5-xmlpatterns
+Build-Depends: ecm, qt5-base[core], qt5-tools, qt5-xmlpatterns
diff --git a/ports/libqglviewer/CONTROL b/ports/libqglviewer/CONTROL
@@ -1,4 +1,4 @@
 Source: libqglviewer
-Version: 2.7.2-2
+Version: 2.7.2-3
 Description: libQGLViewer is an open source C++ library based on Qt that eases the creation of OpenGL 3D viewers.
-Build-Depends: qt5-base
+Build-Depends: qt5-base[core]
diff --git a/ports/opencv2/CONTROL b/ports/opencv2/CONTROL
@@ -1,5 +1,5 @@
 Source: opencv2
-Version: 2.4.13.7-1
+Version: 2.4.13.7-2
 Build-Depends: zlib
 Description: computer vision library, version 2
 Default-Features: eigen, jpeg, opengl, png, tiff
@@ -37,7 +37,7 @@ Build-Depends: libpng
 Description: PNG support for opencv
 
 Feature: qt
-Build-Depends: qt5-base
+Build-Depends: qt5-base[core]
 Description: Qt GUI support for opencv
 
 Feature: tiff

diff --git a/ports/opencv3/CONTROL b/ports/opencv3/CONTROL
@@ -1,5 +1,5 @@
 Source: opencv3
-Version: 3.4.7-3
+Version: 3.4.7-4
 Build-Depends: protobuf, zlib
 Homepage: https://github.com/opencv/opencv
 Description: computer vision library
@@ -63,7 +63,7 @@ Build-Depends: libpng
 Description: PNG support for opencv
 
 Feature: qt
-Build-Depends: qt5-base
+Build-Depends: qt5-base[core]
 Description: Qt GUI support for opencv
 
 Feature: sfm

diff --git a/ports/opencv4/CONTROL b/ports/opencv4/CONTROL
@@ -66,7 +66,7 @@ Build-Depends: libpng
 Description: PNG support for opencv
 
 Feature: qt
-Build-Depends: qt5-base
+Build-Depends: qt5-base[core]
 Description: Qt GUI support for opencv
 
 Feature: sfm

diff --git a/ports/osg-qt/CONTROL b/ports/osg-qt/CONTROL
@@ -1,4 +1,4 @@
 Source: osg-qt
-Version: Qt4-1
+Version: Qt4-2
 Description: osgQt - Qt project for making use of OpenSceneGraph(OSG) 
-Build-Depends: osg, protobuf, qt5-base
+Build-Depends: osg, protobuf, qt5-base[core]
diff --git a/ports/paraview/portfile.cmake b/ports/paraview/portfile.cmake
@@ -5,7 +5,7 @@ if ("tools" IN_LIST FEATURES AND VCPKG_TARGET_IS_OSX)
 endif()
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    "cuda"         PARAVIEW_USE_CUDA            #untested; probably only affects internal VTK build so it does nothing here
+    "cuda"         PARAVIEW_USE_CUDA            #untested; probably only affects internal VTK build so it does nothing here 
     "all_modules"  PARAVIEW_BUILD_ALL_MODULES   #untested
     "mpi"          PARAVIEW_USE_MPI             #untested
     "vtkm"         PARAVIEW_USE_VTKM
@@ -23,8 +23,6 @@ vcpkg_from_github(
         paraview_build.patch
         remove_duplicates.patch # Missed something in the above patch
         cgns.patch
-        qt_plugin.patch # Remove with Qt version > 5.14
-        qt_static_plugins.patch # Remove with Qt version > 5.14
         python_include.patch
         python_wrapper.patch
         add-tools-option.patch
@@ -34,8 +32,8 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     list(APPEND VisItPatches removedoublesymbols.patch)
 endif()
 
-#The following two dependencies should probably be their own port
-#but require additional patching in paraview to make it work.
+#The following two dependencies should probably be their own port 
+#but require additional patching in paraview to make it work. 
 
 #Get VisItBridge Plugin
 vcpkg_from_gitlab(
@@ -44,8 +42,8 @@ vcpkg_from_gitlab(
     REPO paraview/visitbridge
     REF c2605b5c3115bc4869c76a0d8bfdd8939b59f283
     SHA512 6d2c1d6e1cd345547926938451755e7a8be5dabd89e18a2ceb419db16c5b29f354554a5130eb365b7e522d655370fd4766953813ff530c06e4851fe26104ce58
-    PATCHES
-        VisIt_Build.patch
+    PATCHES 
+        VisIt_Build.patch        
         #removeunusedsymbols.patch # These also get remove in master of ParaView
         ${VisItPatches}
 )
@@ -67,7 +65,7 @@ if("python" IN_LIST FEATURES)
         -DPython3_FIND_REGISTRY=NEVER
         "-DPython3_EXECUTABLE:PATH=${PYTHON3}" # Required by more than one feature
         )
-
+  
     #VTK_PYTHON_SITE_PACKAGES_SUFFIX should be set to the install dir of the site-packages
 endif()
 
@@ -84,15 +82,15 @@ vcpkg_configure_cmake(
         -DVTK_MODULE_ENABLE_ParaView_qttesting=YES
         -DPARAVIEW_ENABLE_EMBEDDED_DOCUMENTATION:BOOL=OFF
         -DPARAVIEW_USE_QTHELP:BOOL=OFF
-
+        
         #A little bit of help in finding the boost headers
         "-DBoost_INCLUDE_DIR:PATH=${CURRENT_INSTALLED_DIR}/include"
-
+    
         # Workarounds for CMake issues
         -DHAVE_SYS_TYPES_H=0    ## For some strange reason the test first succeeds and then fails the second time around
-        -DWORDS_BIGENDIAN=0     ## Tests fails in VisItCommon.cmake for some unknown reason this is just a workaround since most systems are little endian.
+        -DWORDS_BIGENDIAN=0     ## Tests fails in VisItCommon.cmake for some unknown reason this is just a workaround since most systems are little endian. 
         ${ADDITIONAL_OPTIONS}
-
+       
         #-DPARAVIEW_ENABLE_FFMPEG:BOOL=OFF
 )
 if(CMAKE_HOST_UNIX)
@@ -122,7 +120,7 @@ set(TOOLS   paraview
             smTestDriver
             vtkProcessXML
             vtkWrapClientServer)
-
+            
 foreach(tool ${TOOLS})
     # Remove debug tools
     set(filename ${CURRENT_PACKAGES_DIR}/debug/bin/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX})
@@ -137,7 +135,7 @@ foreach(tool ${TOOLS})
     if(EXISTS ${filename})
         file(REMOVE ${filename})
     endif()
-
+    
     # Move release tools
     set(filename ${CURRENT_PACKAGES_DIR}/bin/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX})
     if(EXISTS ${filename})
@@ -165,7 +163,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
             file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/${name}" "${CURRENT_PACKAGES_DIR}/debug/lib/${name}")
         endif()
     endmacro()
-
+    
     set(to_move Lib paraview-${VERSION} paraview-config)
     foreach(name ${to_move})
         move_bin_to_lib(${name})
@@ -179,4 +177,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     endforeach()
 
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
-endif()
+endif()
diff --git a/ports/paraview/qt_plugin.patch b/ports/paraview/qt_plugin.patch
diff --git a/ports/paraview/qt_static_plugins.patch b/ports/paraview/qt_static_plugins.patch
diff --git a/ports/qca/CONTROL b/ports/qca/CONTROL
@@ -1,5 +1,5 @@
 Source: qca
-Version: 2.2.1
+Version: 2.2.1-1
 Description: Qt Cryptographic Architecture (QCA).
 Homepage: https://cgit.kde.org/qca.git/
-Build-Depends: qt5-base
+Build-Depends: qt5-base[core]
diff --git a/ports/qcustomplot/CONTROL b/ports/qcustomplot/CONTROL
@@ -1,4 +1,4 @@
 Source: qcustomplot
-Version: 2.0.1-3
+Version: 2.0.1-4
 Description: QCustomPlot is a Qt C++ widget for plotting and data visualization.
-Build-Depends: qt5-base
+Build-Depends: qt5-base[core]
diff --git a/ports/qscintilla/CONTROL b/ports/qscintilla/CONTROL
@@ -1,5 +1,5 @@
 Source: qscintilla
-Version: 2.11.4-1
+Version: 2.11.4-2
 Homepage: https://www.riverbankcomputing.com/software/qscintilla
 Description: QScintilla is a port to Qt of the Scintilla editing component. Features syntax highlighting, code-completion and much more (Barebone build without python bindings (missing dependeny PyQt) and without QtDesigner plugin)
-Build-Depends: qt5-base, qt5-macextras (osx), qt5-winextras (windows)
+Build-Depends: qt5-base[core], qt5-macextras (osx), qt5-winextras (windows)
diff --git a/ports/qt-advanced-docking-system/CONTROL b/ports/qt-advanced-docking-system/CONTROL
@@ -1,5 +1,5 @@
 Source: qt-advanced-docking-system
-Version: 3.2.5-1
-Build-Depends: qt5-base, zlib, bzip2
+Version: 3.2.5-2
+Build-Depends: qt5-base[core], zlib, bzip2
 Description: Create customizable layouts using an advanced window docking system similar to what is found in many popular IDEs such as Visual Studio
 Homepage: https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System
diff --git a/ports/qt5-3d/CONTROL b/ports/qt5-3d/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-3d
-Version: 5.12.8
+Version: 5.15.0
 Description: Qt5 3d Module - Functionality for near-realtime simulation systems with support for 2D and 3D rendering
-Build-Depends:  qt5-base, qt5-declarative, qt5-imageformats, qt5-gamepad
+Build-Depends:  qt5-base[core], qt5-declarative, qt5-imageformats, qt5-gamepad
diff --git a/ports/qt5-activeqt/CONTROL b/ports/qt5-activeqt/CONTROL
@@ -1,5 +1,5 @@
 Source: qt5-activeqt
-Version: 5.12.8-1
+Version: 5.15.0
 Description: Qt5 ActiveQt Module - ActiveX components
-Build-Depends:  qt5-base, qt5-declarative
+Build-Depends:  qt5-base[core], qt5-declarative
 Supports: windows