diff --git a/overlay/osx/qt-advanced-docking-system/CONTROL b/overlay/osx/qt-advanced-docking-system/CONTROL deleted file mode 100644 index a578f8643f4f9a..00000000000000 --- a/overlay/osx/qt-advanced-docking-system/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: qt-advanced-docking-system -Version: 2019-08-14 -Build-Depends: qt5-base, 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 diff --git a/overlay/osx/qt-advanced-docking-system/config_changes.patch b/overlay/osx/qt-advanced-docking-system/config_changes.patch deleted file mode 100644 index ea9fd280106ef8..00000000000000 --- a/overlay/osx/qt-advanced-docking-system/config_changes.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8a9f919..9c2b8ad 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -62,7 +62,7 @@ if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "4") - else() - set(ads_PlatformDir "x64") - endif() --if(BUILD_STATIC) -+if(NOT BUILD_SHARED_LIBS) - add_library(qtadvanceddocking STATIC ${ads_SRCS}) - set(ads_COMPILE_DEFINE ${ads_COMPILE_DEFINE} ADS_STATIC) - else() -@@ -80,7 +80,7 @@ install(FILES - COMPONENT license - ) - install(TARGETS qtadvanceddocking -- EXPORT adsBinary -+ EXPORT qt-advanced-docking-systemConfig - RUNTIME DESTINATION bin COMPONENT library - LIBRARY DESTINATION lib COMPONENT library - ARCHIVE DESTINATION lib COMPONENT library -@@ -93,7 +93,6 @@ target_link_libraries(qtadvanceddocking PUBLIC ${ads_LIBS}) - target_compile_definitions(qtadvanceddocking PRIVATE ${ads_COMPILE_DEFINE}) - set_target_properties(qtadvanceddocking PROPERTIES - VERSION ${ads_VERSION} -- EXPORT_NAME "Qt Advanced Docking System" - ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/lib" - LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/lib" - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/bin" -@@ -103,3 +102,4 @@ if(BUILD_EXAMPLES) - add_subdirectory(demo) - endif() - -+install(EXPORT qt-advanced-docking-systemConfig NAMESPACE qt-advanced-docking-system:: DESTINATION share/qt-advanced-docking-system) -\ No newline at end of file diff --git a/overlay/osx/qt-advanced-docking-system/portfile.cmake b/overlay/osx/qt-advanced-docking-system/portfile.cmake deleted file mode 100644 index 2a53981cb1bf73..00000000000000 --- a/overlay/osx/qt-advanced-docking-system/portfile.cmake +++ /dev/null @@ -1,25 +0,0 @@ -include(vcpkg_common_functions) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO githubuser0xFFFF/Qt-Advanced-Docking-System - REF a2b07fd97f0fac63fd7a0ed7b1eb0692b3efab71 - SHA512 a44babd6100f299aea7fcf2d730874e204151ce363e1f58a2be938f70d28b07f3cb39adfbf46527fdacc3b12a630e7d97851e4a6fcd04e750a007ee06d06d3b5 - HEAD_REF master - PATCHES - config_changes.patch -) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DBUILD_EXAMPLES=OFF -) - -vcpkg_install_cmake() - -file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/qt-advanced-docking-system RENAME copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/license) -vcpkg_fixup_cmake_targets() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) \ No newline at end of file diff --git a/overlay/osx/qt5-base/CONTROL b/overlay/osx/qt5-base/CONTROL deleted file mode 100644 index 2dbe9c709f7446..00000000000000 --- a/overlay/osx/qt5-base/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: qt5-base -Version: 5.12.4-11 -Homepage: https://www.qt.io/ -Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components. -Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl diff --git a/overlay/osx/qt5-base/cmake/find_qt_mkspec.cmake b/overlay/osx/qt5-base/cmake/find_qt_mkspec.cmake index 035aec1adc4cfb..c9c06c8bd9df17 100644 --- a/overlay/osx/qt5-base/cmake/find_qt_mkspec.cmake +++ b/overlay/osx/qt5-base/cmake/find_qt_mkspec.cmake @@ -77,10 +77,10 @@ function(find_qt_mkspec TARGET_PLATFORM_MKSPEC_OUT HOST_PLATFORM_MKSPEC_OUT EXT_ else() endif() foreach(_triplet ${_test_triplets}) - find_program(QMAKE_PATH qmake PATHS ${VCPKG_ROOT_DIR}/installed/${_triplet}/tools/qt5/bin NO_DEFAULT_PATHS) - message(STATUS "Checking: ${VCPKG_ROOT_DIR}/installed/${_triplet}/tools/qt5/bin. ${QMAKE_PATH}") + find_program(QMAKE_PATH qmake PATHS ${VCPKG_INSTALLED_DIR}/${_triplet}/tools/qt5/bin NO_DEFAULT_PATHS) + message(STATUS "Checking: ${VCPKG_INSTALLED_DIR}/${_triplet}/tools/qt5/bin. ${QMAKE_PATH}") if(QMAKE_PATH) - set(_tmp_host_root "${VCPKG_ROOT_DIR}/installed/${_triplet}/tools/qt5") + set(_tmp_host_root "${VCPKG_INSTALLED_DIR}/${_triplet}/tools/qt5") set(_tmp_host_qmake ${QMAKE_PATH} PARENT_SCOPE) message(STATUS "Qt host tools root dir within vcpkg: ${_tmp_host_root}") break() @@ -98,4 +98,4 @@ function(find_qt_mkspec TARGET_PLATFORM_MKSPEC_OUT HOST_PLATFORM_MKSPEC_OUT EXT_ set(${EXT_HOST_TOOLS_OUT} ${_tmp_host_root} PARENT_SCOPE) endif() -endfunction() \ No newline at end of file +endfunction() diff --git a/overlay/osx/qt5-base/vcpkg.json b/overlay/osx/qt5-base/vcpkg.json new file mode 100644 index 00000000000000..cb3d9f8ccdb434 --- /dev/null +++ b/overlay/osx/qt5-base/vcpkg.json @@ -0,0 +1,32 @@ +{ + "name": "qt5-base", + "version-semver": "5.12.4", + "port-version": 12, + "description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", + "homepage": "https://www.qt.io/", + "dependencies": [ + { + "name": "angle", + "platform": "!windows" + }, + "double-conversion", + "egl-registry", + { + "name": "fontconfig", + "platform": "!windows" + }, + "freetype", + "harfbuzz", + "libjpeg-turbo", + "libpng", + "openssl", + "pcre2", + "sqlite3", + { + "name": "vcpkg-pkgconfig-get-modules", + "host": true + }, + "zlib", + "zstd" + ] +} diff --git a/overlay/osx/qt5-declarative/CONTROL b/overlay/osx/qt5-declarative/CONTROL deleted file mode 100644 index e54bca0a1c90e5..00000000000000 --- a/overlay/osx/qt5-declarative/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: qt5-declarative -Version: 5.12.4 -Description: Qt5 Declarative (Quick 2) Module. Includes QtQuick, QtQuickParticles, QtQuickWidgets, QtQml, and QtPacketProtocol. -Build-Depends: qt5-base diff --git a/overlay/osx/qt5-declarative/vcpkg.json b/overlay/osx/qt5-declarative/vcpkg.json new file mode 100644 index 00000000000000..65d189a97c26e4 --- /dev/null +++ b/overlay/osx/qt5-declarative/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "qt5-declarative", + "version-string": "5.12.4", + "port-version": 1, + "description": "Qt5 Declarative (Quick 2) Module. Includes QtQuick, QtQuickParticles, QtQuickWidgets, QtQml, and QtPacketProtocol.", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + } + ] +} diff --git a/overlay/osx/qt5-macextras/CONTROL b/overlay/osx/qt5-macextras/CONTROL deleted file mode 100644 index c9e444cfff3cd6..00000000000000 --- a/overlay/osx/qt5-macextras/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: qt5-macextras -Version: 5.12.4 -Description: Qt5 Mac Extras Module. Provides platform-specific APIs for mac. -Build-Depends: qt5-base diff --git a/overlay/osx/qt5-macextras/vcpkg.json b/overlay/osx/qt5-macextras/vcpkg.json new file mode 100644 index 00000000000000..574a3415344640 --- /dev/null +++ b/overlay/osx/qt5-macextras/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "qt5-macextras", + "version-string": "5.12.4", + "port-version": 1, + "description": "Qt5 Mac Extras Module. Provides platform-specific APIs for mac.", + "supports": "osx", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + } + ] +} diff --git a/overlay/osx/qt5-script/CONTROL b/overlay/osx/qt5-script/CONTROL deleted file mode 100644 index 65be28f533cf17..00000000000000 --- a/overlay/osx/qt5-script/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: qt5-script -Version: 5.12.4 -Build-Depends: qt5-base -Description:Qt5 Script Module. diff --git a/overlay/osx/qt5-script/vcpkg.json b/overlay/osx/qt5-script/vcpkg.json new file mode 100644 index 00000000000000..1843e7b742efdb --- /dev/null +++ b/overlay/osx/qt5-script/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "qt5-script", + "version-string": "5.12.4", + "port-version": 1, + "description": "Qt5 Script Module.", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-tools" + ] +} diff --git a/overlay/osx/qt5-svg/CONTROL b/overlay/osx/qt5-svg/CONTROL deleted file mode 100644 index 15acc93d99fe00..00000000000000 --- a/overlay/osx/qt5-svg/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: qt5-svg -Version: 5.12.4 -Description: Qt5 SVG Module - provides classes for displaying the contents of SVG files -Build-Depends: qt5-base diff --git a/overlay/osx/qt5-svg/vcpkg.json b/overlay/osx/qt5-svg/vcpkg.json new file mode 100644 index 00000000000000..68e2f2c878e785 --- /dev/null +++ b/overlay/osx/qt5-svg/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "qt5-svg", + "version-string": "5.12.4", + "port-version": 1, + "description": "Qt5 SVG Module - provides classes for displaying the contents of SVG files", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + } + ] +} diff --git a/overlay/osx/qt5-tools/CONTROL b/overlay/osx/qt5-tools/CONTROL deleted file mode 100644 index c8699b5e1bbb44..00000000000000 --- a/overlay/osx/qt5-tools/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: qt5-tools -Version: 5.12.4 -Description: Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications -Build-Depends: qt5-base, qt5-declarative diff --git a/overlay/osx/qt5-tools/vcpkg.json b/overlay/osx/qt5-tools/vcpkg.json new file mode 100644 index 00000000000000..b2b80d72d53013 --- /dev/null +++ b/overlay/osx/qt5-tools/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "qt5-tools", + "version-string": "5.12.4", + "port-version": 1, + "description": "Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative" + ] +} diff --git a/overlay/osx/qt5-translations/CONTROL b/overlay/osx/qt5-translations/CONTROL deleted file mode 100644 index c37005fa9f1832..00000000000000 --- a/overlay/osx/qt5-translations/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: qt5-translations -Version: 5.12.7 -Description: Qt5 translations module -Build-Depends: qt5-base, qt5-tools diff --git a/overlay/osx/qt5-translations/vcpkg.json b/overlay/osx/qt5-translations/vcpkg.json new file mode 100644 index 00000000000000..4d06af10bf8668 --- /dev/null +++ b/overlay/osx/qt5-translations/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "qt5-translations", + "version-string": "5.12.4", + "port-version": 1, + "description": "Qt5 translations module", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-tools" + ] +} diff --git a/overlay/osx/qt5-winextras/CONTROL b/overlay/osx/qt5-winextras/CONTROL deleted file mode 100644 index 2df6a422f66653..00000000000000 --- a/overlay/osx/qt5-winextras/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: qt5-winextras -Version: 5.12.4 -Description: Qt5 Windows Extras Module. Provides platform-specific APIs for Windows. -Build-Depends: qt5-base, atlmfc (windows) diff --git a/overlay/osx/qt5-winextras/portfile.cmake b/overlay/osx/qt5-winextras/portfile.cmake deleted file mode 100644 index 54153bed711f13..00000000000000 --- a/overlay/osx/qt5-winextras/portfile.cmake +++ /dev/null @@ -1,5 +0,0 @@ -if (NOT VCPKG_TARGET_IS_WINDOWS) - message(FATAL_ERROR "qt5-winextras only support Windows.") -endif() -include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) -qt_submodule_installation() \ No newline at end of file diff --git a/overlay/osx/qt5-xmlpatterns/CONTROL b/overlay/osx/qt5-xmlpatterns/CONTROL deleted file mode 100644 index cc8267c0671dde..00000000000000 --- a/overlay/osx/qt5-xmlpatterns/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: qt5-xmlpatterns -Version: 5.12.4 -Description: Qt5 XML Patterns Module - Support for XPath, XQuery, XSLT and XML schema validation -Build-Depends: qt5-base diff --git a/overlay/osx/qt5-xmlpatterns/vcpkg.json b/overlay/osx/qt5-xmlpatterns/vcpkg.json new file mode 100644 index 00000000000000..03dc6cbe654aa9 --- /dev/null +++ b/overlay/osx/qt5-xmlpatterns/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "qt5-xmlpatterns", + "version-string": "5.12.4", + "port-version": 1, + "description": "Qt5 XML Patterns Module - Support for XPath, XQuery, XSLT and XML schema validation", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative" + ] +}